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

Commit 647bec6b authored by Kirill Grouchnikov's avatar Kirill Grouchnikov
Browse files

Revert "Tweak app makefile with extra resources" 

This reverts commit f8d124d8.

Bug: 30240339
Change-Id: Ibce9a8142b3d0df275a9f346dafe4f37303a8aa4
parent f8d124d8

Android.mk

+11 −7
Original line number Original line Diff line number Diff line
@@ -5,25 +5,29 @@ LOCAL_MODULE_TAGS := optional 




phone_common_dir := ../PhoneCommon

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

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

res_dirs := res $(phone_common_dir)/res

res_dirs := res $(phone_common_dir)/res

asset_dirs := assets

asset_dirs := assets





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

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

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

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

    $(SUPPORT_LIBRARY_ROOT)/core-ui/res \

    $(support_library_root_dir)/design/res \

    $(SUPPORT_LIBRARY_ROOT)/design/res \

    $(support_library_root_dir)/transition/res \

    $(SUPPORT_LIBRARY_ROOT)/transition/res \

    $(support_library_root_dir)/v7/appcompat/res \

    $(SUPPORT_LIBRARY_ROOT)/v7/appcompat/res \

    $(support_library_root_dir)/v7/cardview/res \

    $(SUPPORT_LIBRARY_ROOT)/v7/cardview/res \

    $(support_library_root_dir)/v7/recyclerview/res

    $(SUPPORT_LIBRARY_ROOT)/v7/recyclerview/res

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

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





LOCAL_AAPT_FLAGS := \

LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --auto-add-overlay \

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

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

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

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

    --extra-packages android.support.coreui \

    --extra-packages android.support.design \

    --extra-packages android.support.design \

    --extra-packages android.support.transition \

    --extra-packages android.support.transition \

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

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