diff options
| author | Kirill Grouchnikov <kirillg@google.com> | 2017-05-16 01:21:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-16 01:21:38 +0000 |
| commit | 3657de5188c92a9033fe57e9cb6d40bab0ec59e0 (patch) | |
| tree | de4ef169350a71f1ed6c1e62b532d383a829f55b | |
| parent | ca4040eca1e18ab3fdebe66d97f72a8229e45ff1 (diff) | |
| parent | 9842b4a7fd1d852b1353af806da4913b4298d516 (diff) | |
Merge "Tweak app makefile with extra resources" into oc-dev am: e724c7b637
am: 9842b4a7fd
Change-Id: Ic48d984be02fb13395c4d735e673d9e7b1ea7369
| -rw-r--r-- | Android.mk | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk index bd9e63fc7..63f160258 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 @@ -152,15 +146,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 \ |