Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix compilation using javac." into nyc-dev

Browse Source 
am: 92e1ea2

* commit '92e1ea2383014390532c61afbc81773b8934ae48':
  Fix compilation using javac.

Change-Id: I43e557c0144c1923f234519018b00149f8a9a728
This commit is contained in:
Ying Wang
2016-03-30 19:16:59 +00:00
committed by android-build-merger
parent 458e8436f9 92e1ea2383
commit d625b1370a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/aapt2/integration-tests/StaticLibOne/Android.mk
View File

@@ -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)