diff options
| author | Paul Duffin <paulduffin@google.com> | 2015-11-20 11:11:31 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2015-11-20 14:53:00 +0000 |
| commit | 5b4f728844b27061672603da75c66405387c2116 (patch) | |
| tree | 427fcef95dccd8290d75aa602558fb8ffcbc3285 | |
| parent | fb58c0d045ac176a33b4af4da330599eb72c8a9f (diff) | |
| download | caliper-5b4f728844b27061672603da75c66405387c2116.tar.gz | |
Switching to build a host library
This is intended to be used with Vogar which used to be built
so this was built for the target. But Vogar has since been
switched to build for the host so this must do the same.
Change-Id: I9d1826b50cd1de4ad088915a3d9800dd06724cde
| -rw-r--r-- | Android.mk | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -14,23 +14,23 @@ LOCAL_PATH := $(call my-dir) -# build caliper target jar +# build caliper host jar # ============================================================ include $(CLEAR_VARS) -LOCAL_MODULE := caliper-target +LOCAL_MODULE := caliper-host LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_SRC_FILES := $(call all-java-files-under, caliper/src/main/java/) LOCAL_JAVA_RESOURCE_DIRS := caliper/src/main/resources LOCAL_STATIC_JAVA_LIBRARIES := \ - caliper-gson \ - caliper-java-allocation-instrumenter \ - guava + caliper-gson-host \ + caliper-java-allocation-instrumenter-host \ + guavalib -include $(BUILD_STATIC_JAVA_LIBRARY) +include $(BUILD_HOST_JAVA_LIBRARY) # build caliper tests # ============================================================ @@ -43,17 +43,17 @@ LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_SRC_FILES := $(call all-java-files-under, caliper/src/test/java/) LOCAL_STATIC_JAVA_LIBRARIES := \ - caliper-target \ - junit-target + caliper-host \ + junit -include $(BUILD_STATIC_JAVA_LIBRARY) +include $(BUILD_HOST_JAVA_LIBRARY) # Build dependencies. # ============================================================ include $(CLEAR_VARS) -LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ - caliper-gson:lib/gson-1.7.1$(COMMON_JAVA_PACKAGE_SUFFIX) \ - caliper-java-allocation-instrumenter:lib/java-allocation-instrumenter-2.0$(COMMON_JAVA_PACKAGE_SUFFIX) +LOCAL_PREBUILT_JAVA_LIBRARIES := \ + caliper-gson-host:lib/gson-1.7.1$(COMMON_JAVA_PACKAGE_SUFFIX) \ + caliper-java-allocation-instrumenter-host:lib/java-allocation-instrumenter-2.0$(COMMON_JAVA_PACKAGE_SUFFIX) -include $(BUILD_MULTI_PREBUILT) +include $(BUILD_HOST_PREBUILT) |