diff options
| author | Alan Viverette <alanv@google.com> | 2017-05-11 11:35:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-11 11:35:33 +0000 |
| commit | 243ce6c39fe66c55375997ec7404868841d49713 (patch) | |
| tree | 735723a8c78e6d2ae58a8de47402a467437696d5 /library/Android.mk | |
| parent | 3320cd2d70a68cdcce66c73422dce218f4dede05 (diff) | |
| parent | 6f9823b5281b0ca6904ce1009ad958bbc6c254d4 (diff) | |
| download | setupwizard-243ce6c39fe66c55375997ec7404868841d49713.tar.gz | |
Merge "Update setupwizard library to use correct support-v4 replacements" into oc-dev am: 4af0b56277
am: 6f9823b528
Change-Id: I33f1b73492e62093fe1d6ecab87d90ff188b9634
Diffstat (limited to 'library/Android.mk')
| -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 6f530cb..26f5e1f 100644 --- a/library/Android.mk +++ b/library/Android.mk @@ -44,22 +44,28 @@ LOCAL_SRC_FILES := $(call all-java-files-under, main/src gingerbread/src recycle 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 |