From fab9a1f2672ca4e1a47845d68cc787811c50338b Mon Sep 17 00:00:00 2001 From: Tony Mantler Date: Fri, 28 Aug 2015 10:15:28 -0700 Subject: [PATCH] Add preference and recommendation libs to SDK build Change-Id: I00c716c42ffbd04b382b1b3016fcc19e9321ae48 --- build/Android.mk | 4 ++++ build/sdk.atree | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/build/Android.mk b/build/Android.mk index b6445a0d7..ae6ae1f42 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -111,13 +111,17 @@ ANDROID_SUPPORT_LIBRARIES := \ android-support-v7-gridlayout \ android-support-v7-mediarouter \ android-support-v7-palette \ + android-support-v7-preference \ android-support-v7-recyclerview \ android-support-v13 \ + android-support-v14-preference \ android-support-v17-leanback \ + android-support-v17-preference-leanback \ android-support-multidex \ android-support-multidex-instrumentation \ android-support-design \ android-support-percent \ + android-support-recommendation \ android-support-customtabs $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library,$(lib)))) diff --git a/build/sdk.atree b/build/sdk.atree index ee1e25132..0cb706e88 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -521,6 +521,22 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android-support-percent_intermediates/and frameworks/support/customtabs/AndroidManifest.xml extras/android/support/customtabs/AndroidManifest.xml ${OUT_DIR}/target/common/obj/PACKAGING/android-support-customtabs_intermediates/android-support-customtabs.jar extras/android/support/customtabs/libs/android-support-customtabs.jar + +frameworks/support/v7/preference/AndroidManifest.xml extras/android/support/v7/preference/AndroidManifest.xml +frameworks/support/v7/preference/res extras/android/support/v7/preference/res +${OUT_DIR}/target/common/obj/PACKAGING/android-support-v7-preference_intermediates/android-support-v7-preference.jar extras/android.support/v7/preference/libs/android-support-v7-preference.jar + +frameworks/support/v14/preference/AndroidManifest.xml extras/android/support/v14/preference/AndroidManifest.xml +frameworks/support/v14/preference/res extras/android/support/v14/preference/res +${OUT_DIR}/target/common/obj/PACKAGING/android-support-v14-preference_intermediates/android-support-v14-preference.jar extras/android.support/v14/preference/libs/android-support-v14-preference.jar + +frameworks/support/v17/preference-leanback/AndroidManifest.xml extras/android/support/v17/preference-leanback/AndroidManifest.xml +frameworks/support/v17/preference-leanback/res extras/android/support/v17/preference-leanback/res +${OUT_DIR}/target/common/obj/PACKAGING/android-support-v17-preference-leanback_intermediates/android-support-v17-preference-leanback.jar extras/android.support/v17/preference-leanback/libs/android-support-v17-preference-leanback.jar + +frameworks/support/recommendation/AndroidManifest.xml extras/android/support/recommendation/AndroidManifest.xml +${OUT_DIR}/target/common/obj/PACKAGING/android-support-recommendation_intermediates/android-support-recommendation.jar extras/android.support/recommendation/libs/android-support-recommendation.jar + ############################################################################## # Tests Component ##############################################################################