Get Support Library resources from prebuilts
Support Library is changing its build process (postprocessing
resource files, via Dejetifier), so its resource files won't be
able to be used directly for now.
Bug: 74196535
Test: m -j checkbuild
Change-Id: I30410d817e4b0a70135c5ed9b7ab3a725307fe09
Merged-In: I30410d817e4b0a70135c5ed9b7ab3a725307fe09
(cherry picked from commit 12b8b856d1
)
This commit is contained in:
parent
97f0b1979b
commit
9420375022
|
@ -60,9 +60,9 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay \
|
||||||
--extra-packages android.support.v7.recyclerview
|
--extra-packages android.support.v7.recyclerview
|
||||||
|
|
||||||
LOCAL_RESOURCE_DIR += \
|
LOCAL_RESOURCE_DIR += \
|
||||||
frameworks/support/compat/res \
|
prebuilts/sdk/current/supportcompat/res \
|
||||||
frameworks/support/v7/appcompat/res \
|
prebuilts/sdk/current/supportv7/appcompat/res \
|
||||||
frameworks/support/v7/recyclerview/res
|
prebuilts/sdk/current/supportv7/recyclerview/res
|
||||||
|
|
||||||
LOCAL_JAVA_LIBRARIES := \
|
LOCAL_JAVA_LIBRARIES := \
|
||||||
android-support-annotations \
|
android-support-annotations \
|
||||||
|
|
|
@ -41,14 +41,14 @@ endif
|
||||||
|
|
||||||
# Include support-v7-appcompat, if not already included
|
# Include support-v7-appcompat, if not already included
|
||||||
ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES)))
|
ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES)))
|
||||||
LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
|
LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res
|
||||||
LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat
|
LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat
|
||||||
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
|
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Include support-v7-recyclerview, if not already included
|
# Include support-v7-recyclerview, if not already included
|
||||||
ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_JAVA_LIBRARIES)))
|
ifeq (,$(findstring android-support-v7-recyclerview,$(LOCAL_STATIC_JAVA_LIBRARIES)))
|
||||||
LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res
|
LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/recyclerview/res
|
||||||
LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview
|
LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview
|
||||||
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview
|
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue