From e226a0f56949b1d6ab97a31ed987adb7f7513be9 Mon Sep 17 00:00:00 2001 From: Yusuf Ozuysal Date: Tue, 25 Aug 2015 15:43:46 -0700 Subject: [PATCH] Add customtabs support lib to extras/android/support/ Currently the only way to get access to customtabs library through download m2repository and using the aar file whereas all other support libs are also present in extras/android/support/ with the corresponding resources and jar file. This adds the jar and manifest to the corresponding folder to avoid the confusion to developers. This is relanding https://googleplex-android-review.git.corp.google.com/#/c/756492/ after it was reverted due to not having the corresponding Android.mk change. Change-Id: I21969994e1dd0bb4f9abbfa395cf284e3cfc396d --- build/Android.mk | 3 ++- build/sdk.atree | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/Android.mk b/build/Android.mk index 8b0124b9d..72ec31db7 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -117,7 +117,8 @@ ANDROID_SUPPORT_LIBRARIES := \ android-support-multidex \ android-support-multidex-instrumentation \ android-support-design \ - android-support-percent + android-support-percent \ + 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 f0f7eaeb4..ee1e25132 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -519,6 +519,8 @@ frameworks/support/percent/res frameworks/support/percent/src/.readme extras/android/support/percent/src/.readme ${OUT_DIR}/target/common/obj/PACKAGING/android-support-percent_intermediates/android-support-percent.jar extras/android/support/percent/libs/android-support-percent.jar +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 ############################################################################## # Tests Component ##############################################################################