Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 497a4359 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes from topic "soong_support_libs" 

* changes:
  Remove unnecessary proguard flags
  Migrate Contacts app to aapt2
parents 7173594e 0d66919b

Android.mk

+13 −30
Original line number Diff line number Diff line
@@ -5,37 +5,15 @@ LOCAL_MODULE_TAGS := optional 


phone_common_dir := ../PhoneCommon



ifeq ($(TARGET_BUILD_APPS),)

support_library_root_dir := frameworks/support

else

support_library_root_dir := prebuilts/sdk/current/support

endif



src_dirs := src src-bind $(phone_common_dir)/src

res_dirs := res $(phone_common_dir)/res

asset_dirs := assets



LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))

LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \

    $(support_library_root_dir)/design/res \

    $(support_library_root_dir)/transition/res \

    $(support_library_root_dir)/v7/appcompat/res \

    $(support_library_root_dir)/v7/cardview/res \

    $(support_library_root_dir)/v7/recyclerview/res

LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))

LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))



LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages com.android.contacts.common \

    --extra-packages com.android.phone.common \

    --extra-packages android.support.design \

    --extra-packages android.support.transition \

    --extra-packages android.support.v7.appcompat \

    --extra-packages android.support.v7.cardview \

    --extra-packages android.support.v7.recyclerview



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-common \

LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-design \

    android-support-transition \

    android-support-v13 \
@@ -43,20 +21,25 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    android-support-v7-cardview \

    android-support-v7-recyclerview \

    android-support-v7-palette \

    android-support-v4 \

    android-support-v4



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-common \

    com.android.vcard \

    guava \

    libphonenumber



LOCAL_USE_AAPT2 := true



LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages com.android.phone.common



LOCAL_PACKAGE_NAME := Contacts

LOCAL_CERTIFICATE := shared

LOCAL_PRIVILEGED_MODULE := true



LOCAL_PROGUARD_FLAG_FILES := \

    proguard.flags \

    ../../../frameworks/support/core-ui/proguard-rules.pro \

    ../../../frameworks/support/design/proguard-rules.pro \

    ../../../frameworks/support/v7/recyclerview/proguard-rules.pro

LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21