From f1c59610bbe5ca7bf28083a6aa9c6ef551dfde52 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 22 Feb 2017 11:42:46 +0000 Subject: [PATCH] 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 --- legacy-test/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/legacy-test/Android.mk b/legacy-test/Android.mk index 0a814f39b6377..05fec5ee603fb 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