From 844574cb2c69dcd57be9523f0c2c0c3dcc4da867 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Tue, 25 Aug 2015 11:52:21 -0700 Subject: Update LayoutLib revision number. [DO NOT MERGE] Change-Id: I5a32442861809dfa8e4b39a232777388f8c082b5 --- sdk/platform_source.prop_template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template index 0eb8dd228..97cc98d79 100644 --- a/sdk/platform_source.prop_template +++ b/sdk/platform_source.prop_template @@ -2,9 +2,9 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.UserSrc=false Platform.Version=${PLATFORM_VERSION} Platform.CodeName=LOLLIPOP_MR1 -Pkg.Revision=2 +Pkg.Revision=3 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} -Layoutlib.Api=14 -Layoutlib.Revision=2 +Layoutlib.Api=15 +Layoutlib.Revision=3 Platform.MinToolsRev=22 -- cgit v1.2.3 From 53ad2de7f6677c31eb42dbd117b4857f38fc36f4 Mon Sep 17 00:00:00 2001 From: Yusuf Ozuysal Date: Tue, 25 Aug 2015 15:43:46 -0700 Subject: 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. Change-Id: Id6d71e4071c0725257cadb539cd47230d6727914 --- build/sdk.atree | 2 ++ 1 file changed, 2 insertions(+) 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 ############################################################################## -- cgit v1.2.3 From 04a6dcacf0a86b6b0d243a88c8bcf87f24516045 Mon Sep 17 00:00:00 2001 From: Yusuf Ozuysal Date: Wed, 26 Aug 2015 23:31:45 +0000 Subject: Revert "Add customtabs support lib to extras/android/support/" This reverts commit 53ad2de7f6677c31eb42dbd117b4857f38fc36f4. Change-Id: Ia9831d344e6e0b12c55544b02254daae109f09c5 --- build/sdk.atree | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/sdk.atree b/build/sdk.atree index ee1e25132..f0f7eaeb4 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -519,8 +519,6 @@ 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 ############################################################################## -- cgit v1.2.3 From e226a0f56949b1d6ab97a31ed987adb7f7513be9 Mon Sep 17 00:00:00 2001 From: Yusuf Ozuysal Date: Tue, 25 Aug 2015 15:43:46 -0700 Subject: 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 ############################################################################## -- cgit v1.2.3 From a33101aaff945c516946e27bf0f807f5d97f0a39 Mon Sep 17 00:00:00 2001 From: Chris Flatt Date: Thu, 27 Aug 2015 10:29:15 -0700 Subject: Bump support library version to 23.0.1 DO NOT MERGE Change-Id: I268eea0b49a9bf611e36bb9cc5d91adf2a2ff01e --- sdk/support_source.prop_template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/support_source.prop_template b/sdk/support_source.prop_template index f5b217eec..f89771291 100644 --- a/sdk/support_source.prop_template +++ b/sdk/support_source.prop_template @@ -1,5 +1,5 @@ Pkg.UserSrc=false -Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0 +Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1 Extra.Vendor=android Extra.VendorId=android Extra.VendorDisplay=Android -- cgit v1.2.3 From 991947efccc5d6d6de9c21a9548a0ff143e51e84 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Fri, 18 Sep 2015 10:08:02 -0700 Subject: Import translations. DO NOT MERGE Change-Id: I52f9e0ca4704f52015b44af909c18b966f03ff05 Auto-generated-cl: translation import --- tools/recovery_l10n/res/values-pt-rBR/strings.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tools/recovery_l10n/res/values-pt-rBR/strings.xml diff --git a/tools/recovery_l10n/res/values-pt-rBR/strings.xml b/tools/recovery_l10n/res/values-pt-rBR/strings.xml new file mode 100644 index 000000000..3cc57234e --- /dev/null +++ b/tools/recovery_l10n/res/values-pt-rBR/strings.xml @@ -0,0 +1,8 @@ + + + "Instalando atualização do sistema..." + "Apagando..." + "Nenhum comando." + "Erro!" + -- cgit v1.2.3 From 82336df0c11445ba7ce6228bb4983a914328c710 Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Fri, 21 Aug 2015 12:55:15 -0700 Subject: Pass in current android.jar to api-generator This ensures that the api-versions.xml shipped with the SDK always includes the correct latest API data (see http://b.android.com/183500) Change-Id: I96a6b0218abeaf3865a49de0fdd2be933f88c469 (cherry picked from commit fbe6c8105a6cbd880ff50d9799e23cf1790f1301) --- build/Android.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/Android.mk b/build/Android.mk index 72ec31db7..b6445a0d7 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -126,7 +126,7 @@ $(foreach lib, $(ANDROID_SUPPORT_LIBRARIES), $(eval $(call _package_sdk_library, ALL_SDK_FILES += $(HOST_OUT)/development/sdk/generated-api-versions.xml -api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-22.9.2.jar +api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-22.9.3.jar api_gen_deps := \ $(TOPDIR)prebuilts/tools/common/kxml2-tools/kxml2-2.3.0.jar \ $(TOPDIR)prebuilts/tools/common/asm-tools/asm-4.0.jar \ @@ -135,11 +135,14 @@ api_gen_deps := \ api_gen_classpath := $(subst $(space),:,$(api_gen_jar) $(api_gen_deps)) -$(HOST_OUT)/development/sdk/generated-api-versions.xml : +$(HOST_OUT)/development/sdk/generated-api-versions.xml: $(android_jar_full_target) java -cp $(api_gen_classpath) \ com.android.apigenerator.Main \ --pattern $(TOPDIR)prebuilts/tools/common/api-versions/android-%/android.jar \ --pattern $(TOPDIR)prebuilts/sdk/%/android.jar \ + --current-version $(PLATFORM_SDK_VERSION) \ + --current-codename $(PLATFORM_VERSION_CODENAME) \ + --current-jar $(android_jar_full_target) \ $@ -- cgit v1.2.3