From 5e92c429ec912e3655b74e6161400d9743298b2d Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Wed, 30 Mar 2016 10:33:47 -0700 Subject: [PATCH] Fix compilation using javac. We still need to be able to compile all the Java source code in the tree using javac, though the compiled code never ends up running on device. Bug: 25958912 Change-Id: Id76663cdf768db579517515d7b7f51519b515fa8 --- tools/aapt2/integration-tests/StaticLibOne/Android.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/aapt2/integration-tests/StaticLibOne/Android.mk b/tools/aapt2/integration-tests/StaticLibOne/Android.mk index d59dc6090decc..0b7129aa0d382 100644 --- a/tools/aapt2/integration-tests/StaticLibOne/Android.mk +++ b/tools/aapt2/integration-tests/StaticLibOne/Android.mk @@ -22,4 +22,7 @@ LOCAL_MODULE := AaptTestStaticLibOne LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res + +# We need this to compile the Java sources of AaptTestStaticLibTwo using javac. +LOCAL_JAR_EXCLUDE_FILES := none include $(BUILD_STATIC_JAVA_LIBRARY)