diff options
| author | 2018-01-09 02:29:53 +0000 | |
|---|---|---|
| committer | 2018-01-09 02:29:53 +0000 | |
| commit | aa31e19ae1189f022b22d7de17e93e10516f80da (patch) | |
| tree | 7176da308d1fcc4257aaffb127060fb296c7fec6 | |
| parent | 710971a2866a58c896a6862b36c10630f176804b (diff) | |
| parent | 87f7ce4bd17b4d1cd0721b7b0d05f57ffdef8a0d (diff) | |
Merge "Migrate PrintSpooler to aapt2."
| -rw-r--r-- | packages/PrintSpooler/Android.mk | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/packages/PrintSpooler/Android.mk b/packages/PrintSpooler/Android.mk index 19e44e36447d..6feb8a6294d7 100644 --- a/packages/PrintSpooler/Android.mk +++ b/packages/PrintSpooler/Android.mk @@ -18,17 +18,26 @@ 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_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) |