From d6c9658d99c4f293d03e884817a091a74ccab278 Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Fri, 5 Jan 2018 16:27:23 -0800 Subject: [PATCH] Migrate PrintSpooler to aapt2. Test: make -j PrintSpooler Change-Id: Iad4d4d477792f13fb92e3ee7f4f5fa781f3298c4 Merged-In: Iad4d4d477792f13fb92e3ee7f4f5fa781f3298c4 (cherry picked from commit 87f7ce4bd17b4d1cd0721b7b0d05f57ffdef8a0d) --- packages/PrintSpooler/Android.mk | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/PrintSpooler/Android.mk b/packages/PrintSpooler/Android.mk index 67ef6b4851c6..e356f38f10b3 100644 --- a/packages/PrintSpooler/Android.mk +++ b/packages/PrintSpooler/Android.mk @@ -18,18 +18,27 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res frameworks/support/v7/recyclerview/res -LOCAL_AAPT_FLAGS := --auto-add-overlay --extra-packages android.support.v7.recyclerview +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res +LOCAL_USE_AAPT2 := true LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES += \ - src/com/android/printspooler/renderer/IPdfRenderer.aidl \ - src/com/android/printspooler/renderer/IPdfEditor.aidl + src/com/android/printspooler/renderer/IPdfRenderer.aidl \ + src/com/android/printspooler/renderer/IPdfEditor.aidl LOCAL_PACKAGE_NAME := PrintSpooler LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_JNI_SHARED_LIBRARIES := libprintspooler_jni -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v7-recyclerview +LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-support-v7-recyclerview \ + android-support-compat \ + android-support-media-compat \ + android-support-core-utils \ + android-support-core-ui \ + android-support-fragment + +LOCAL_STATIC_JAVA_LIBRARIES := \ + android-support-annotations include $(BUILD_PACKAGE) -- 2.11.0