diff options
| author | Kirill Grouchnikov <kirillg@google.com> | 2017-05-15 23:11:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-15 23:11:09 +0000 |
| commit | e724c7b6376be660abf2113f97c7cbfc34515da8 (patch) | |
| tree | 5c11db34500a8d232d470751a9ddfad2936c4347 | |
| parent | 738bb09adee2b56c99063a0264f8f76de393143b (diff) | |
| parent | cb06686aba5b9e080e1b758e2ea17a73be648601 (diff) | |
| download | android_packages_apps_Dialer-e724c7b6376be660abf2113f97c7cbfc34515da8.tar.gz android_packages_apps_Dialer-e724c7b6376be660abf2113f97c7cbfc34515da8.tar.bz2 android_packages_apps_Dialer-e724c7b6376be660abf2113f97c7cbfc34515da8.zip | |
Merge "Tweak app makefile with extra resources" into oc-dev
| -rw-r--r-- | Android.mk | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk index b00519f48..e1e9ef5da 100644 --- a/Android.mk +++ b/Android.mk @@ -7,12 +7,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -ifeq ($(TARGET_BUILD_APPS),) -support_library_root_dir := frameworks/support -else -support_library_root_dir := prebuilts/sdk/current/support -endif - # The base directory for Dialer sources. BASE_DIR := java/com/android @@ -148,15 +142,17 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH) 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 + $(SUPPORT_LIBRARY_ROOT)/core-ui/res \ + $(SUPPORT_LIBRARY_ROOT)/design/res \ + $(SUPPORT_LIBRARY_ROOT)/transition/res \ + $(SUPPORT_LIBRARY_ROOT)/v7/appcompat/res \ + $(SUPPORT_LIBRARY_ROOT)/v7/cardview/res \ + $(SUPPORT_LIBRARY_ROOT)/v7/recyclerview/res # We specify each package explicitly to glob resource files. LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ + --extra-packages android.support.coreui \ --extra-packages com.android.contacts.common \ --extra-packages com.android.dialer.app \ --extra-packages com.android.dialer.app.voicemail.error \ |