diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-11 02:55:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-11 02:55:04 +0000 |
| commit | 4af0b56277d146bb609ce78a58e5389e10d9b250 (patch) | |
| tree | 23c4d81625ad1f03a24c3fd7ae30641104a7f5c0 /library | |
| parent | 8c204e6cb686f669027fa5c3401212c48a0b8694 (diff) | |
| parent | 75f4aa66077680f7960ee53545072dcbf6297d99 (diff) | |
| download | setupwizard-4af0b56277d146bb609ce78a58e5389e10d9b250.tar.gz | |
Merge "Update setupwizard library to use correct support-v4 replacements" into oc-dev
Diffstat (limited to 'library')
| -rw-r--r-- | library/Android.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/library/Android.mk b/library/Android.mk index 8333792..094d795 100644 --- a/library/Android.mk +++ b/library/Android.mk @@ -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 |