diff options
| author | Paul Duffin <paulduffin@google.com> | 2015-11-23 20:52:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-23 20:52:46 +0000 |
| commit | 610a0d3081101f7c69d762eda68884b76b999c1b (patch) | |
| tree | 32089b494afdf808214c9605d47b8c556e37a3b2 | |
| parent | f7116f965e76f7a29f9d0c5805f3e8c9186c6d68 (diff) | |
| parent | 5b4f728844b27061672603da75c66405387c2116 (diff) | |
| download | caliper-610a0d3081101f7c69d762eda68884b76b999c1b.tar.gz | |
Switching to build a host library
am: 5b4f728844
* commit '5b4f728844b27061672603da75c66405387c2116':
Switching to build a host library
| -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) |