PeterCxy/SetupWizardLibrary
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Get Support Library resources from prebuilts

Browse source 
am: 9420375022

Change-Id: Id22a9f168143dac94fdebb59f0d5be7579f78416
This commit is contained in:
Jeff Gaston 2018-05-07 12:27:08 -07:00 committed by android-build-merger
parent be834c40f0 9420375022
commit 7774172763
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/Android.mk
View file

@ -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 \

4
library/common-gingerbread.mk
View file

@ -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