diff options
| author | Alan Viverette <alanv@google.com> | 2018-02-08 17:19:40 -0500 |
|---|---|---|
| committer | Aurimas Liutikas <aurimas@google.com> | 2018-02-09 03:52:37 +0000 |
| commit | be148be690e159c0fd85f3da13bb96fd8084f084 (patch) | |
| tree | 159ee4e5d96dd98e459487cbce68593c8aab0eef | |
| parent | 67610909a1208325a098a5d97c806f251e58e867 (diff) | |
| download | Camera2-be148be690e159c0fd85f3da13bb96fd8084f084.tar.gz | |
Migrate to AAPT2
Bug: 73128633
Test: m Camera2
Change-Id: I97fa2e3b036ea950c231f13d987a5d1e83308721
| -rw-r--r-- | Android.mk | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/Android.mk b/Android.mk index 6e57e81ea..879692eef 100644 --- a/Android.mk +++ b/Android.mk @@ -4,10 +4,12 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 -LOCAL_STATIC_JAVA_LIBRARIES += android-support-compat -LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability +LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-support-v13 \ + android-support-v4 \ + android-support-compat + +LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-portability LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit LOCAL_STATIC_JAVA_LIBRARIES += glide LOCAL_STATIC_JAVA_LIBRARIES += guava @@ -21,27 +23,14 @@ LOCAL_RESOURCE_DIR += \ $(LOCAL_PATH)/res \ $(LOCAL_PATH)/res_p - include $(LOCAL_PATH)/version.mk + LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ --version-name "$(version_name_package)" \ --version-code $(version_code_package) \ - --extra-packages android.support.compat \ - --extra-packages android.support.mediacompat \ - --extra-packages android.support.coreui \ - -ifeq ($(TARGET_BUILD_APPS),) - LOCAL_RESOURCE_DIR += \ - frameworks/support/compat/res \ - frameworks/support/media-compat/res \ - frameworks/support/core-ui/res -else - LOCAL_RESOURCE_DIR += \ - prebuilts/sdk/current/support/compat/res \ - prebuilts/sdk/current/support/media-compat/res \ - prebuilts/sdk/current/support/core-ui/res -endif + +LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := Camera2 |