diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-10-30 22:29:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-30 22:29:35 +0000 |
| commit | 664d0e51248c03475479212418ec973bed913bf2 (patch) | |
| tree | 1ddb318f9f33be91189ac48609de45d89122f768 | |
| parent | 774321318c2b779d9edaf02e9a7e10ef2a8cad90 (diff) | |
| parent | a20df31aea1581c0228cd8efe838bd31c6163ee7 (diff) | |
Merge "Build against prebuilt support library resources in unbundled builds" into ub-contactsdialer-a-dev
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 0d7754c3e..bd0c9dec2 100644 --- a/Android.mk +++ b/Android.mk @@ -7,6 +7,12 @@ incallui_dir := ../InCallUI contacts_common_dir := ../ContactsCommon 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 \ $(incallui_dir)/src \ $(contacts_common_dir)/src \ @@ -19,10 +25,10 @@ res_dirs := res \ LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \ - frameworks/support/v7/appcompat/res \ - frameworks/support/v7/cardview/res \ - frameworks/support/v7/recyclerview/res \ - frameworks/support/design/res + $(support_library_root_dir)/v7/cardview/res \ + $(support_library_root_dir)/v7/recyclerview/res \ + $(support_library_root_dir)/v7/appcompat/res \ + $(support_library_root_dir)/design/res LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ |