filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate messaging to aapt2.

Browse Source 
Test: make messaging
Change-Id: I460554bc92244feeca6e28081daf66d0dc2e6281
Merged-In: I460554bc92244feeca6e28081daf66d0dc2e6281
(cherry picked from commit 9812a75c01)
This commit is contained in:
Aurimas Liutikas
2017-11-21 12:50:18 -08:00
committed by Colin Cross
parent 3dd036dc99
commit a75d7022fc
1 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Android.mk
View File

@@ -20,43 +20,34 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
ifeq ($(TARGET_BUILD_APPS),) LOCAL_USE_AAPT2 := true
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_ANDROID_LIBRARIES := \
LOCAL_STATIC_JAVA_LIBRARIES += android-common-framesequence android-support-compat \
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 android-support-media-compat \
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat android-support-core-utils \
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-palette android-support-core-ui \
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview android-support-fragment \
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 android-support-v7-appcompat \
LOCAL_STATIC_JAVA_LIBRARIES += com.android.vcard android-support-v7-palette \
LOCAL_STATIC_JAVA_LIBRARIES += guava android-support-v7-recyclerview \
LOCAL_STATIC_JAVA_LIBRARIES += libchips android-support-v13 \
LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer colorpicker \
LOCAL_STATIC_JAVA_LIBRARIES += libphonenumber libchips \
LOCAL_STATIC_JAVA_LIBRARIES += colorpicker libphotoviewer
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-annotations \
android-common \
android-common-framesequence \
com.android.vcard \
guava \
libphonenumber
include $(LOCAL_PATH)/version.mk include $(LOCAL_PATH)/version.mk
LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_AAPT_FLAGS += --version-name "$(version_name_package)" LOCAL_AAPT_FLAGS += --version-name "$(version_name_package)"
LOCAL_AAPT_FLAGS += --version-code $(version_code_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 ifdef TARGET_BUILD_APPS
LOCAL_JNI_SHARED_LIBRARIES := libframesequence libgiftranscode LOCAL_JNI_SHARED_LIBRARIES := libframesequence libgiftranscode