summaryrefslogtreecommitdiff
path: root/legacy-test
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2017-02-22 11:42:46 +0000
committer Paul Duffin <paulduffin@google.com> 2017-02-22 14:42:46 +0000
commitf1c59610bbe5ca7bf28083a6aa9c6ef551dfde52 (patch)
tree7e2e61454c12507b77a6d285229676267fd70809 /legacy-test
parentef69246260156120d2fb1a20ed527883c8b7c398 (diff)
Fix build failure when using javac toolchain
The legacy-performance-test-hostdex library was built using the BUILD_HOST_DALVIK_JAVA_LIBRARY macro (which creates a non-static library) but is used with LOCAL_STATIC_JAVA_LIBRARIES which requires a static library. That works with Jack but fails with the javac toolchain. This change switched to build legacy-performance-test-hostdex using the BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY macro. Bug: 30188076 Test: make checkbuild Change-Id: I8d42c669e4ded3417ecdcb7b0251bc6346debd5d
Diffstat (limited to 'legacy-test')
-rw-r--r--legacy-test/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/legacy-test/Android.mk b/legacy-test/Android.mk
index 0a814f39b637..05fec5ee603f 100644
--- a/legacy-test/Android.mk
+++ b/legacy-test/Android.mk
@@ -50,5 +50,5 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := src/android/test/PerformanceTestCase.java
LOCAL_MODULE := legacy-performance-test-hostdex
-include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
endif # HOST_OS == linux