From 75f4aa66077680f7960ee53545072dcbf6297d99 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Tue, 9 May 2017 15:35:32 -0400 Subject: [PATCH] Update setupwizard library to use correct support-v4 replacements Test: make setup-wizard-lib-gingerbread-compat Change-Id: Id89fa654e1e4517def46925e4f900f93557c347d --- library/Android.mk | 10 ++++++++-- 1 file 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