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

Merge "Update setupwizard library to use correct support-v4 replacements" into oc-dev

Browse source 
am: 4af0b56277

Change-Id: Ib6314898f33214818c4e9088edb71151d50e89c8
This commit is contained in:
Alan Viverette 2017-05-11 05:38:53 +00:00 committed by android-build-merger
parent 90248d80ea 4af0b56277
commit 6f9823b528
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/Android.mk
View file

@ -44,22 +44,28 @@ LOCAL_SRC_FILES := $(call all-java-files-under, main/src eclair-mr1/src full-sup
ifdef LOCAL_USE_AAPT2
LOCAL_SHARED_ANDROID_LIBRARIES := \
android-support-v4 \
android-support-annotations \
android-support-compat \
android-support-core-ui \
android-support-v7-appcompat \
android-support-v7-recyclerview
else
LOCAL_AAPT_FLAGS := --auto-add-overlay \
--extra-packages android.support.compat \
--extra-packages android.support.v7.appcompat \
--extra-packages android.support.v7.recyclerview
LOCAL_RESOURCE_DIR += \
frameworks/support/compat/res \
frameworks/support/v7/appcompat/res \
frameworks/support/v7/recyclerview/res
LOCAL_JAVA_LIBRARIES := \
android-support-v4 \
android-support-annotations \
android-support-compat \
android-support-core-ui \
android-support-v7-appcompat \
android-support-v7-recyclerview