diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:41:33 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 00:41:33 +0000 |
| commit | ad02348c05b1b8badb3ca57fbd2156115c8620e3 (patch) | |
| tree | 94669d73954d5c17b0b0c42eef241aceccc17a62 | |
| parent | 72be46991340563a08e1134efbd598f451e04a96 (diff) | |
| parent | f93d9400486049ecde26d4dc2818d2e72664dcb3 (diff) | |
| download | android_development-ad02348c05b1b8badb3ca57fbd2156115c8620e3.tar.gz android_development-ad02348c05b1b8badb3ca57fbd2156115c8620e3.tar.bz2 android_development-ad02348c05b1b8badb3ca57fbd2156115c8620e3.zip | |
Merge tag 'android-6.0.0_r26' into cm-13.0
Android 6.0.0 release 26
| -rw-r--r-- | build/Android.mk | 10 | ||||
| -rw-r--r-- | build/sdk.atree | 2 | ||||
| -rw-r--r-- | sdk/support_source.prop_template | 2 | ||||
| -rw-r--r-- | tools/recovery_l10n/res/values-pt-rBR/strings.xml | 8 |
4 files changed, 18 insertions, 4 deletions
diff --git a/build/Android.mk b/build/Android.mk index 8b0124b9d..b6445a0d7 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)))) @@ -125,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 \ @@ -134,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) \ $@ 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 ############################################################################## 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 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="recovery_installing" msgid="7864047928003865598">"Instalando atualização do sistema..."</string> + <string name="recovery_erasing" msgid="4612809744968710197">"Apagando..."</string> + <string name="recovery_no_command" msgid="1915703879031023455">"Nenhum comando."</string> + <string name="recovery_error" msgid="4550265746256727080">"Erro!"</string> +</resources> |