diff options
| author | Kirill Grouchnikov <kirillg@google.com> | 2017-05-16 01:32:43 +0000 |
|---|---|---|
| committer | Kirill Grouchnikov <kirillg@google.com> | 2017-05-16 01:32:43 +0000 |
| commit | fa34097f74f534301dbbe97aff391b63c47af3a8 (patch) | |
| tree | 1a45d60921e293c6088efeaf4d9c408456f3e0e2 | |
| parent | cb06686aba5b9e080e1b758e2ea17a73be648601 (diff) | |
| download | android_packages_apps_Dialer-fa34097f74f534301dbbe97aff391b63c47af3a8.tar.gz android_packages_apps_Dialer-fa34097f74f534301dbbe97aff391b63c47af3a8.tar.bz2 android_packages_apps_Dialer-fa34097f74f534301dbbe97aff391b63c47af3a8.zip | |
Revert "Tweak app makefile with extra resources"
This reverts commit cb06686aba5b9e080e1b758e2ea17a73be648601.
Bug: 30240339
Change-Id: Ida9c44c7d856d9bcbf921fcd8ff05cef88b69b7c
| -rw-r--r-- | Android.mk | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk index e1e9ef5da..b00519f48 100644 --- a/Android.mk +++ b/Android.mk @@ -7,6 +7,12 @@ 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 @@ -142,17 +148,15 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH) LOCAL_RESOURCE_DIR := \ $(addprefix $(LOCAL_PATH)/, $(RES_DIRS)) \ - $(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 + $(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 # 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 \ |