diff options
| author | Alan Viverette <alanv@google.com> | 2017-05-02 16:02:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-02 16:02:13 +0000 |
| commit | f8fa5fe45c9e39795cd9f7bf35ba718600953acf (patch) | |
| tree | cd96e1d6ff1f40c5e156cfb92fa3871bc01ccd66 | |
| parent | 0dcca641aefb59e6e6aa1f9ae37c2972b6559fe8 (diff) | |
| parent | 04d0cb86869d3abed1c502a8b5ebe3601b96491c (diff) | |
| download | experimental-f8fa5fe45c9e39795cd9f7bf35ba718600953acf.tar.gz | |
Use AAPT2 am: 03a21f83ac
am: 04d0cb8686
Change-Id: I1a681612446cbdc84547505d2524f8895dea4746
| -rw-r--r-- | DreamTheater/Android.mk | 6 | ||||
| -rw-r--r-- | NotificationListenerSample/Android.mk | 10 | ||||
| -rw-r--r-- | NotificationShowcase/Android.mk | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/DreamTheater/Android.mk b/DreamTheater/Android.mk index 117542d..b0c95b2 100644 --- a/DreamTheater/Android.mk +++ b/DreamTheater/Android.mk @@ -6,7 +6,11 @@ LOCAL_MODULE_TAGS := optional # Only compile source java files in this apk. LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 +LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-support-v4 \ + android-support-v13 + +LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := DreamTheater diff --git a/NotificationListenerSample/Android.mk b/NotificationListenerSample/Android.mk index 9ab4b62..9aeddc7 100644 --- a/NotificationListenerSample/Android.mk +++ b/NotificationListenerSample/Android.mk @@ -18,12 +18,9 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \ - frameworks/support/v7/appcompat/res \ - frameworks/support/v7/recyclerview/res +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -LOCAL_AAPT_FLAGS := --auto-add-overlay \ - --extra-packages android.support.v7.appcompat:android.support.v7.recyclerview +LOCAL_USE_AAPT2 := true LOCAL_MODULE_TAGS := optional @@ -31,7 +28,8 @@ LOCAL_AAPT_FLAGS += -c mdpi,hdpi,xhdpi LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 \ +LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-support-v4 \ android-support-v7-recyclerview \ android-support-v7-appcompat diff --git a/NotificationShowcase/Android.mk b/NotificationShowcase/Android.mk index 9a52028..7d6570d 100644 --- a/NotificationShowcase/Android.mk +++ b/NotificationShowcase/Android.mk @@ -24,10 +24,12 @@ LOCAL_AAPT_FLAGS += -c mdpi,hdpi,xhdpi LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := \ +LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-v4 \ android-support-v7-preference +LOCAL_USE_AAPT2 := true + LOCAL_PACKAGE_NAME := NotificationShowcase include $(BUILD_PACKAGE) |