From e447ac22334e141b718f5512d70479d3467b4b34 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Apr 2015 17:25:21 -0700 Subject: "MRZ23B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..7d71231 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ23B -- cgit v1.1 From f7533d3f7d1549a12bb0b7ca081922a318cd764c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Apr 2015 07:56:15 -0700 Subject: "MRZ24" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..b22fc4b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ24 -- cgit v1.1 From 8a9607260cc3d751e62af4dda3d94a39c97570f9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 25 Apr 2015 01:08:20 -0700 Subject: "MRZ25" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..4177cfa 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ25 -- cgit v1.1 From f9ecd3fc8caa1be4a9faaab4c9a21ff12e970cff Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 26 Apr 2015 01:04:07 -0700 Subject: "MRZ26" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..72c2811 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ26 -- cgit v1.1 From efc9f52a64a0a5e207d098937b64ad5bb0dab9ec Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Apr 2015 01:01:52 -0700 Subject: "MRZ27" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..334066e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ27 -- cgit v1.1 From a37d793fca1facb6f00b72a05f9ea4f889d3d766 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Apr 2015 14:53:29 -0700 Subject: "MRZ27B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 334066e..ebaaff7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ27 +export BUILD_ID=MRZ27B -- cgit v1.1 From 0ab1fbd6b12e6ebee99baccc30fd875f2523abd4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Apr 2015 01:04:32 -0700 Subject: "MRZ28" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..7f8ccb6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ28 -- cgit v1.1 From 740279f403e291c01cab6987cdab7bdee5b153aa Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Apr 2015 10:34:09 -0700 Subject: "MRZ28B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7f8ccb6..a119271 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ28 +export BUILD_ID=MRZ28B -- cgit v1.1 From 13296f90416c75d22a105304f0f90ae3eccc90c6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Apr 2015 14:32:37 -0700 Subject: "MRZ28C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a119271..47d9a50 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ28B +export BUILD_ID=MRZ28C -- cgit v1.1 From c2309f5e0971c1792a4fd1dd65e82d6d0adfffbd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Apr 2015 01:06:51 -0700 Subject: "MRZ29" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..15cde5d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ29 -- cgit v1.1 From fbd11a5b6548d67488b44b1a9543e8d988e88af1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Apr 2015 12:44:00 -0700 Subject: "MRZ29B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 15cde5d..d0a6a38 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ29 +export BUILD_ID=MRZ29B -- cgit v1.1 From 1a83636362c9894983fcfc2ef5e2389084d7d4e7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Apr 2015 01:04:45 -0700 Subject: "MRZ30" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..cef0ca7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ30 -- cgit v1.1 From f771c7e7ddcdc989ac756db3e48c219a2de65a19 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Apr 2015 14:37:30 -0700 Subject: "MRZ30B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cef0ca7..802a05f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ30 +export BUILD_ID=MRZ30B -- cgit v1.1 From 2d43098ba4ed50f55f1b96a831e045d744172421 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 1 May 2015 11:46:13 -0700 Subject: "MRZ30C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 802a05f..b5f3df1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ30B +export BUILD_ID=MRZ30C -- cgit v1.1 From 9e2df498dd33c3929d69037857fb48358fdbec43 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 1 May 2015 13:34:32 -0700 Subject: "MRZ30D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b5f3df1..270ab3f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ30C +export BUILD_ID=MRZ30D -- cgit v1.1 From 708d1d12d2878973b22bcf7d8b2978f319c0519d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 2 May 2015 01:05:58 -0700 Subject: "MRZ32" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..e8d3faa 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ32 -- cgit v1.1 From 875982a984a1283e6190db36c376a282ece19e7a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 3 May 2015 01:02:13 -0700 Subject: "MRZ33" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..b090ee7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ33 -- cgit v1.1 From 8f049bd61482b05d1bd7226d640634d40681fd11 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 4 May 2015 01:01:56 -0700 Subject: "MRZ34" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..49cabfa 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ34 -- cgit v1.1 From 01f3dbc9ebeb72861d86060a501d51a0c130430f Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 4 May 2015 18:39:46 +0000 Subject: Revert "Don't extract jni from prebuilt apks." This reverts commit 3797466fbd31cc3ca5a1eddea64e7fdf0921ea67. Bug: 20810492 Bug: 20811499 Change-Id: Ic922d9daccc4550db489c0f3d4ad6b4ff85b5e60 --- core/clear_vars.mk | 1 + core/definitions.mk | 22 +++++++++++----------- core/install_jni_libs.mk | 10 +++++----- core/install_jni_libs_internal.mk | 32 ++++++++++++++++++++++++++++---- core/package_internal.mk | 1 + core/prebuilt_internal.mk | 14 ++++++-------- 6 files changed, 52 insertions(+), 28 deletions(-) diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 7b3f1c5..eb133dc 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -20,6 +20,7 @@ LOCAL_UNSTRIPPED_PATH:= LOCAL_MODULE_CLASS:= LOCAL_MODULE_SUFFIX:= LOCAL_PACKAGE_NAME:= +LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES:= LOCAL_OVERRIDES_PACKAGES:= LOCAL_EXPORT_PACKAGE_RESOURCES:= LOCAL_MANIFEST_PACKAGE_NAME:= diff --git a/core/definitions.mk b/core/definitions.mk index f674d9f..fc18ee3 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2097,7 +2097,8 @@ $(hide) mkdir -p $(addprefix $(dir $@)lib/,$(PRIVATE_JNI_SHARED_LIBRARIES_ABI)) $(foreach abi,$(PRIVATE_JNI_SHARED_LIBRARIES_ABI),\ $(call _add-jni-shared-libs-to-package-per-abi,$(abi),\ $(patsubst $(abi):%,%,$(filter $(abi):%,$(PRIVATE_JNI_SHARED_LIBRARIES))))) -$(hide) (cd $(dir $@) && zip -r -0 $(notdir $@) lib) +$(hide) (cd $(dir $@) && zip -r \ + $(if $(filter true, $(PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES)),-0,) $(notdir $@) lib) $(hide) rm -rf $(dir $@)lib endef @@ -2143,22 +2144,21 @@ endef define align-package $(hide) mv $@ $@.unaligned $(hide) $(ZIPALIGN) \ - -f -p \ + -f \ + $(if $(filter true, $(PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES)),-p,) \ 4 \ $@.unaligned $@.aligned $(hide) mv $@.aligned $@ endef -# Uncompress shared libraries embedded in an apk. -# define uncompress-shared-libs -$(hide) if unzip -l $@ $(PRIVATE_EMBEDDED_JNI_LIBS) >/dev/null ; then \ - rm -rf $(dir $@)uncompressedlibs && mkdir $(dir $@)uncompressedlibs; \ - unzip $@ $(PRIVATE_EMBEDDED_JNI_LIBS) -d $(dir $@)uncompressedlibs && \ - zip -d $@ 'lib/*.so' && \ - ( cd $(dir $@)uncompressedlibs && zip -D -r -0 ../$(notdir $@) lib ) && \ - rm -rf $(dir $@)uncompressedlibs; \ - fi +$(hide) rm -rf $(dir $@)/tmpworkdir +$(hide) mv $@ $@.compressed +$(hide) mkdir $(dir $@)/tmpworkdir +$(hide) unzip $@.compressed 'lib/*.so' -d $(dir $@)/tmpworkdir +$(hide) ( cd $(dir $@)/tmpworkdir && zip -D -r -0 ../$(notdir $@).compressed lib ) +$(hide) mv $@.compressed $@ +$(hide) rm -rf $(dir $@)/tmpworkdir endef define install-dex-debug diff --git a/core/install_jni_libs.mk b/core/install_jni_libs.mk index 625a8a2..da3032d 100644 --- a/core/install_jni_libs.mk +++ b/core/install_jni_libs.mk @@ -8,7 +8,7 @@ # # Output variables: # jni_shared_libraries, jni_shared_libraries_abi, jni_shared_libraries_with_abis if we are going to embed the libraries into the apk; -# embedded_prebuilt_jni_libs, prebuilt jni libs embedded in prebuilt apk. +# extracted_jni_libs, if we extract jni libs from prebuilt apk. # my_embed_jni := @@ -27,7 +27,7 @@ jni_shared_libraries := jni_shared_libraries_abis := # jni_shared_libraries_with_abis is a list of : jni_shared_libraries_with_abis := -embedded_prebuilt_jni_libs := +extracted_jni_libs := ####################################### # For TARGET_ARCH @@ -51,7 +51,7 @@ jni_shared_libraries += $(my_jni_shared_libraries) jni_shared_libraries_abis += $(my_jni_shared_libraries_abi) jni_shared_libraries_with_abis += $(addprefix $(my_jni_shared_libraries_abi):,\ $(my_jni_shared_libraries)) -embedded_prebuilt_jni_libs += $(my_embedded_prebuilt_jni_libs) +extracted_jni_libs += $(my_extracted_jni_libs) # Include RS dynamically-generated libraries as well # TODO: Add multilib support once RS supports generating multilib libraries. @@ -83,11 +83,11 @@ jni_shared_libraries += $(my_jni_shared_libraries) jni_shared_libraries_abis += $(my_jni_shared_libraries_abi) jni_shared_libraries_with_abis += $(addprefix $(my_jni_shared_libraries_abi):,\ $(my_jni_shared_libraries)) -embedded_prebuilt_jni_libs += $(my_embedded_prebuilt_jni_libs) +extracted_jni_libs += $(my_extracted_jni_libs) endif # my_add_jni endif # TARGET_2ND_ARCH jni_shared_libraries := $(strip $(jni_shared_libraries)) jni_shared_libraries_abis := $(sort $(jni_shared_libraries_abis)) jni_shared_libraries_with_abis := $(strip $(jni_shared_libraries_with_abis)) -embedded_prebuilt_jni_libs := $(strip $(embedded_prebuilt_jni_libs)) +extracted_jni_libs := $(strip $(extracted_jni_libs)) diff --git a/core/install_jni_libs_internal.mk b/core/install_jni_libs_internal.mk index 16d0962..634fdf3 100644 --- a/core/install_jni_libs_internal.mk +++ b/core/install_jni_libs_internal.mk @@ -9,7 +9,7 @@ # # Output variables: # my_jni_shared_libraries, my_jni_shared_libraries_abi, if we are going to embed the libraries into the apk; -# my_embedded_prebuilt_jni_libs, prebuilt jni libs embedded in prebuilt apk. +# my_extracted_jni_libs, if we extract jni libs from prebuilt apk. # my_jni_shared_libraries := \ @@ -19,7 +19,7 @@ my_jni_shared_libraries := \ # App-specific lib path. my_app_lib_path := $(dir $(LOCAL_INSTALLED_MODULE))lib/$(TARGET_$(my_2nd_arch_prefix)ARCH) -my_embedded_prebuilt_jni_libs := +my_extracted_jni_libs := ifdef my_embed_jni # App explicitly requires the prebuilt NDK stl shared libraies. @@ -76,10 +76,34 @@ endif # $(my_jni_shared_libraries) not empty endif # my_embed_jni ifdef my_prebuilt_jni_libs -# Files like @lib//libfoo.so (path inside the apk) are JNI libs embedded prebuilt apk; +# Install prebuilt JNI libs to the app specific lib path. +# Files like @path/to/libfoo.so (path inside the apk) are JNI libs extracted from the prebuilt apk; # Files like path/to/libfoo.so (path relative to LOCAL_PATH) are prebuilts in the source tree. -my_embedded_prebuilt_jni_libs := $(patsubst @%,%, \ +my_extracted_jni_libs := $(patsubst @%,%, \ $(filter @%, $(my_prebuilt_jni_libs))) +ifdef my_extracted_jni_libs +ifndef my_prebuilt_src_file +$(error No prebuilt apk to extract prebuilt jni libraries $(my_extracted_jni_libs)) +endif +ifeq ($(LOCAL_CERTIFICATE),PRESIGNED) +$(warning Extracting files using LOCAL_PREBUILT_JNI_LIBS cannot be done while) +$(warning using LOCAL_CERTIFICATE:=PRESIGNED, as this would corrupt) +$(warning the APK or waste disk space. Instead, you should delete) +$(warning LOCAL_PREBUILT_JNI_LIBS and use LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES:=true) +$(warning This will allow loading of shared libraries directly from the APK,) +$(warning eliminating the need to separately extract them.) +$(error Failed to build: $(LOCAL_MODULE)) +endif +# We use the first jni lib file as dependency. +my_installed_prebuilt_jni := $(my_app_lib_path)/$(notdir $(firstword $(my_extracted_jni_libs))) +$(my_installed_prebuilt_jni): PRIVATE_JNI_LIBS := $(my_extracted_jni_libs) +$(my_installed_prebuilt_jni): $(my_prebuilt_src_file) + @echo "Extract JNI libs ($@ <- $<)" + @mkdir -p $(dir $@) + $(hide) unzip -j -o -d $(dir $@) $< $(PRIVATE_JNI_LIBS) && touch $@ + +$(LOCAL_INSTALLED_MODULE) : | $(my_installed_prebuilt_jni) +endif # prebuilt JNI exsiting as separate source files. my_prebuilt_jni_libs := $(addprefix $(LOCAL_PATH)/, \ diff --git a/core/package_internal.mk b/core/package_internal.mk index 23648c1..fee484f 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -392,6 +392,7 @@ $(LOCAL_BUILT_MODULE): $(AAPT) | $(ZIPALIGN) $(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES := $(jni_shared_libraries_with_abis) # PRIVATE_JNI_SHARED_LIBRARIES_ABI is a list of ABI names. $(LOCAL_BUILT_MODULE): PRIVATE_JNI_SHARED_LIBRARIES_ABI := $(jni_shared_libraries_abis) +$(LOCAL_BUILT_MODULE): PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES := $(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES) ifneq ($(TARGET_BUILD_APPS),) # Include all resources for unbundled apps. LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index 19fdad6..8d03746 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -195,18 +195,14 @@ endif include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk ####################################### # Sign and align non-presigned .apks. - -# The embedded prebuilt jni to uncompress. -ifndef embedded_prebuilt_jni_libs -# No LOCAL_PREBUILT_JNI_LIBS, uncompress all. -embedded_prebuilt_jni_libs := 'lib/*.so' -endif -$(built_module): PRIVATE_EMBEDDED_JNI_LIBS := $(embedded_prebuilt_jni_libs) - +$(built_module) : PRIVATE_PAGE_ALIGN_JNI_SHARED_LIBRARIES := $(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES) $(built_module) : $(my_prebuilt_src_file) | $(ACP) $(ZIPALIGN) $(SIGNAPK_JAR) $(transform-prebuilt-to-target) ifneq ($(LOCAL_CERTIFICATE),PRESIGNED) @# Only strip out files if we can re-sign the package. +ifdef extracted_jni_libs + $(hide) zip -d $@ 'lib/*.so' # strip embedded JNI libraries. +endif ifdef LOCAL_DEX_PREOPT ifneq (nostripping,$(LOCAL_DEX_PREOPT)) $(call dexpreopt-remove-classes.dex,$@) @@ -214,7 +210,9 @@ endif endif $(sign-package) endif +ifeq ($(LOCAL_PAGE_ALIGN_JNI_SHARED_LIBRARIES),true) $(uncompress-shared-libs) +endif $(align-package) ############################### -- cgit v1.1 From 20e7715b783187e76c5f894387e93bd2496f054f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 4 May 2015 12:48:22 -0700 Subject: "MRZ34B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 49cabfa..ddd9ce6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ34 +export BUILD_ID=MRZ34B -- cgit v1.1 From 0128279316a9299e6921c8181c202fc0bbeb2d2d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 4 May 2015 18:44:34 -0700 Subject: "MRZ34C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ddd9ce6..6ad5d05 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ34B +export BUILD_ID=MRZ34C -- cgit v1.1 From 68cc486663ae077a8bf08f656de5c082c7a309b7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 5 May 2015 01:10:03 -0700 Subject: "MRZ35" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..b11d069 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ35 -- cgit v1.1 From 01864b7cd0774ab2a6402d219d90fda2c68379ee Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 5 May 2015 13:11:17 -0700 Subject: "MRZ35B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b11d069..2fbc30b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ35 +export BUILD_ID=MRZ35B -- cgit v1.1 From c4fc651e1b89c4fc8f7466d24b481217b92c8f64 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 6 May 2015 01:06:16 -0700 Subject: "MRZ36" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..9ca47ab 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ36 -- cgit v1.1 From 2014678b59c06208d10c0db15cd2b45d374bf15b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 6 May 2015 13:51:22 -0700 Subject: "MRZ36B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9ca47ab..a886ca1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ36 +export BUILD_ID=MRZ36B -- cgit v1.1 From 8b834ff64bf1bd8cdbbc7c805ea1e1a9aad26518 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 May 2015 01:05:34 -0700 Subject: "MRZ37" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..dca1699 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ37 -- cgit v1.1 From b5dc52a7b0f544a8f8f407022c690fbb097baa7a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 May 2015 11:21:33 -0700 Subject: "MRZ37B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index dca1699..1868638 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ37 +export BUILD_ID=MRZ37B -- cgit v1.1 From a8791956cb74580249029c0eaa4dc953e9d1a884 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 May 2015 13:39:59 -0700 Subject: "MRZ37C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1868638..508f1e3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ37B +export BUILD_ID=MRZ37C -- cgit v1.1 From aca3465072334363ce928783dcca299e51f163dd Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Thu, 7 May 2015 14:55:48 +0000 Subject: Revert "Switch from Calculator to ExactCalculator" Temporary revert to get TT builds in shape. This reverts commit 846505dc35bb155c1c2cf54d407a946e8f732494. Bug: 20745303 Change-Id: Id3455cba38b7aabaffa63c8531a6430f69897c6e --- target/product/core.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/core.mk b/target/product/core.mk index d453303..519dbb8 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -23,6 +23,7 @@ PRODUCT_PACKAGES += \ BasicDreams \ Browser \ + Calculator \ Calendar \ CalendarProvider \ CaptivePortalLogin \ @@ -32,7 +33,6 @@ PRODUCT_PACKAGES += \ DocumentsUI \ DownloadProviderUi \ Email \ - ExactCalculator \ Exchange2 \ ExternalStorageProvider \ FusedLocation \ -- cgit v1.1 From 978c935e530c0ff08a768298699c53dead4327b4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 May 2015 08:42:24 -0700 Subject: "MRZ37D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 508f1e3..4b683eb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ37C +export BUILD_ID=MRZ37D -- cgit v1.1 From d15dbd72a82f6eea19fb111ba2bb2742fd539093 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 May 2015 12:57:15 -0700 Subject: "MRZ37E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b683eb..5f0bdef 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ37D +export BUILD_ID=MRZ37E -- cgit v1.1 From 44791bfdc1f81e559207268d478404716589f878 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 May 2015 13:18:59 -0700 Subject: "MRZ37F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5f0bdef..0a834db 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ37E +export BUILD_ID=MRZ37F -- cgit v1.1 From 53031ff9494da99623767925280d1c6e3df53b55 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 9 May 2015 01:08:20 -0700 Subject: "MRZ39" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..34ccd9a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ39 -- cgit v1.1 From 02c2b6a29b6bb55cb6d33d4e9c50d4fda49d233d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 10 May 2015 01:02:31 -0700 Subject: "MRZ40" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..450a2c0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ40 -- cgit v1.1 From b599734171b5a39bffe0db7a63ccec3efbcb83c1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 10 May 2015 18:29:00 -0700 Subject: MRZ40B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 450a2c0..e589ff6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ40 +export BUILD_ID=MRZ40B -- cgit v1.1 From 705e75b8e982424949db1a53d80500fea7d303c5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 May 2015 01:02:31 -0700 Subject: "MRZ41" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..3673279 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ41 -- cgit v1.1 From cd30cbdac965a51b039c87784b95f844695bfcf2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 May 2015 14:24:14 -0700 Subject: "MRZ41B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3673279..3886052 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ41 +export BUILD_ID=MRZ41B -- cgit v1.1 From 926997524cbdbd2125c1bfc2ff56a11ff68aa85e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 May 2015 01:05:34 -0700 Subject: "MRZ42" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..0372292 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ42 -- cgit v1.1 From c06ecd22231a3516cf46aeb7892cf38cf797bb9c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 May 2015 12:36:27 -0700 Subject: "MRZ42B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0372292..9404d86 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ42 +export BUILD_ID=MRZ42B -- cgit v1.1 From e1bf3dd3e4c6115b2874295bb7f988ba99756df9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 May 2015 14:36:30 -0700 Subject: "MRZ42C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9404d86..ee40129 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ42B +export BUILD_ID=MRZ42C -- cgit v1.1 From 74b278886425aa6f379357a698d284f49d111e62 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 May 2015 01:08:35 -0700 Subject: "MRZ43" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..fb78f4c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ43 -- cgit v1.1 From 3bc0bc595b49382dc0818bd4780871ba0ccf1542 Mon Sep 17 00:00:00 2001 From: Geoff Mendal Date: Wed, 13 May 2015 09:57:01 -0700 Subject: Add locales sq_AL, gu_IN, and pa_IN for mnc-{dev,release} Bug: 21095280 --- target/product/languages_full.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/languages_full.mk b/target/product/languages_full.mk index 6d77cde..9d80b0e 100644 --- a/target/product/languages_full.mk +++ b/target/product/languages_full.mk @@ -21,4 +21,4 @@ # These are all the locales that have translations and are displayable # by TextView in this branch. -PRODUCT_LOCALES := en_US en_AU en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ pl_PL ja_JP zh_TW zh_CN zh_HK ru_RU ko_KR nb_NO es_US da_DK el_GR tr_TR pt_PT pt_BR rm_CH sv_SE bg_BG ca_ES en_GB fi_FI hi_IN hr_HR hu_HU in_ID iw_IL lt_LT lv_LV ro_RO sk_SK sl_SI sr_RS uk_UA vi_VN tl_PH ar_EG fa_IR th_TH sw_TZ ms_MY af_ZA zu_ZA am_ET hi_IN en_XA ar_XB fr_CA km_KH lo_LA ne_NP si_LK mn_MN hy_AM az_AZ ka_GE my_MM mr_IN ml_IN is_IS mk_MK ky_KG eu_ES gl_ES bn_BD ta_IN kn_IN te_IN uz_UZ ur_PK kk_KZ +PRODUCT_LOCALES := en_US en_AU en_IN fr_FR it_IT es_ES et_EE de_DE nl_NL cs_CZ pl_PL ja_JP zh_TW zh_CN zh_HK ru_RU ko_KR nb_NO es_US da_DK el_GR tr_TR pt_PT pt_BR rm_CH sv_SE bg_BG ca_ES en_GB fi_FI hi_IN hr_HR hu_HU in_ID iw_IL lt_LT lv_LV ro_RO sk_SK sl_SI sr_RS uk_UA vi_VN tl_PH ar_EG fa_IR th_TH sw_TZ ms_MY af_ZA zu_ZA am_ET hi_IN en_XA ar_XB fr_CA km_KH lo_LA ne_NP si_LK mn_MN hy_AM az_AZ ka_GE my_MM mr_IN ml_IN is_IS mk_MK ky_KG eu_ES gl_ES bn_BD ta_IN kn_IN te_IN uz_UZ ur_PK kk_KZ sq_AL gu_IN pa_IN -- cgit v1.1 From 3e8f16115a51665894061d5231b9b0493832ae71 Mon Sep 17 00:00:00 2001 From: dcashman Date: Tue, 12 May 2015 11:31:09 -0700 Subject: Remove libc++ from prepackaged shared libs in cts. Commit 28acbeab18f6083299c07f9ebe769d22e49f8107 removed the dependency of sepolicy-analyze on libc++, eliminating the only consumer of the library for the cts host-side tests. Remove the library since it is no longer needed but leave the ability to add other shared libs in the future. (cherry-pick of commit: 214a171424cea488f0a5c042cf18f56550693570) Bug: 19566396 Change-Id: I36f45c3e92c2d6370e98baa4c527835af66691fa --- core/tasks/cts.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 668d5bb..c7e4ed6 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -92,8 +92,7 @@ CTS_CASE_LIST_JARS := $(foreach m, $(CTS_TEST_JAR_LIST),\ $(eval CTS_CASE_LIST_JARS += $(CTS_TESTCASES_OUT)/$(m).jar)) -CTS_SHARED_LIBS := \ - $(HOST_LIBRARY_PATH)/libc++$(HOST_SHLIB_SUFFIX) +CTS_SHARED_LIBS := DEFAULT_TEST_PLAN := $(cts_dir)/$(cts_name)/resource/plans $(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_JAR_FILES) $(CTS_TEST_CASES) $(CTS_CASE_LIST_APKS) $(CTS_CASE_LIST_JARS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ADDITIONAL_TF_JARS) $(ACP) $(CTS_SHARED_LIBS) -- cgit v1.1 From 52e9404a07fc57c135608ca14c04a077e4f8c0a2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 May 2015 12:49:12 -0700 Subject: "MRZ43B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fb78f4c..4fdfe61 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ43 +export BUILD_ID=MRZ43B -- cgit v1.1 From 5fa080b104e7756c1826b44df5e0fea807e861d6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 May 2015 01:11:05 -0700 Subject: "MRZ44" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..416268d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ44 -- cgit v1.1 From 9894e2cf4f5216df175823a077f1cb020b8e4ad3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 May 2015 09:41:53 -0700 Subject: "MRZ44B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 416268d..c0caa7c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ44 +export BUILD_ID=MRZ44B -- cgit v1.1 From a5de1e54e36fe4714541b2107af41cf6a8fe73cb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 May 2015 14:49:40 -0700 Subject: "MRZ44C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c0caa7c..fc9d680 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ44B +export BUILD_ID=MRZ44C -- cgit v1.1 From 7d0e8a5b74281ffc6665284175e814787031731d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 May 2015 17:14:55 -0700 Subject: "MRZ44D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fc9d680..e70e23c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ44C +export BUILD_ID=MRZ44D -- cgit v1.1 From 185d864a4f69e2dbd374fff48619e28d5e17bc3c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 May 2015 20:58:45 -0700 Subject: "MRZ44E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e70e23c..df9fbb4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ44D +export BUILD_ID=MRZ44E -- cgit v1.1 From bbc1fb64a5af177d94c74e6faab84691734fc60c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 May 2015 15:14:36 -0700 Subject: "MRZ44F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index df9fbb4..ef9fc54 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ44E +export BUILD_ID=MRZ44F -- cgit v1.1 From 41814f4de0b18163f58f1c29410672fe55650de2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 16 May 2015 01:08:39 -0700 Subject: "MRZ46" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..9243ee2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ46 -- cgit v1.1 From f2cdd5cf5a40417e8fce4e01fc6a9f3c135a8473 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 17 May 2015 01:03:36 -0700 Subject: "MRZ47" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..8804067 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ47 -- cgit v1.1 From 0a0358ce63538bd05cae01ffaa60da44456bc047 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 18 May 2015 01:03:50 -0700 Subject: "MRZ48" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..a54ad21 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ48 -- cgit v1.1 From fabc869dee1f06db101b221ff89f2eef8b99e267 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 18 May 2015 14:24:13 -0700 Subject: "MRZ48B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a54ad21..c346b00 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ48 +export BUILD_ID=MRZ48B -- cgit v1.1 From 83f450177aa2c2d72a876c5f85ef4491807a7463 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 May 2015 01:06:54 -0700 Subject: "MRZ49" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..ffaccef 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ49 -- cgit v1.1 From 949d35858d4417f374cd4f59b890f29a47afe414 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 May 2015 12:19:22 -0700 Subject: "MRZ49B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffaccef..05fc2d7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ49 +export BUILD_ID=MRZ49B -- cgit v1.1 From 400563e8c200ffb43302396a80f33279f5e94717 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 May 2015 16:51:03 -0700 Subject: "MRZ49C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 05fc2d7..43e13cf 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ49B +export BUILD_ID=MRZ49C -- cgit v1.1 From 6e8931cdb40a757e739d8dec9c66c6fd7f0b44fb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 May 2015 01:08:32 -0700 Subject: "MRZ50" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..12436fd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ50 -- cgit v1.1 From 5b2a679e231ebf2950b71c73b7f2b9994a788fd9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 May 2015 10:00:15 -0700 Subject: "MRZ50B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 12436fd..382004b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ50 +export BUILD_ID=MRZ50B -- cgit v1.1 From 337a0635a42dcde4931392119acf6f2f4bb5ce2f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 May 2015 15:51:13 -0700 Subject: "MRZ50C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 382004b..bb08a5a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ50B +export BUILD_ID=MRZ50C -- cgit v1.1 From 4e786a00bbc1fe2f7b91cb0a67acf206692b157d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 May 2015 01:11:30 -0700 Subject: "MRZ51" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..3458b70 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ51 -- cgit v1.1 From 0fa5417de8b437d950e4b58986af76022ed3e8dd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 May 2015 13:01:06 -0700 Subject: "MRZ51B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3458b70..e45652d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ51 +export BUILD_ID=MRZ51B -- cgit v1.1 From d8308d4d32a01643685ed68f8ee1fdca53b61033 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 May 2015 15:19:22 -0700 Subject: "MRZ51C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e45652d..17e5e59 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ51B +export BUILD_ID=MRZ51C -- cgit v1.1 From c0e833dd074328b637fbcc436a7fc6bfca025672 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 May 2015 17:31:02 -0700 Subject: "MRZ51D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 17e5e59..73e68ed 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ51C +export BUILD_ID=MRZ51D -- cgit v1.1 From f0a8b8555d807cf7e89f759a831366ed35eb3057 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 May 2015 08:46:39 -0700 Subject: "MRZ51E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 73e68ed..0578369 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ51D +export BUILD_ID=MRZ51E -- cgit v1.1 From 41b24a5a4675657afc68869f40dfb59f5e09a2a3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 May 2015 09:48:10 -0700 Subject: "MRZ51F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0578369..44b8636 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ51E +export BUILD_ID=MRZ51F -- cgit v1.1 From 06828a5ef4c2e4f5a3008bf1e554204d70c61338 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 May 2015 13:46:21 -0700 Subject: "MRZ51G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 44b8636..dcc906b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ51F +export BUILD_ID=MRZ51G -- cgit v1.1 From 41803ee290da8e6d82efb6bb48ff7ea74cc6a8bc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 23 May 2015 01:17:43 -0700 Subject: "MRZ53" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..6c09fb5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ53 -- cgit v1.1 From c61fbc40a5dca5533d1c7145d1530d42cb194645 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 24 May 2015 01:05:02 -0700 Subject: "MRZ54" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..dfbbfa9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ54 -- cgit v1.1 From b8a9fac0a2c4c65f3be65d1120c9ab48f8161f86 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 May 2015 01:03:51 -0700 Subject: "MRZ55" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..5187372 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ55 -- cgit v1.1 From b7f627aa75e51aa98a5161f48bbf74875bdea4f8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 26 May 2015 01:05:17 -0700 Subject: "MRZ56" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..84d24a8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ56 -- cgit v1.1 From 706180cca4782e7f355872a396bbc7759c2a19f2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 26 May 2015 15:17:50 -0700 Subject: "MRZ56B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 84d24a8..6b9b752 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ56 +export BUILD_ID=MRZ56B -- cgit v1.1 From b2c49b76917a887e33ba8cb89339a1ca6e0d0268 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 May 2015 01:08:16 -0700 Subject: "MRZ57" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..12a33d3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ57 -- cgit v1.1 From 72549994684e0ac454b20887669085fb371f314c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 May 2015 10:10:15 -0700 Subject: "MRZ57B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 12a33d3..589e308 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ57 +export BUILD_ID=MRZ57B -- cgit v1.1 From 17e09d9cabdd999cb48eda91c8753e22f4b20f3d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 May 2015 01:10:35 -0700 Subject: "MRZ58" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..9558f94 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ58 -- cgit v1.1 From a024274a758d4eedcb7871cde2e1d90c0607355d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 May 2015 13:37:10 -0700 Subject: "MRZ58B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9558f94..6be3579 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ58 +export BUILD_ID=MRZ58B -- cgit v1.1 From 694eae2e6d91dc57d7983c11366718bde3ce4f40 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 May 2015 17:42:54 -0700 Subject: "MRZ58C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6be3579..3b44b1a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ58B +export BUILD_ID=MRZ58C -- cgit v1.1 From 79a9f03feea112ff7a038a88f241a5203741fb82 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 29 May 2015 07:28:16 -0700 Subject: "MRZ58D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3b44b1a..0da2792 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ58C +export BUILD_ID=MRZ58D -- cgit v1.1 From 5159f81bab7e1eefa116491fbf6b67e317a3d12e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 30 May 2015 01:18:22 -0700 Subject: "MRZ60" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..101e511 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ60 -- cgit v1.1 From 9fd7b46d14df54e261b2e60153f739b862cd7370 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 31 May 2015 01:07:56 -0700 Subject: "MRZ61" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..aa96e01 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ61 -- cgit v1.1 From cd8c93afc6623076cc5e256fdb96b4fd22ffeabd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 1 Jun 2015 01:03:44 -0700 Subject: "MRZ62" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..3eae5de 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ62 -- cgit v1.1 From 026fb45f357f904899a21bee1155d74c2b1a0f2e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 1 Jun 2015 13:49:03 -0700 Subject: "MRZ62B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3eae5de..b8e7844 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ62 +export BUILD_ID=MRZ62B -- cgit v1.1 From ad6b53c7e59bbdd86083246f2244cf3a5fc78bfd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Jun 2015 01:08:45 -0700 Subject: "MRZ63" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..1f8aaf2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ63 -- cgit v1.1 From 1782365bf1f4102bef9d1ea8245d4ee6d2f4f662 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Jun 2015 12:46:21 -0700 Subject: "MRZ63B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1f8aaf2..c214a20 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ63 +export BUILD_ID=MRZ63B -- cgit v1.1 From 0e395b1b3f45d8ae6a1010d55016ea7aa116bad4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Jun 2015 14:19:54 -0700 Subject: "MRZ63C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c214a20..d9250a3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ63B +export BUILD_ID=MRZ63C -- cgit v1.1 From 234360ecd08c57febf6b24f69dae270172f414d2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Jun 2015 01:08:25 -0700 Subject: "MRZ64" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..9f5ad74 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ64 -- cgit v1.1 From aa319df65884efe04e797d793662238c67e75904 Mon Sep 17 00:00:00 2001 From: Mark Salyzyn Date: Wed, 3 Jun 2015 07:50:31 -0700 Subject: goldfish: logcat -Q in logd domain Deal with a build failure in conflict with cl/152105 (cherrypicked from commit 1cc7735ffa5194b9651429b2a96d6f6f319ca5eb) Bug: 19608716 Change-Id: I1078046db3b159c1baf0a22435c3e777424453a1 --- target/board/generic/sepolicy/goldfish_logcat.te | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/target/board/generic/sepolicy/goldfish_logcat.te b/target/board/generic/sepolicy/goldfish_logcat.te index f820c2a..88fcb79 100644 --- a/target/board/generic/sepolicy/goldfish_logcat.te +++ b/target/board/generic/sepolicy/goldfish_logcat.te @@ -1,10 +1,9 @@ -# goldfish-logcat service: runs logcat -Q -type goldfish_logcat, domain; +# goldfish-logcat service: runs logcat -Q in logd domain -domain_auto_trans(init, logcat_exec, goldfish_logcat) +domain_auto_trans(init, logcat_exec, logd) # Read from logd. -read_logd(goldfish_logcat) +read_logd(logd) # Write to /dev/ttyS2 and /dev/ttyGF2. -allow goldfish_logcat serial_device:chr_file { write open }; +allow logd serial_device:chr_file { write open }; -- cgit v1.1 From 74a75cd43a924c369febb473fa43532217bc88ae Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Jun 2015 13:13:42 -0700 Subject: "MRZ64B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9f5ad74..91eb45f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ64 +export BUILD_ID=MRZ64B -- cgit v1.1 From 49cbee213dcb3703e515deb457a4e1054f74f444 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Jun 2015 01:11:23 -0700 Subject: "MRZ65" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..4f4c215 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ65 -- cgit v1.1 From 07417ccae055bc810e0c31dfcc87aee3801a8a3d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Jun 2015 10:38:35 -0700 Subject: "MRZ65B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4f4c215..f240f2e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ65 +export BUILD_ID=MRZ65B -- cgit v1.1 From 42008e2a051a494603e0566f89a7fa5f5f964ad4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Jun 2015 14:38:38 -0700 Subject: "MRZ65C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f240f2e..cd2e275 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ65B +export BUILD_ID=MRZ65C -- cgit v1.1 From 4aa93a7717154424ece647843ac0666ec1e0938e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Jun 2015 10:09:38 -0700 Subject: "MRZ65D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cd2e275..1f043af 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ65C +export BUILD_ID=MRZ65D -- cgit v1.1 From 3b440a9464f7d332a9110b33587fc1c80ef3faf0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Jun 2015 13:24:30 -0700 Subject: "MRZ65E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1f043af..290e932 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ65D +export BUILD_ID=MRZ65E -- cgit v1.1 From c255469ad5a8dad8b68612c6e0e45c769d236a23 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Jun 2015 14:08:12 -0700 Subject: "MRZ65F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 290e932..ac48870 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ65E +export BUILD_ID=MRZ65F -- cgit v1.1 From 8ce8ab7bf28d886b921bbb1728dfb36b5352ffa3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 6 Jun 2015 01:11:57 -0700 Subject: "MRZ67" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..628d984 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ67 -- cgit v1.1 From d0453c5447dc45e183811dd90a152f150730fbf3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 7 Jun 2015 01:05:11 -0700 Subject: "MRZ68" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..9d30aa2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ68 -- cgit v1.1 From e588d89edfdc516b724327b1f98f73b279cbd367 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Jun 2015 01:03:59 -0700 Subject: "MRZ69" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..e82e00d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ69 -- cgit v1.1 From 988f415ec12341438fdbee323279dc484cd37610 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Jun 2015 14:14:46 -0700 Subject: "MRZ69B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e82e00d..01df3be 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ69 +export BUILD_ID=MRZ69B -- cgit v1.1 From 29543aa9aa60895b52a40d3d830a3f7d8c35e045 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Jun 2015 01:09:57 -0700 Subject: "MRZ70" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..de15102 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ70 -- cgit v1.1 From b9284b14a86e6368bb33867f5cf4b0e7d4ba047a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Jun 2015 14:32:16 -0700 Subject: "MRZ70B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index de15102..79e4d26 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ70 +export BUILD_ID=MRZ70B -- cgit v1.1 From 7edba94d7a22faacf3f03575a5405330fff6af2f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Jun 2015 17:28:32 -0700 Subject: "MRZ70C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 79e4d26..869c536 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ70B +export BUILD_ID=MRZ70C -- cgit v1.1 From f33d9a7db659342132b83ed05994870ef804366d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Jun 2015 01:10:41 -0700 Subject: "MRZ71" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..75a232b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ71 -- cgit v1.1 From 230223f83188d1c3616f3e51bcd84354da7ebec1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Jun 2015 09:54:48 -0700 Subject: "MRZ71B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 75a232b..51630c4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ71 +export BUILD_ID=MRZ71B -- cgit v1.1 From 1566ad3adf6351dfcce389dd73735b6495921ed4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Jun 2015 14:30:08 -0700 Subject: "MRZ71C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 51630c4..0b22fb5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ71B +export BUILD_ID=MRZ71C -- cgit v1.1 From e3eb037c4b728c6f81ec3df84b6ba358ca10219e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Jun 2015 01:07:37 -0700 Subject: "MRZ72" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..f0a49fa 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ72 -- cgit v1.1 From ef58ef03066e6028cddcd2815a03a123a2a65d6e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Jun 2015 14:41:06 -0700 Subject: "MRZ72B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f0a49fa..cdbaf30 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ72 +export BUILD_ID=MRZ72B -- cgit v1.1 From 85ee69a633893f4c86a54b509ada9061a207a683 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Jun 2015 21:18:30 -0700 Subject: "MRZ72C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cdbaf30..9b8cf9c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ72B +export BUILD_ID=MRZ72C -- cgit v1.1 From 2b7ba648bd9ce1dd863c1393cd28ce536c87764a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Jun 2015 11:27:14 -0700 Subject: "MRZ72D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9b8cf9c..0e637bb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ72C +export BUILD_ID=MRZ72D -- cgit v1.1 From 0a6e8fa49ddbe65e5b5345812aa198b70df73433 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Jun 2015 15:17:46 -0700 Subject: "MRZ72E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e637bb..553bd26 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ72D +export BUILD_ID=MRZ72E -- cgit v1.1 From ce5bc95a51a3dcda21de95b14add7467412884fd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 13 Jun 2015 01:14:40 -0700 Subject: "MRZ74" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..30b2aa2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ74 -- cgit v1.1 From abe0c1129251a03b9bcaeba18b82edf3ffaf4cc1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 14 Jun 2015 01:06:59 -0700 Subject: "MRZ75" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..b3b3169 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ75 -- cgit v1.1 From 4c839adf717478c096ea21481e7e009873d7b48f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Jun 2015 01:05:35 -0700 Subject: "MRZ76" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..6523170 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ76 -- cgit v1.1 From 789704783f7b0d617c2faff137b5c43951f8ca59 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Jun 2015 11:49:33 -0700 Subject: "MRZ76B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6523170..6d37815 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ76 +export BUILD_ID=MRZ76B -- cgit v1.1 From 770f2dd89ed2fd27cd8e4ee723c6cf9becf23d36 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Jun 2015 12:11:19 -0700 Subject: "MRZ72F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 553bd26..4da92f8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ72E +export BUILD_ID=MRZ72F -- cgit v1.1 From 71ca1349714d733de37182f250c164f237a97dc3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Jun 2015 01:14:10 -0700 Subject: "MRZ77" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..acfea8d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ77 -- cgit v1.1 From 1c90241e37d151c81a17f99bbb6140428ccda267 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Jun 2015 13:12:56 -0700 Subject: "MRZ77B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index acfea8d..2810fcb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ77 +export BUILD_ID=MRZ77B -- cgit v1.1 From e6e985679e80519cec5364805a69ec624a798b24 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Jun 2015 01:12:28 -0700 Subject: "MRZ78" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..46e2006 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ78 -- cgit v1.1 From 8e030971332baa8914a2b76c6009699bdf8207cb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Jun 2015 14:51:03 -0700 Subject: "MRZ78B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 46e2006..1d197c4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ78 +export BUILD_ID=MRZ78B -- cgit v1.1 From abf1aa88627a2aab7f3b0f2d4b7f816f769cf806 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Jun 2015 01:07:29 -0700 Subject: "MRZ79" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..f088ca1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ79 -- cgit v1.1 From 5a93c1c3a1be3381bac346c80169770c859cbd8f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Jun 2015 16:12:29 -0700 Subject: "MRZ79B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f088ca1..3b55026 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ79 +export BUILD_ID=MRZ79B -- cgit v1.1 From 45fa5f413ce7b7e036d837238b03a0386949de4a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Jun 2015 17:13:07 -0700 Subject: "MRZ79C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3b55026..c656404 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ79B +export BUILD_ID=MRZ79C -- cgit v1.1 From 8e03535b382909360223be01e29ec14a812d2304 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Jun 2015 20:21:46 -0700 Subject: "MRZ79D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c656404..1137e75 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ79C +export BUILD_ID=MRZ79D -- cgit v1.1 From ab451fd3b83e4632cf09118ab4d5f3c21f3ae120 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 19 Jun 2015 11:38:01 -0700 Subject: "MRZ79E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1137e75..ac81314 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ79D +export BUILD_ID=MRZ79E -- cgit v1.1 From bc617331c3d7d44640b3739c4a16c43ad6687d39 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Jun 2015 11:44:36 -0700 Subject: "MRZ79F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ac81314..2932715 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ79E +export BUILD_ID=MRZ79F -- cgit v1.1 From 8c4da686eb93bb2959df7456cd283f43bed06892 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Jun 2015 12:40:16 -0700 Subject: "MRZ79G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2932715..0e30570 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ79F +export BUILD_ID=MRZ79G -- cgit v1.1 From fbff09e6c188c2aa14888e0267cde207b75e3db5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Jun 2015 14:15:13 -0700 Subject: "MRZ79H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e30570..1cb1541 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ79G +export BUILD_ID=MRZ79H -- cgit v1.1 From d8510cbae1ca5290856c6058d92ef9dfd20292b7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 23 Jun 2015 01:19:52 -0700 Subject: "MRZ84" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..8059525 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ84 -- cgit v1.1 From 8b6f32301232945df65785efcdc8caa6952cb7e3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 23 Jun 2015 13:58:07 -0700 Subject: "MRZ84B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8059525..846ae93 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ84 +export BUILD_ID=MRZ84B -- cgit v1.1 From c8e2ca101e2023bc890f8106803f3fba3de46ff9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Jun 2015 02:56:44 -0700 Subject: "MRZ85" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..b27df62 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ85 -- cgit v1.1 From dc306e87e47fc7b06fa5d8020037f952937d6916 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Jun 2015 14:39:43 -0700 Subject: "MRZ85B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b27df62..353abf1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ85 +export BUILD_ID=MRZ85B -- cgit v1.1 From d4127bc1b0134c9f540b5a995d34442c09a68b24 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Jun 2015 17:18:13 -0700 Subject: "MRZ85C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 353abf1..f68869d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ85B +export BUILD_ID=MRZ85C -- cgit v1.1 From af6c5990149c6924975c4001aab9c8d0b1d8434f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Jun 2015 01:08:47 -0700 Subject: "MRZ86" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..3b9e6f6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ86 -- cgit v1.1 From 21f331dd39176513703b16caf94300b6d182ed26 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Jun 2015 11:55:28 -0700 Subject: "MRZ86B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3b9e6f6..562c901 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ86 +export BUILD_ID=MRZ86B -- cgit v1.1 From 197fe45b3d4237969af9f35cd45fef3be54dd5d7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Jun 2015 14:22:57 -0700 Subject: "MRZ86C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 562c901..7092f0c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ86B +export BUILD_ID=MRZ86C -- cgit v1.1 From e961af8c05b9cae2dd81b0052ded159000247d21 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Jun 2015 19:58:35 -0700 Subject: "MRZ86D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7092f0c..170b424 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ86C +export BUILD_ID=MRZ86D -- cgit v1.1 From e382a333e8425c66639c1c2ba98f42f469ee55b1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Jun 2015 13:17:29 -0700 Subject: "MRZ86E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 170b424..a66d59b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ86D +export BUILD_ID=MRZ86E -- cgit v1.1 From fa4421696ce4f157cec9c4d0898d2801bb00ec5a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Jun 2015 13:54:46 -0700 Subject: "MRZ86F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a66d59b..0e9c6d6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ86E +export BUILD_ID=MRZ86F -- cgit v1.1 From d66faec177f9b7046781ff05f05dd20342ab6c38 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Jun 2015 16:42:29 -0700 Subject: "MRZ86G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e9c6d6..e45f67c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ86F +export BUILD_ID=MRZ86G -- cgit v1.1 From df5a483b9661a1bfca00486406983ac3b6479b29 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 27 Jun 2015 01:13:39 -0700 Subject: "MRZ88" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..0d46f2b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ88 -- cgit v1.1 From d2f120769850fa19fca5509b26dfb2cfa21789f3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 27 Jun 2015 13:39:16 -0700 Subject: MRZ88B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0d46f2b..c4781f3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ88 +export BUILD_ID=MRZ88B -- cgit v1.1 From 6d5aad407ab9824c80b41ff695666d754f4aae84 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 28 Jun 2015 01:06:27 -0700 Subject: "MRZ89" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..474d544 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ89 -- cgit v1.1 From d83bb0eaf9e350f08efda66c472a41178cf345d7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Jun 2015 01:08:07 -0700 Subject: "MRZ90" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..ea73940 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRZ90 -- cgit v1.1 From 209ff3466877f69d42e3c9358ef0b71fab31117a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Jun 2015 12:15:22 -0700 Subject: "MRZ90B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ea73940..aae5f40 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ90 +export BUILD_ID=MRZ90B -- cgit v1.1 From c3fd84b7a904abab763e4dfed9920d46ac1bfb1b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Jun 2015 18:48:51 -0700 Subject: "MRZ90C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index aae5f40..f0daf33 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ90B +export BUILD_ID=MRZ90C -- cgit v1.1 From 9bdfda4ed07b42483d324648ae8eef4c4eea26ee Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Jun 2015 07:38:22 -0700 Subject: "MRZ90D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f0daf33..e74e7fc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ90C +export BUILD_ID=MRZ90D -- cgit v1.1 From 9a36219c7bfff6257ba2b2b428d80842ee553e66 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 29 Jun 2015 19:49:21 +0000 Subject: Revert "Adjust the size computation for reserved blocks" We should not change the parameter to mkfs_ext4. Bug filed at b/22174684. Will come up with a new CL. This reverts commit efbb5d2e692283be32069e808b88522727c7fe98. Change-Id: I15f7a9a07a65a936ba186d2ce672ec4832ed3e17 --- core/Makefile | 15 +-------------- tools/releasetools/build_image.py | 22 ---------------------- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/core/Makefile b/core/Makefile index ece5cd4..b1f9484 100644 --- a/core/Makefile +++ b/core/Makefile @@ -733,8 +733,6 @@ $(if $(INTERNAL_USERIMAGES_EXT_VARIANT),$(hide) echo "fs_type=$(INTERNAL_USERIMA $(if $(BOARD_SYSTEMIMAGE_PARTITION_SIZE),$(hide) echo "system_size=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_fs_type=$(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_JOURNAL_SIZE),$(hide) echo "system_journal_size=$(BOARD_SYSTEMIMAGE_JOURNAL_SIZE)" >> $(1)) -$(if $(BOARD_HAS_EXT4_RESERVED_BLOCKS),$(hide) echo "has_ext4_reserved_blocks=$(BOARD_HAS_EXT4_RESERVED_BLOCKS)" >> $(1)) -$(if $(BOARD_FLASH_BLOCK_SIZE),$(hide) echo "blocksize=$(BOARD_FLASH_BLOCK_SIZE)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR),$(hide) echo "system_squashfs_compressor=$(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR_OPT),$(hide) echo "system_squashfs_compressor_opt=$(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR_OPT)" >> $(1)) $(if $(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "userdata_fs_type=$(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE)" >> $(1)) @@ -999,15 +997,7 @@ define build-systemimage-target $(TARGET_OUT) $(systemimage_intermediates)/system_image_info.txt $(1) \ || ( echo "Out of space? the tree size of $(TARGET_OUT) is (MB): " 1>&2 ;\ du -sm $(TARGET_OUT) 1>&2;\ - if [ "$(INTERNAL_USERIMAGES_EXT_VARIANT)" == "ext4" ]; then \ - maxsize=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE); \ - if [ "$(BOARD_HAS_EXT4_RESERVED_BLOCKS)" == "true" ]; then \ - maxsize=$$((maxsize - 4096 * 4096)); \ - fi; \ - echo "The max is $$(( maxsize / 1048576 )) MB." 1>&2 ;\ - else \ - echo "The max is $$(( $(BOARD_SYSTEMIMAGE_PARTITION_SIZE) / 1048576 )) MB." 1>&2 ;\ - fi; \ + echo "The max is $$(( $(BOARD_SYSTEMIMAGE_PARTITION_SIZE) / 1048576 )) MB." 1>&2 ;\ mkdir -p $(DIST_DIR); cp $(INSTALLED_FILES_FILE) $(DIST_DIR)/installed-files-rescued.txt; \ exit 1 ) endef @@ -1490,9 +1480,6 @@ endif ifdef BOARD_RECOVERYIMAGE_PARTITION_SIZE $(hide) echo "recovery_size=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE)" >> $(zip_root)/META/misc_info.txt endif -ifdef BOARD_HAS_EXT4_RESERVED_BLOCKS - $(hide) echo "has_ext4_reserved_blocks=$(BOARD_HAS_EXT4_RESERVED_BLOCKS)" >> $(zip_root)/META/misc_info.txt -endif ifdef TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS @# TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS can be empty to indicate that nothing but defaults should be used. $(hide) echo "recovery_mount_options=$(TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $(zip_root)/META/misc_info.txt diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index 7c271a2..6a77a8f 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -255,22 +255,6 @@ def BuildImage(in_dir, prop_dict, out_file): prop_dict["partition_size"] = str(adjusted_size) prop_dict["original_partition_size"] = str(partition_size) - # Bug: 21522719, 22023465 - # There are some reserved blocks on ext4 FS (lesser of 4096 blocks and 2%). - # We need to deduct those blocks from the available space, since they are - # not writable even with root privilege. It only affects devices using - # file-based OTA and a kernel version of 3.10 or greater (currently just - # sprout). - reserved_blocks = prop_dict.get("has_ext4_reserved_blocks") == "true" - if reserved_blocks and fs_type.startswith("ext4"): - partition_size = int(prop_dict.get("partition_size")) - block_size = int(prop_dict.get("blocksize")) - reserved_size = min(4096 * block_size, int(partition_size * 0.02)) - adjusted_size = partition_size - reserved_size - if not prop_dict.has_key("original_partition_size"): - prop_dict["original_partition_size"] = str(partition_size) - prop_dict["partition_size"] = str(adjusted_size) - if fs_type.startswith("ext"): build_command = ["mkuserimg.sh"] if "extfs_sparse_flag" in prop_dict: @@ -407,8 +391,6 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): copy_prop("system_verity_block_device", "verity_block_device") copy_prop("system_root_image", "system_root_image") copy_prop("ramdisk_dir", "ramdisk_dir") - copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks") - copy_prop("blocksize", "blocksize") copy_prop("system_squashfs_compressor", "squashfs_compressor") copy_prop("system_squashfs_compressor_opt", "squashfs_compressor_opt") elif mount_point == "data": @@ -424,14 +406,10 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): copy_prop("vendor_size", "partition_size") copy_prop("vendor_journal_size", "journal_size") copy_prop("vendor_verity_block_device", "verity_block_device") - copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks") - copy_prop("blocksize", "blocksize") elif mount_point == "oem": copy_prop("fs_type", "fs_type") copy_prop("oem_size", "partition_size") copy_prop("oem_journal_size", "journal_size") - copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks") - copy_prop("blocksize", "blocksize") return d -- cgit v1.1 From 08ab5d77df15486bc7a079cb14c7e428165ab94b Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 23 Jun 2015 11:16:05 -0700 Subject: Retry adjusting the size computation for reserved blocks. Due to the change in https://lwn.net/Articles/546473/, kernel reserves a few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to OTA update failures. Adjust the size computation if the device has BOARD_HAS_EXT4_RESERVED_BLOCKS := true. It amends the last attemp in [1]. Now it computes the used blocks from the make_ext4fs output, instead of altering its argument. [1]: commit efbb5d2e692283be32069e808b88522727c7fe98. Bug: 21522719 Bug: 22023465 Bug: 22174684 Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c --- core/Makefile | 14 +++++++- tools/releasetools/build_image.py | 71 ++++++++++++++++++++++++++++++--------- 2 files changed, 68 insertions(+), 17 deletions(-) diff --git a/core/Makefile b/core/Makefile index b1f9484..598b620 100644 --- a/core/Makefile +++ b/core/Makefile @@ -733,6 +733,7 @@ $(if $(INTERNAL_USERIMAGES_EXT_VARIANT),$(hide) echo "fs_type=$(INTERNAL_USERIMA $(if $(BOARD_SYSTEMIMAGE_PARTITION_SIZE),$(hide) echo "system_size=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_fs_type=$(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_JOURNAL_SIZE),$(hide) echo "system_journal_size=$(BOARD_SYSTEMIMAGE_JOURNAL_SIZE)" >> $(1)) +$(if $(BOARD_HAS_EXT4_RESERVED_BLOCKS),$(hide) echo "has_ext4_reserved_blocks=$(BOARD_HAS_EXT4_RESERVED_BLOCKS)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR),$(hide) echo "system_squashfs_compressor=$(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR_OPT),$(hide) echo "system_squashfs_compressor_opt=$(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR_OPT)" >> $(1)) $(if $(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "userdata_fs_type=$(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE)" >> $(1)) @@ -997,7 +998,15 @@ define build-systemimage-target $(TARGET_OUT) $(systemimage_intermediates)/system_image_info.txt $(1) \ || ( echo "Out of space? the tree size of $(TARGET_OUT) is (MB): " 1>&2 ;\ du -sm $(TARGET_OUT) 1>&2;\ - echo "The max is $$(( $(BOARD_SYSTEMIMAGE_PARTITION_SIZE) / 1048576 )) MB." 1>&2 ;\ + if [ "$(INTERNAL_USERIMAGES_EXT_VARIANT)" == "ext4" ]; then \ + maxsize=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE); \ + if [ "$(BOARD_HAS_EXT4_RESERVED_BLOCKS)" == "true" ]; then \ + maxsize=$$((maxsize - 4096 * 4096)); \ + fi; \ + echo "The max is $$(( maxsize / 1048576 )) MB." 1>&2 ;\ + else \ + echo "The max is $$(( $(BOARD_SYSTEMIMAGE_PARTITION_SIZE) / 1048576 )) MB." 1>&2 ;\ + fi; \ mkdir -p $(DIST_DIR); cp $(INSTALLED_FILES_FILE) $(DIST_DIR)/installed-files-rescued.txt; \ exit 1 ) endef @@ -1480,6 +1489,9 @@ endif ifdef BOARD_RECOVERYIMAGE_PARTITION_SIZE $(hide) echo "recovery_size=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE)" >> $(zip_root)/META/misc_info.txt endif +ifdef BOARD_HAS_EXT4_RESERVED_BLOCKS + $(hide) echo "has_ext4_reserved_blocks=$(BOARD_HAS_EXT4_RESERVED_BLOCKS)" >> $(zip_root)/META/misc_info.txt +endif ifdef TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS @# TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS can be empty to indicate that nothing but defaults should be used. $(hide) echo "recovery_mount_options=$(TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $(zip_root)/META/misc_info.txt diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index 6a77a8f..5e8f0e6 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -22,6 +22,7 @@ Usage: build_image input_directory properties_file output_image_file """ import os import os.path +import re import subprocess import sys import commands @@ -34,17 +35,18 @@ OPTIONS = common.OPTIONS FIXED_SALT = "aee087a5be3b982978c923f566a94613496b417f2af592639bc80d141e34dfe7" def RunCommand(cmd): - """ Echo and run the given command + """Echo and run the given command. Args: cmd: the command represented as a list of strings. Returns: - The exit code. + A tuple of the output and the exit code. """ print "Running: ", " ".join(cmd) - p = subprocess.Popen(cmd) - p.communicate() - return p.returncode + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + output, _ = p.communicate() + print "%s" % (output.rstrip(),) + return (output, p.returncode) def GetVerityTreeSize(partition_size): cmd = "build_verity_tree -s %d" @@ -146,7 +148,7 @@ def UnsparseImage(sparse_image_path, replace=True): else: return True, unsparse_image_path inflate_command = ["simg2img", sparse_image_path, unsparse_image_path] - exit_code = RunCommand(inflate_command) + (_, exit_code) = RunCommand(inflate_command) if exit_code != 0: os.remove(unsparse_image_path) return False, None @@ -241,11 +243,12 @@ def BuildImage(in_dir, prop_dict, out_file): fs_spans_partition = True if fs_type.startswith("squash"): - fs_spans_partition = False + fs_spans_partition = False is_verity_partition = "verity_block_device" in prop_dict verity_supported = prop_dict.get("verity") == "true" - # adjust the partition size to make room for the hashes if this is to be verified + # Adjust the partition size to make room for the hashes if this is to be + # verified. if verity_supported and is_verity_partition and fs_spans_partition: partition_size = int(prop_dict.get("partition_size")) @@ -307,8 +310,15 @@ def BuildImage(in_dir, prop_dict, out_file): staging_system = os.path.join(in_dir, "system") shutil.rmtree(staging_system, ignore_errors=True) shutil.copytree(origin_in, staging_system, symlinks=True) + + reserved_blocks = prop_dict.get("has_ext4_reserved_blocks") == "true" + ext4fs_output = None + try: - exit_code = RunCommand(build_command) + if reserved_blocks and fs_type.startswith("ext4"): + (ext4fs_output, exit_code) = RunCommand(build_command) + else: + (_, exit_code) = RunCommand(build_command) finally: if in_dir != origin_in: # Clean up temporary directories and files. @@ -318,17 +328,42 @@ def BuildImage(in_dir, prop_dict, out_file): if exit_code != 0: return False + # Bug: 21522719, 22023465 + # There are some reserved blocks on ext4 FS (lesser of 4096 blocks and 2%). + # We need to deduct those blocks from the available space, since they are + # not writable even with root privilege. It only affects devices using + # file-based OTA and a kernel version of 3.10 or greater (currently just + # sprout). + if reserved_blocks and fs_type.startswith("ext4"): + assert ext4fs_output is not None + ext4fs_stats = re.compile( + r'Created filesystem with .* (?P[0-9]+)/' + r'(?P[0-9]+) blocks') + m = ext4fs_stats.match(ext4fs_output.strip().split('\n')[-1]) + used_blocks = int(m.groupdict().get('used_blocks')) + total_blocks = int(m.groupdict().get('total_blocks')) + reserved_blocks = min(4096, int(total_blocks * 0.02)) + adjusted_blocks = total_blocks - reserved_blocks + if used_blocks > adjusted_blocks: + mount_point = prop_dict.get("mount_point") + print("Error: Not enough room on %s (total: %d blocks, used: %d blocks, " + "reserved: %d blocks, available: %d blocks)" % ( + mount_point, total_blocks, used_blocks, reserved_blocks, + adjusted_blocks)) + return False + if not fs_spans_partition: mount_point = prop_dict.get("mount_point") partition_size = int(prop_dict.get("partition_size")) image_size = os.stat(out_file).st_size if image_size > partition_size: - print "Error: %s image size of %d is larger than partition size of %d" % (mount_point, image_size, partition_size) - return False + print("Error: %s image size of %d is larger than partition size of " + "%d" % (mount_point, image_size, partition_size)) + return False if verity_supported and is_verity_partition: - if 2 * image_size - AdjustPartitionSizeForVerity(image_size) > partition_size: - print "Error: No more room on %s to fit verity data" % mount_point - return False + if 2 * image_size - AdjustPartitionSizeForVerity(image_size) > partition_size: + print "Error: No more room on %s to fit verity data" % mount_point + return False prop_dict["original_partition_size"] = prop_dict["partition_size"] prop_dict["partition_size"] = str(image_size) @@ -344,7 +379,7 @@ def BuildImage(in_dir, prop_dict, out_file): # Run e2fsck on the inflated image file e2fsck_command = ["e2fsck", "-f", "-n", unsparse_image] - exit_code = RunCommand(e2fsck_command) + (_, exit_code) = RunCommand(e2fsck_command) os.remove(unsparse_image) @@ -391,6 +426,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): copy_prop("system_verity_block_device", "verity_block_device") copy_prop("system_root_image", "system_root_image") copy_prop("ramdisk_dir", "ramdisk_dir") + copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks") copy_prop("system_squashfs_compressor", "squashfs_compressor") copy_prop("system_squashfs_compressor_opt", "squashfs_compressor_opt") elif mount_point == "data": @@ -406,10 +442,12 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): copy_prop("vendor_size", "partition_size") copy_prop("vendor_journal_size", "journal_size") copy_prop("vendor_verity_block_device", "verity_block_device") + copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks") elif mount_point == "oem": copy_prop("fs_type", "fs_type") copy_prop("oem_size", "partition_size") copy_prop("oem_journal_size", "journal_size") + copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks") return d @@ -439,7 +477,8 @@ def main(argv): glob_dict = LoadGlobalDict(glob_dict_file) if "mount_point" in glob_dict: - # The caller knows the mount point and provides a dictionay needed by BuildImage(). + # The caller knows the mount point and provides a dictionay needed by + # BuildImage(). image_properties = glob_dict else: image_filename = os.path.basename(out_file) -- cgit v1.1 From c36dd5666387c712b41f80dea004170eb1abc560 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Jun 2015 13:03:58 -0700 Subject: "MRZ90E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e74e7fc..5d041c3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ90D +export BUILD_ID=MRZ90E -- cgit v1.1 From a8d527adfb4bd5faf5b1d1c69e94cccebebc37e9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Jun 2015 19:40:20 -0700 Subject: "MRZ90F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5d041c3..32a774a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ90E +export BUILD_ID=MRZ90F -- cgit v1.1 From cc241c772dac45d71c2c908e56b49df5fbe5edcc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Jul 2015 14:17:05 -0700 Subject: "MRZ90G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 32a774a..a13e469 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRZ90F +export BUILD_ID=MRZ90G -- cgit v1.1 From 66c1471dbc6604d2d65f142b6fddf9c1b0db3a96 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Jul 2015 14:27:50 -0700 Subject: "MRA01" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..6f29274 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA01 -- cgit v1.1 From b8eeeecb726fcce164d995e9248cb314c9457656 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Jul 2015 01:03:49 -0700 Subject: "MRA02" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..ad73b8b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA02 -- cgit v1.1 From 3ba7e43ff443c1267a5131d377d4b44882533ef7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 Jul 2015 01:11:00 -0700 Subject: "MRA03" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..bedde75 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA03 -- cgit v1.1 From 65174277148fc42a8cc4d492ec9374279354a70f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 4 Jul 2015 01:08:36 -0700 Subject: "MRA04" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..4826999 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA04 -- cgit v1.1 From 62079ccfc42de9d45305937175be263a09ba88aa Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 5 Jul 2015 01:06:17 -0700 Subject: "MRA05" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..f0130ce 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA05 -- cgit v1.1 From 727f2a486df654c31ab894f2fa034b70c3570f15 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Jul 2015 01:07:35 -0700 Subject: "MRA06" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..833722b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA06 -- cgit v1.1 From 348df0299a1ff3a9e53bb8eb39987bb0d4e38749 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Jul 2015 11:45:51 -0700 Subject: "MRA06B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 833722b..b6e9a9e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA06 +export BUILD_ID=MRA06B -- cgit v1.1 From 6d7b796eb510a66c7d096f1c9f552594a2eeb898 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Jul 2015 01:18:01 -0700 Subject: "MRA07" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..93639de 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA07 -- cgit v1.1 From 5c54d0169a8a6eb68c7a5ae14714b2abc64a58e9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Jul 2015 08:45:55 -0700 Subject: "MRA07B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 93639de..369f5b4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA07 +export BUILD_ID=MRA07B -- cgit v1.1 From 7e7cf074992502fb0b313e0d0a29e7ac90ab7d55 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Jul 2015 14:04:24 -0700 Subject: "MRA07C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 369f5b4..3ec0918 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA07B +export BUILD_ID=MRA07C -- cgit v1.1 From 1d4bb13bcbd5d67e00abcae15434a09076b484eb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Jul 2015 01:13:00 -0700 Subject: "MRA08" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..c2d1c70 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA08 -- cgit v1.1 From 0bbebcbfed0a435229d17b7ab5c075c7bb87310a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Jul 2015 13:36:38 -0700 Subject: "MRA08B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c2d1c70..52d0f7e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA08 +export BUILD_ID=MRA08B -- cgit v1.1 From 97f39632e9437ad673ab3e6eae3af11bf30c7e20 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Jul 2015 14:30:45 -0700 Subject: "MRA08C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 52d0f7e..9713d5a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA08B +export BUILD_ID=MRA08C -- cgit v1.1 From e3395529a7726dbdd50fa1d1df2fc265bc1edae2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Jul 2015 01:07:50 -0700 Subject: "MRA09" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..ab0f782 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA09 -- cgit v1.1 From 4f70861abd08c0496041bd415c8922c2c8109fc9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Jul 2015 18:37:30 -0700 Subject: "MRA09B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ab0f782..44be5d5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA09 +export BUILD_ID=MRA09B -- cgit v1.1 From 421700565c92befec8dcc2bd37f848ebe3f92331 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 10 Jul 2015 23:39:59 -0700 Subject: "MRA09C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 44be5d5..b92d26b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA09B +export BUILD_ID=MRA09C -- cgit v1.1 From 900d26f63579137714bf93e2567bd7508d4ac225 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Jul 2015 01:23:22 -0700 Subject: "MRA13" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..de59dd6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA13 -- cgit v1.1 From 9e36d4a82072a3f9e8261df89be85382a0c840e1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Jul 2015 14:37:17 -0700 Subject: "MRA13B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index de59dd6..ad3d047 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA13 +export BUILD_ID=MRA13B -- cgit v1.1 From 24165bdcc178d3536e1a2327c3fd48d8e2575daa Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Jul 2015 01:23:42 -0700 Subject: "MRA14" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..1c0ca33 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA14 -- cgit v1.1 From f5d0934e28a527bc5a328f7bf9f47af84449cf57 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Jul 2015 11:09:44 -0700 Subject: "MRA14B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1c0ca33..ea86e54 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA14 +export BUILD_ID=MRA14B -- cgit v1.1 From dee4ba2a3d3a82c629d266b5406452ee82d3b182 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Jul 2015 13:31:12 -0700 Subject: "MRA14C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ea86e54..b1ad8d3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA14B +export BUILD_ID=MRA14C -- cgit v1.1 From 99a8ac992647a9f8efc412d425f0e2988c2cf2f7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Jul 2015 14:33:05 -0700 Subject: "MRA14D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b1ad8d3..efc8145 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA14C +export BUILD_ID=MRA14D -- cgit v1.1 From 6432d75c07adedc79b5703be56abd3f04f2e565f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 Jul 2015 01:14:37 -0700 Subject: "MRA15" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..5e60b74 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA15 -- cgit v1.1 From ab0466384e2601fcd4fdf65d467c649c0fb90363 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 Jul 2015 16:14:21 -0700 Subject: "MRA15B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5e60b74..9d4fcb6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA15 +export BUILD_ID=MRA15B -- cgit v1.1 From f6be1d9fff810a898500d7cc5ead1be8080e12fb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Jul 2015 01:18:22 -0700 Subject: "MRA16" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..7af6d8a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA16 -- cgit v1.1 From 7b29cb117b75f86e25bcaa2334ee2db0deb57bb6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Jul 2015 11:15:11 -0700 Subject: "MRA16B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7af6d8a..ad427e4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA16 +export BUILD_ID=MRA16B -- cgit v1.1 From 911692e3eb9558e9d2119ca470569a188a4cd1f6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Jul 2015 14:51:39 -0700 Subject: "MRA16C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ad427e4..18a8945 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA16B +export BUILD_ID=MRA16C -- cgit v1.1 From c076152fdca7ec051c8dd4449acee3848caec861 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Jul 2015 17:44:27 -0700 Subject: "MRA16D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 18a8945..9f3788b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA16C +export BUILD_ID=MRA16D -- cgit v1.1 From f17e9ca9bff24c262af9f03b3b8fad01f651bc63 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Jul 2015 10:44:37 -0700 Subject: "MRA16E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9f3788b..2b592f8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA16D +export BUILD_ID=MRA16E -- cgit v1.1 From e471cf8240c3be3cad7afc9e5a6b1d887c174c94 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Jul 2015 14:34:10 -0700 Subject: "MRA16F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2b592f8..5390e57 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA16E +export BUILD_ID=MRA16F -- cgit v1.1 From cfcb706c4f02dbc974e65031441332e852f0ce81 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Jul 2015 14:54:50 -0700 Subject: "MRA16G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5390e57..d5a94e4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA16F +export BUILD_ID=MRA16G -- cgit v1.1 From 0d6aba17c80136bba3e950960e4e7a81e4ab4ffd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 18 Jul 2015 01:17:10 -0700 Subject: "MRA18" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..67d2c8f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA18 -- cgit v1.1 From a793477b137d18b689a12976d550a78f2960d3ba Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 19 Jul 2015 01:10:22 -0700 Subject: "MRA19" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..6ef0747 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA19 -- cgit v1.1 From 7ae32fc7fac2eed2844d482e7c5a770d40850280 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 20 Jul 2015 01:07:37 -0700 Subject: "MRA20" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..0a42896 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA20 -- cgit v1.1 From 69f3c81874db56938dc14a608cb211517dfbd475 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Jul 2015 01:17:14 -0700 Subject: "MRA21" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..18ee9bb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA21 -- cgit v1.1 From 6dcff6868043d71bc4f2bbe0c4c0147b044fcac4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Jul 2015 01:15:03 -0700 Subject: "MRA22" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..87b2a9d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA22 -- cgit v1.1 From 1df6ca2e44644e5c632bc5666a209bd1c0af9191 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Jul 2015 17:00:39 -0700 Subject: "MRA22B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 87b2a9d..5686ce6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA22 +export BUILD_ID=MRA22B -- cgit v1.1 From b3faf9689e1ac4f92e51aedaa50e2c4afd4f6c32 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Jul 2015 01:11:35 -0700 Subject: "MRA23" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..66d49dd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA23 -- cgit v1.1 From bfb608051c0189f134417469ee807b30f95343ca Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Jul 2015 16:38:46 -0700 Subject: "MRA23B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 66d49dd..45eb4bb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA23 +export BUILD_ID=MRA23B -- cgit v1.1 From fec6172707953568d757c7a89be8436f332ce9d9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Jul 2015 13:10:29 -0700 Subject: "MRA23C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 45eb4bb..3a44add 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA23B +export BUILD_ID=MRA23C -- cgit v1.1 From 221f0e9e464cbc673f24f2416c72af57aef3d1df Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Jul 2015 18:53:56 -0700 Subject: "MRA23D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3a44add..f7ab238 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA23C +export BUILD_ID=MRA23D -- cgit v1.1 From 5b9810fffd599fdc0ed4456d3c3a772316c889d1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 25 Jul 2015 01:21:13 -0700 Subject: "MRA25" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..5313808 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA25 -- cgit v1.1 From 2a761ad55cfd66fe43ca0df0c1bef228c47df803 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 26 Jul 2015 01:13:01 -0700 Subject: "MRA26" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..43d2240 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA26 -- cgit v1.1 From 4c80e50128039a600f8eee98f262099c0d376779 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Jul 2015 01:12:36 -0700 Subject: "MRA27" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..d1b69f8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA27 -- cgit v1.1 From c25b43d3d4cc0f68e6ffe1c2c4b7614e51126260 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Jul 2015 01:16:54 -0700 Subject: "MRA28" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..47ca049 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA28 -- cgit v1.1 From 52441c138f20f4dab307b1a879383ce0528b7363 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Jul 2015 01:15:40 -0700 Subject: "MRA29" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..dfc72ab 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA29 -- cgit v1.1 From 05e3646288f03d1935262b91904c985d30c0e251 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Jul 2015 07:41:46 -0700 Subject: "MRA29B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index dfc72ab..76ec0ad 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA29 +export BUILD_ID=MRA29B -- cgit v1.1 From 7ca49fe027fccc0ceb0d3e0be9cf5b38d224a86d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Jul 2015 15:13:17 -0700 Subject: "MRA29C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 76ec0ad..712316c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA29B +export BUILD_ID=MRA29C -- cgit v1.1 From 3e5cd2db89f7aed791b23b4504da2540121e4809 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Jul 2015 01:12:14 -0700 Subject: "MRA30" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..683a2da 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA30 -- cgit v1.1 From c12ee544a1d1dca82fb09a12f95997c50ad53f15 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Jul 2015 10:09:22 -0700 Subject: "MRA30B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 683a2da..750b49f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA30 +export BUILD_ID=MRA30B -- cgit v1.1 From 38274fe2134e926dfb34e121f88179ba1da89128 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Jul 2015 13:37:49 -0700 Subject: "MRA30C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 750b49f..7a28238 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA30B +export BUILD_ID=MRA30C -- cgit v1.1 From 4c4de483faf4baf18df73df452d3f9520287d356 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Jul 2015 13:56:57 -0700 Subject: "MRA30D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7a28238..ac69daa 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA30C +export BUILD_ID=MRA30D -- cgit v1.1 From dd5409ef2f383b39f63e0f4b8383a1df7d84b0c4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Jul 2015 16:38:03 -0700 Subject: "MRA30E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ac69daa..91013e8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA30D +export BUILD_ID=MRA30E -- cgit v1.1 From e0c0abeecf8b1c7e2eb34e5ddf7069d1c0427343 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Jul 2015 20:34:34 -0700 Subject: "MRA30F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 91013e8..f1abd80 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA30E +export BUILD_ID=MRA30F -- cgit v1.1 From c5d0bb8ea128616333b273a1475ae2b2ea2da8ee Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 31 Jul 2015 07:08:49 -0700 Subject: "MRA30G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f1abd80..85d25ff 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA30F +export BUILD_ID=MRA30G -- cgit v1.1 From cb894fe547638560fea81cfb01ea56a3fddf2ca6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 31 Jul 2015 15:53:18 -0700 Subject: "MRA30H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 85d25ff..5892a0a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA30G +export BUILD_ID=MRA30H -- cgit v1.1 From 0d6dfe3549543265c811673f31f44c79bf418b02 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 1 Aug 2015 01:17:27 -0700 Subject: "MRA32" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..7b16297 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA32 -- cgit v1.1 From 5d6008048c3d8459e1b107b33590a648f4487cf8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 2 Aug 2015 01:09:55 -0700 Subject: "MRA33" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..d3278f2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA33 -- cgit v1.1 From 6d62d53c13015111de00b2f57c0a95fd16169855 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 3 Aug 2015 01:09:47 -0700 Subject: "MRA34" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..fd488a6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA34 -- cgit v1.1 From 636b0cfb79fd3caf42bb2ba9dbac80dcf1ff5bac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 3 Aug 2015 16:13:18 -0700 Subject: "MRA34B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fd488a6..980a3a2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA34 +export BUILD_ID=MRA34B -- cgit v1.1 From 49bad4ac2188b966a6ba8a41b1525593205a0587 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Aug 2015 01:12:29 -0700 Subject: "MRA35" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..e0ebb18 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA35 -- cgit v1.1 From 37b065ec0251651cf57b880ce34d4961fcb74f20 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Aug 2015 08:12:14 -0700 Subject: "MRA35B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e0ebb18..9630625 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA35 +export BUILD_ID=MRA35B -- cgit v1.1 From e57b720f682a11d8ee71d718ee928bc7803b7941 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Aug 2015 14:00:06 -0700 Subject: "MRA35C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9630625..118c7b4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA35B +export BUILD_ID=MRA35C -- cgit v1.1 From 4308bbaa2b8046a6abe00a09131620fc2404de72 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 5 Aug 2015 01:14:39 -0700 Subject: "MRA36" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..f9eb0d9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA36 -- cgit v1.1 From 4ffd95fb4bc61f59f3dd38699a6be4bf8502ab4c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 5 Aug 2015 11:57:38 -0700 Subject: "MRA36B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f9eb0d9..986b1fd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA36 +export BUILD_ID=MRA36B -- cgit v1.1 From e0fc1ad42448aa87a9a0c4ac915f4c8aa3017d9c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Aug 2015 01:10:30 -0700 Subject: "MRA37" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..dd18cb8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA37 -- cgit v1.1 From f242d6d2de4cdce61a734d61462734a0c0d0c4a8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Aug 2015 13:32:45 -0700 Subject: "MRA37B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index dd18cb8..d3ce578 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA37 +export BUILD_ID=MRA37B -- cgit v1.1 From c5ad2baa8ef479351c1e46b169c647d820cae78a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Aug 2015 13:49:12 -0700 Subject: "MRA37C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d3ce578..b5d4be3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA37B +export BUILD_ID=MRA37C -- cgit v1.1 From a6358f70b06508979e1394481cd7a55ec631858a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 7 Aug 2015 08:51:40 -0700 Subject: "MRA37D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b5d4be3..e7965da 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA37C +export BUILD_ID=MRA37D -- cgit v1.1 From 8cfe1e1f8fc4b22bd1d676b1fb6c8f7797be459b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 8 Aug 2015 01:18:08 -0700 Subject: "MRA39" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..cb622f3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA39 -- cgit v1.1 From ebbd55a12b5b8ec9aa81607fdb84617aa03e96f9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 9 Aug 2015 01:12:31 -0700 Subject: "MRA40" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..258a37c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA40 -- cgit v1.1 From 3f60434288461b8a656374a9013e10fc0927cb2f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Aug 2015 01:09:51 -0700 Subject: "MRA41" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..c253785 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA41 -- cgit v1.1 From 07582a63bcf80d72d820ad1d4f1a6c6af7ba4eb4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Aug 2015 13:43:06 -0700 Subject: MRA41B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c253785..14a81f7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA41 +export BUILD_ID=MRA41B -- cgit v1.1 From 79d27debeb2b3c1b4696529773776ad2b1f7db85 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 11 Aug 2015 01:19:31 -0700 Subject: "MRA42" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..48f8dda 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA42 -- cgit v1.1 From 45d3d51d251c4485bace1a996eb5ce24e8c67aec Mon Sep 17 00:00:00 2001 From: Ian Pedowitz Date: Mon, 10 Aug 2015 20:18:41 -0700 Subject: Increasing x86 emulator system partition size Seems sdk_google_phone_x86 is building larger than 750MB Bug: 23093319 Change-Id: Ib3ddbbb96a9dcea02eb6da7362ac0142bdfae4de --- target/board/generic_x86/BoardConfig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index d5f0531..0b8e1cd 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -35,7 +35,7 @@ BUILD_EMULATOR_OPENGL := true USE_OPENGL_RENDERER := true TARGET_USERIMAGES_USE_EXT4 := true -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 786432000 +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1342177280 # 1.25 GB BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 -- cgit v1.1 From cb9691b67e916ae9d858990d00be310c234a3053 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 11 Aug 2015 15:57:44 -0700 Subject: "MRA42B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 48f8dda..11d3d97 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA42 +export BUILD_ID=MRA42B -- cgit v1.1 From 497bd77e147073772742962ae75e9a5f27a22d9c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Aug 2015 01:14:06 -0700 Subject: "MRA43" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e8e2cf..1f22a66 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MASTER +export BUILD_ID=MRA43 -- cgit v1.1 From 7be336334e4ccf60e2156949a1eea4458d598314 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Aug 2015 13:23:05 -0700 Subject: "MRA43B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1f22a66..087693e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MRA43 +export BUILD_ID=MRA43B -- cgit v1.1