summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ying Wang <wangying@google.com> 2016-03-30 10:33:47 -0700
committer Ying Wang <wangying@google.com> 2016-03-30 10:33:47 -0700
commit5e92c429ec912e3655b74e6161400d9743298b2d (patch)
tree0d2bf45071b80e9f196cf92a223ef453e273a056
parent9a99629eaa79a7e6c3bcc0ecf674bd7981fef5a0 (diff)
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
-rw-r--r--tools/aapt2/integration-tests/StaticLibOne/Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/aapt2/integration-tests/StaticLibOne/Android.mk b/tools/aapt2/integration-tests/StaticLibOne/Android.mk
index d59dc6090dec..0b7129aa0d38 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)