diff options
| author | Kirill Grouchnikov <kirillg@google.com> | 2017-05-16 01:53:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-16 01:53:11 +0000 |
| commit | 0f06aaa50871aff47d733aace635021f4f2ef2ca (patch) | |
| tree | 69b65fe930928468ae868297cca84116c1b74a9c /Android.mk | |
| parent | c57430a61eab62e88372f386c75989dab6332608 (diff) | |
| parent | fb63fc2c6b774b54957466729f17108ffcf22c4b (diff) | |
| download | android_packages_apps_Dialer-0f06aaa50871aff47d733aace635021f4f2ef2ca.tar.gz android_packages_apps_Dialer-0f06aaa50871aff47d733aace635021f4f2ef2ca.tar.bz2 android_packages_apps_Dialer-0f06aaa50871aff47d733aace635021f4f2ef2ca.zip | |
Merge "Revert "Tweak app makefile with extra resources"" into oc-dev
am: fb63fc2c6b
Change-Id: I88573a3020e6394f819245dea10ad741b6ccb81a
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk index b2372859c..1388b0133 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 @@ -150,17 +156,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.about \ --extra-packages com.android.dialer.app \ |