summaryrefslogtreecommitdiffstats
path: root/samples/ApiDemos
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2018-02-20 16:26:48 -0500
committerAlan Viverette <alanv@google.com>2018-02-27 20:30:57 +0000
commita3d037382dca89ff269a35b9ba7ae67fc68f0f83 (patch)
treeae580b26b5475472697e08de0765c378b08cbae0 /samples/ApiDemos
parentf907ab9358128f8eda81a2fc0450f349d9dbf2d4 (diff)
downloadandroid_development-a3d037382dca89ff269a35b9ba7ae67fc68f0f83.tar.gz
android_development-a3d037382dca89ff269a35b9ba7ae67fc68f0f83.tar.bz2
android_development-a3d037382dca89ff269a35b9ba7ae67fc68f0f83.zip
Migrate to AAPT2
Bug: 73250914 Test: make checkbuild Change-Id: I64ad5cb08aeb1e1c5cd2594dc0be1bbb105610f6
Diffstat (limited to 'samples/ApiDemos')
-rw-r--r--samples/ApiDemos/Android.mk15
1 files changed, 9 insertions, 6 deletions
diff --git a/samples/ApiDemos/Android.mk b/samples/ApiDemos/Android.mk
index 1d2d1526a..0d8a7a829 100644
--- a/samples/ApiDemos/Android.mk
+++ b/samples/ApiDemos/Android.mk
@@ -4,15 +4,18 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := samples tests
# Only compile source java files in this apk.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SRC_FILES += \
- src/com/example/android/apis/app/IRemoteService.aidl \
- src/com/example/android/apis/app/IRemoteServiceCallback.aidl \
- src/com/example/android/apis/app/ISecondary.aidl \
+LOCAL_SRC_FILES := \
+ $(call all-java-files-under, src) \
+ src/com/example/android/apis/app/IRemoteService.aidl \
+ src/com/example/android/apis/app/IRemoteServiceCallback.aidl \
+ src/com/example/android/apis/app/ISecondary.aidl \
LOCAL_JAVA_LIBRARIES := telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4
+LOCAL_STATIC_ANDROID_LIBRARIES += \
+ android-support-v4
+
+LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ApiDemos