diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2017-11-21 12:50:18 -0800 |
|---|---|---|
| committer | Aurimas Liutikas <aurimas@google.com> | 2017-11-21 12:50:18 -0800 |
| commit | 9812a75c014a24f87fe9f65b8997dcb362f4c2e2 (patch) | |
| tree | 7888f7758e217e890b75adff1c798c7ae01a1955 /Android.mk | |
| parent | ea59fb8c73461d89541d1d4a00061f1a24a6bcd3 (diff) | |
| download | android_packages_apps_Messaging-9812a75c014a24f87fe9f65b8997dcb362f4c2e2.tar.gz android_packages_apps_Messaging-9812a75c014a24f87fe9f65b8997dcb362f4c2e2.tar.bz2 android_packages_apps_Messaging-9812a75c014a24f87fe9f65b8997dcb362f4c2e2.zip | |
Migrate messaging to aapt2.
Test: make messaging
Change-Id: I460554bc92244feeca6e28081daf66d0dc2e6281
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 55 |
1 files changed, 23 insertions, 32 deletions
@@ -20,43 +20,34 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -ifeq ($(TARGET_BUILD_APPS),) - LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res - LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res -else - LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res - LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/recyclerview/res -endif -LOCAL_RESOURCE_DIR += frameworks/opt/chips/res -LOCAL_RESOURCE_DIR += frameworks/opt/colorpicker/res -LOCAL_RESOURCE_DIR += frameworks/opt/photoviewer/res -LOCAL_RESOURCE_DIR += frameworks/opt/photoviewer/activity/res - -LOCAL_STATIC_JAVA_LIBRARIES := android-common -LOCAL_STATIC_JAVA_LIBRARIES += android-common-framesequence -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-palette -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 -LOCAL_STATIC_JAVA_LIBRARIES += com.android.vcard -LOCAL_STATIC_JAVA_LIBRARIES += guava -LOCAL_STATIC_JAVA_LIBRARIES += libchips -LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer -LOCAL_STATIC_JAVA_LIBRARIES += libphonenumber -LOCAL_STATIC_JAVA_LIBRARIES += colorpicker +LOCAL_USE_AAPT2 := true + +LOCAL_STATIC_ANDROID_LIBRARIES := \ + android-support-compat \ + android-support-media-compat \ + android-support-core-utils \ + android-support-core-ui \ + android-support-fragment \ + android-support-v7-appcompat \ + android-support-v7-palette \ + android-support-v7-recyclerview \ + android-support-v13 \ + colorpicker \ + libchips \ + libphotoviewer + +LOCAL_STATIC_JAVA_LIBRARIES := \ + android-support-annotations \ + android-common \ + android-common-framesequence \ + com.android.vcard \ + guava \ + libphonenumber include $(LOCAL_PATH)/version.mk -LOCAL_AAPT_FLAGS := --auto-add-overlay LOCAL_AAPT_FLAGS += --version-name "$(version_name_package)" LOCAL_AAPT_FLAGS += --version-code $(version_code_package) -LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat -LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview -LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips -LOCAL_AAPT_FLAGS += --extra-packages com.android.vcard -LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.photo -LOCAL_AAPT_FLAGS += --extra-packages com.android.colorpicker ifdef TARGET_BUILD_APPS LOCAL_JNI_SHARED_LIBRARIES := libframesequence libgiftranscode |