From 610754e5ad84b2e65358d85dd38a4e0c86dc9342 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 7 Jul 2015 18:31:47 -0700 Subject: [PATCH 01/79] Scan all init.*.rc files for flash_recovery service. Clockwork builds may rename init.rc to init.core.rc. Change the OTA script to scan all init.*.rc files to determine the proper location for install-recovery.sh. Bug: 22128990 Change-Id: If96bd0b81090683ad0bbfddb735d390204849d9f --- tools/releasetools/common.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 3c1575b5b..edacf7f49 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -1203,18 +1203,28 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img, } # The install script location moved from /system/etc to /system/bin - # in the L release. Parse the init.rc file to find out where the + # in the L release. Parse init.*.rc files to find out where the # target-files expects it to be, and put it there. sh_location = "etc/install-recovery.sh" - try: - with open(os.path.join(input_dir, "BOOT", "RAMDISK", "init.rc")) as f: + found = False + init_rc_dir = os.path.join(input_dir, "BOOT", "RAMDISK") + init_rc_files = os.listdir(init_rc_dir) + for init_rc_file in init_rc_files: + if (not init_rc_file.startswith('init.') or + not init_rc_file.endswith('.rc')): + continue + + with open(os.path.join(init_rc_dir, init_rc_file)) as f: for line in f: - m = re.match("^service flash_recovery /system/(\S+)\s*$", line) + m = re.match(r"^service flash_recovery /system/(\S+)\s*$", line) if m: sh_location = m.group(1) - print "putting script in", sh_location + found = True break - except (OSError, IOError), e: - print "failed to read init.rc: %s" % (e,) + + if found: + break + + print "putting script in", sh_location output_sink(sh_location, sh) From 2d20e3d9680757109981d66c25976fa66b46ac81 Mon Sep 17 00:00:00 2001 From: Justin Morey Date: Tue, 11 Aug 2015 18:52:59 -0500 Subject: [PATCH 02/79] DO NOT MERGE Revert "Add the ability to display annotations in the generated docs" This is reverted along with ag/745924 due to GmsCore build breakage. This reverts commit a76428792fedb33d0a67ea52f0300677cee103a5. Change-Id: Ib66777e003cd7ab3ed056777686086e9b5d92698 --- tools/droiddoc/templates-sac/assets/css/default.css | 4 ---- tools/droiddoc/templates-sac/class.cs | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/tools/droiddoc/templates-sac/assets/css/default.css b/tools/droiddoc/templates-sac/assets/css/default.css index f5dd62419..ca998f15c 100644 --- a/tools/droiddoc/templates-sac/assets/css/default.css +++ b/tools/droiddoc/templates-sac/assets/css/default.css @@ -4555,7 +4555,3 @@ a.download-sdk { .fullpage #footer { margin-top: -40px; } - -.annotation-message { - display: block; -} diff --git a/tools/droiddoc/templates-sac/class.cs b/tools/droiddoc/templates-sac/class.cs index 4003ff5c8..0461af629 100644 --- a/tools/droiddoc/templates-sac/class.cs +++ b/tools/droiddoc/templates-sac/class.cs @@ -123,7 +123,6 @@ -", "", "") ?> @@ -211,10 +210,7 @@ - - - ", "", "") ?> - + From bc171e3e400ff7639d1629eb3efc1d4d6191dd03 Mon Sep 17 00:00:00 2001 From: Omari Stephens Date: Fri, 14 Aug 2015 18:51:25 -0700 Subject: [PATCH 03/79] DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs"" This reverts commit 2d20e3d9680757109981d66c25976fa66b46ac81. Bug: 22723877 Bug: 8440225 --- tools/droiddoc/templates-sac/assets/css/default.css | 4 ++++ tools/droiddoc/templates-sac/class.cs | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/droiddoc/templates-sac/assets/css/default.css b/tools/droiddoc/templates-sac/assets/css/default.css index ca998f15c..f5dd62419 100644 --- a/tools/droiddoc/templates-sac/assets/css/default.css +++ b/tools/droiddoc/templates-sac/assets/css/default.css @@ -4555,3 +4555,7 @@ a.download-sdk { .fullpage #footer { margin-top: -40px; } + +.annotation-message { + display: block; +} diff --git a/tools/droiddoc/templates-sac/class.cs b/tools/droiddoc/templates-sac/class.cs index 0461af629..4003ff5c8 100644 --- a/tools/droiddoc/templates-sac/class.cs +++ b/tools/droiddoc/templates-sac/class.cs @@ -123,6 +123,7 @@ +", "", "") ?> @@ -210,7 +211,10 @@ - + + + ", "", "") ?> + From 7c4c6f589e846d838136de148ae7e7d680c74d91 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 19 Aug 2015 17:07:50 -0700 Subject: [PATCH 04/79] sparse_img.py: Divide NONZERO blocks into groups. For squashfs, we currently don't have a system.map. So the whole system image will be treated as a single file. But for some unknown bug, the updater will be killed due to OOM when writing back the patched image to flash (observed on lenok-userdebug MEA49). Prior to getting a real fix, we evenly divide the non-zero blocks into smaller groups (currently 1024 blocks or 4MB per group). Bug: 23227672 Change-Id: Ifeddd8d802f01f8cd2a743a1d1217a284fb6e182 --- tools/releasetools/sparse_img.py | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/tools/releasetools/sparse_img.py b/tools/releasetools/sparse_img.py index 07f3c1c0f..013044f6f 100644 --- a/tools/releasetools/sparse_img.py +++ b/tools/releasetools/sparse_img.py @@ -210,6 +210,16 @@ def LoadFileBlockMap(self, fn, clobbered_blocks): nonzero_blocks = [] reference = '\0' * self.blocksize + # Workaround for bug 23227672. For squashfs, we don't have a system.map. So + # the whole system image will be treated as a single file. But for some + # unknown bug, the updater will be killed due to OOM when writing back the + # patched image to flash (observed on lenok-userdebug MEA49). Prior to + # getting a real fix, we evenly divide the non-zero blocks into smaller + # groups (currently 1024 blocks or 4MB per group). + # Bug: 23227672 + MAX_BLOCKS_PER_GROUP = 1024 + nonzero_groups = [] + f = self.simg_f for s, e in remaining: for b in range(s, e): @@ -232,12 +242,22 @@ def LoadFileBlockMap(self, fn, clobbered_blocks): nonzero_blocks.append(b) nonzero_blocks.append(b+1) - assert zero_blocks or nonzero_blocks or clobbered_blocks + if len(nonzero_blocks) >= MAX_BLOCKS_PER_GROUP: + nonzero_groups.append(nonzero_blocks) + # Clear the list. + nonzero_blocks = [] + + if nonzero_blocks: + nonzero_groups.append(nonzero_blocks) + nonzero_blocks = [] + + assert zero_blocks or nonzero_groups or clobbered_blocks if zero_blocks: out["__ZERO"] = rangelib.RangeSet(data=zero_blocks) - if nonzero_blocks: - out["__NONZERO"] = rangelib.RangeSet(data=nonzero_blocks) + if nonzero_groups: + for i, blocks in enumerate(nonzero_groups): + out["__NONZERO-%d" % i] = rangelib.RangeSet(data=blocks) if clobbered_blocks: out["__COPY"] = clobbered_blocks From 5e704686571beb1c5ccbece9a33bb82306b35598 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Tue, 22 Sep 2015 12:49:39 -0700 Subject: [PATCH 05/79] Add ld.mc as a requirement for core_tiny.mk as well. Bug: 24171451 I missed this when I initially added ld.mc as a requirement for core_minimal.mk. This is required for RenderScript linking on the device. Change-Id: Ie3ffa2454214f886c38387f45b34df2dcbebd6e6 (cherry picked from commit 446ae75fb7a596f86e40f700b82bf6199f9be22b) --- target/product/core_tiny.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk index 0a9227526..2be0507ad 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -57,6 +57,7 @@ PRODUCT_PACKAGES += \ gatekeeperd \ keystore \ keystore.default \ + ld.mc \ libOpenMAXAL \ libOpenSLES \ libdownmix \ From 173219d81f7fc8b92c9b76b6657e50b34d3f8150 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Fri, 22 Aug 2014 08:04:58 -0700 Subject: [PATCH 06/79] add otatools-package target Add a target to zip up all the otatools and releasetools, for easy copying to the OTA builder machine. Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563 (cherry picked from commit f22b0f43efbc16c548692dc239a387edda15d78f) (cherry picked from commit 32bf3f32651ddff9ffa2168017d71ec4b151a0a9) --- core/Makefile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/core/Makefile b/core/Makefile index f9b4b9a72..7c52f4e4a 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1268,6 +1268,7 @@ DISTTOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_EXECUTABLES)/imgdiff \ $(HOST_OUT_JAVA_LIBRARIES)/dumpkey.jar \ $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \ + $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \ $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \ $(HOST_OUT_EXECUTABLES)/make_ext4fs \ $(HOST_OUT_EXECUTABLES)/simg2img \ @@ -1284,6 +1285,29 @@ OTATOOLS := $(DISTTOOLS) \ .PHONY: otatools otatools: $(OTATOOLS) +BUILT_OTATOOLS_PACKAGE := $(PRODUCT_OUT)/otatools.zip +$(BUILT_OTATOOLS_PACKAGE): \ + intermediate := $(call intermediates-dir-for,PACKAGING,otatools) +$(BUILT_OTATOOLS_PACKAGE): \ + zip_root := $(intermediate)/otatools + +$(BUILT_OTATOOLS_PACKAGE): \ + $(OTATOOLS) + @echo "Package OTA tools: $@" + $(hide) rm -rf $@ $(zip_root) + $(hide) mkdir -p $(dir $@) $(zip_root)/bin $(zip_root)/framework $(zip_root)/releasetools + $(hide) $(ACP) -p $(OTATOOLS) $(zip_root)/bin + $(hide) mv $(zip_root)/bin/*.jar $(zip_root)/framework/ + $(hide) $(ACP) -r -d -p build/tools/releasetools/* $(zip_root)/releasetools + $(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc + $(hide) (cd $(zip_root) && zip -qry $(abspath $@) bin framework releasetools) + $(hide) zip -qry $(abspath $@) build/target/product/security/ + $(hide) find device vendor -name \*.pk8 -o -name \*.x509.pem | xargs zip -qry $(abspath $@) + +.PHONY: otatools-package +otatools-package: $(BUILT_OTATOOLS_PACKAGE) + + # ----------------------------------------------------------------- # A zip of the directories that map to the target filesystem. # This zip can be used to create an OTA package or filesystem image From cb31a535077947e45a97ef31a04b6a3b211ceb25 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 24 Aug 2015 17:13:53 -0700 Subject: [PATCH 07/79] Dist the otatools package. Bug: 23495952 (cherry picked from commit 267e957373765ad1e3ce89abe61886a305277027) Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788 (cherry picked from commit fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd) --- core/main.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/main.mk b/core/main.mk index 17099a3f8..0f6315fea 100644 --- a/core/main.mk +++ b/core/main.mk @@ -957,6 +957,7 @@ else # TARGET_BUILD_APPS $(call dist-for-goals, droidcore, \ $(INTERNAL_UPDATE_PACKAGE_TARGET) \ $(INTERNAL_OTA_PACKAGE_TARGET) \ + $(BUILT_OTATOOLS_PACKAGE) \ $(SYMBOLS_ZIP) \ $(INSTALLED_FILES_FILE) \ $(INSTALLED_BUILD_PROP_TARGET) \ From 5b08efb73f1b114f6dfdb52284738f7210d0cf7e Mon Sep 17 00:00:00 2001 From: Claes Elgemark Date: Wed, 1 Apr 2015 11:29:29 +0200 Subject: [PATCH 08/79] Don't fail build of otatools if there are no device certificates Bug: 23552169 Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6 (cherry picked from commit 8d771971212069f77851163f437c782f581bf6db) --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 7c52f4e4a..c35ca6ebe 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1302,7 +1302,7 @@ $(BUILT_OTATOOLS_PACKAGE): \ $(hide) rm -rf $@ $(zip_root)/releasetools/*.pyc $(hide) (cd $(zip_root) && zip -qry $(abspath $@) bin framework releasetools) $(hide) zip -qry $(abspath $@) build/target/product/security/ - $(hide) find device vendor -name \*.pk8 -o -name \*.x509.pem | xargs zip -qry $(abspath $@) + $(hide) find device vendor -name \*.pk8 -o -name \*.x509.pem | xargs zip -qry $(abspath $@)>/dev/null || true .PHONY: otatools-package otatools-package: $(BUILT_OTATOOLS_PACKAGE) From 20ed978ada07690b7ca6d643f6c8869e656ccff7 Mon Sep 17 00:00:00 2001 From: Griff Hazen Date: Sat, 7 Nov 2015 16:44:44 -0800 Subject: [PATCH 09/79] Let qemu_props service set system properties in ro.emu and ro.emulator These boot properties are used by android wear emulator to configure round and chin shaped devices. Bug: 23324757 Change-Id: I812da02d771bba0ffc63b14459c7de7cbdeed142 --- target/board/generic/sepolicy/property_contexts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/board/generic/sepolicy/property_contexts b/target/board/generic/sepolicy/property_contexts index 09b9b06af..a0a402078 100644 --- a/target/board/generic/sepolicy/property_contexts +++ b/target/board/generic/sepolicy/property_contexts @@ -1,2 +1,4 @@ qemu. u:object_r:qemu_prop:s0 +emu. u:object_r:qemu_prop:s0 +emulator. u:object_r:qemu_prop:s0 radio.noril u:object_r:radio_noril_prop:s0 From ba740ff57fd314d0ad649c252841ab834e96fdaa Mon Sep 17 00:00:00 2001 From: Vince Harron Date: Tue, 27 Oct 2015 16:08:25 -0700 Subject: [PATCH 10/79] Switch emulator to generate userdebug images by default This is primarily to avoid using the unsupported JIT on Android-M It will increase app install times significantly because the app will be compiled at install time. OTOH, It should improve application performance dramatically. Change-Id: Id1d637ec561db177fd52e4c111f4def2a1b45543 (cherry picked from commit 08787d747d71d7ff3f13d2275d937faefc6d7777) --- core/product_config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/product_config.mk b/core/product_config.mk index 5240ae7bd..94449c248 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -117,7 +117,7 @@ ifdef product_goals # which really means TARGET_PRODUCT=dream make installclean. ifneq ($(filter-out $(INTERNAL_VALID_VARIANTS),$(TARGET_BUILD_VARIANT)),) MAKECMDGOALS := $(MAKECMDGOALS) $(TARGET_BUILD_VARIANT) - TARGET_BUILD_VARIANT := eng + TARGET_BUILD_VARIANT := userdebug default_goal_substitution := else default_goal_substitution := $(DEFAULT_GOAL) From 970f203b3d3f17b778749c3ce47eb6b922aa606c Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Sat, 14 Nov 2015 23:50:18 -0800 Subject: [PATCH 11/79] Change version back to 6.0 Temporarily set the version back to 6.0 and security patch to 2015-11-01. Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b --- core/version_defaults.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index a67a82ea0..a130799fd 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -42,7 +42,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 6.0.1 + PLATFORM_VERSION := 6.0 endif ifeq "" "$(PLATFORM_SDK_VERSION)" @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2015-12-01 + PLATFORM_SECURITY_PATCH := 2015-11-01 endif ifeq "" "$(PLATFORM_BASE_OS)" From 55a149b74064b799efe9c69211a511725cb9925b Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Sun, 15 Nov 2015 17:57:13 +0000 Subject: [PATCH 12/79] Revert "Change version back to 6.0" This reverts commit 970f203b3d3f17b778749c3ce47eb6b922aa606c. Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60 --- core/version_defaults.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index a130799fd..a67a82ea0 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -42,7 +42,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 6.0 + PLATFORM_VERSION := 6.0.1 endif ifeq "" "$(PLATFORM_SDK_VERSION)" @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2015-11-01 + PLATFORM_SECURITY_PATCH := 2015-12-01 endif ifeq "" "$(PLATFORM_BASE_OS)" From 792f02c90ca97aeca24b8036081d78000ef4c036 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 16 Nov 2015 20:49:31 +0000 Subject: [PATCH 13/79] MHB47 --- 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 0e8e2cf4b..418de8ad7 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=MHB47 From 3017459e4843db19202426d618c604f171d4ec72 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 17 Nov 2015 01:00:54 +0000 Subject: [PATCH 14/79] "MHB48" --- 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 0e8e2cf4b..24763a727 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=MHB48 From bd4a35a5455e5527ad94cd64ccf8bb720a68cb50 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 18 Nov 2015 01:00:34 +0000 Subject: [PATCH 15/79] "MHB49" --- 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 0e8e2cf4b..f75fe03cd 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=MHB49 From ad74747b1d4f62f9026456fb4c295b73e26eb1af Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 19 Nov 2015 01:00:27 +0000 Subject: [PATCH 16/79] "MHB50" --- 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 0e8e2cf4b..f98c60306 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=MHB50 From 58cdbdc5ad54f9c26d94860c2d0be712f88a8f07 Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Fri, 20 Nov 2015 14:32:09 -0800 Subject: [PATCH 17/79] Update Security String to 2016-01-01 - DO NOT MERGE http://b/25819582 Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 0b47ac049..802c6a2b3 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -73,7 +73,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2015-12-01 + PLATFORM_SECURITY_PATCH := 2016-01-01 endif ifeq "" "$(PLATFORM_BASE_OS)" From 170459f4385d35dd991549e1b545c376ca8df281 Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Fri, 20 Nov 2015 14:37:14 -0800 Subject: [PATCH 18/79] Update Security String to 2016-01-01 to mnc-dev http://b/25819582 Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 63cc4a3b5..42ffb0058 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2015-12-01 + PLATFORM_SECURITY_PATCH := 2016-01-01 endif ifeq "" "$(PLATFORM_BASE_OS)" From cd8553b1741c531f64a9098a197813398258a320 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 23 Nov 2015 01:01:14 +0000 Subject: [PATCH 19/79] "MHB54" --- 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 0e8e2cf4b..a172df35f 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=MHB54 From e41cd14578f430c58707abbadaa6dee88db02e77 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 24 Nov 2015 01:00:29 +0000 Subject: [PATCH 20/79] "MHB55" --- 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 0e8e2cf4b..42cc72432 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=MHB55 From 5806531f92a3670362ec8dceafd0079d51afbd18 Mon Sep 17 00:00:00 2001 From: Vince Harron Date: Thu, 29 Oct 2015 10:08:23 -0700 Subject: [PATCH 21/79] Shorten TARGET_BRAND from generic_ to Android Switching to userdebug emulator images increased ro.build.fingerprint Past the 91 character limit. This should bring the build server builds under this limit. Fixing it for local builds will be a bit more difficult. Bug: 25829506 Change-Id: I7daee3478716adcb860cced1b770a2d00a72f1a2 (cherry picked from commit efbeab78d3581009b3da20991a3a83d733393f45) --- target/product/sdk_phone_arm64.mk | 2 +- target/product/sdk_phone_armv7.mk | 2 +- target/product/sdk_phone_mips.mk | 2 +- target/product/sdk_phone_mips64.mk | 2 +- target/product/sdk_phone_x86.mk | 2 +- target/product/sdk_phone_x86_64.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/product/sdk_phone_arm64.mk b/target/product/sdk_phone_arm64.mk index a0cf6c14c..1d13b9e3c 100644 --- a/target/product/sdk_phone_arm64.mk +++ b/target/product/sdk_phone_arm64.mk @@ -24,7 +24,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) # Overrides -PRODUCT_BRAND := generic_arm64 +PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_arm64 PRODUCT_DEVICE := generic_arm64 PRODUCT_MODEL := Android SDK built for arm64 diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk index aeb49402f..a0fa0491c 100644 --- a/target/product/sdk_phone_armv7.mk +++ b/target/product/sdk_phone_armv7.mk @@ -17,6 +17,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) # Overrides -PRODUCT_BRAND := generic +PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_armv7 PRODUCT_DEVICE := generic diff --git a/target/product/sdk_phone_mips.mk b/target/product/sdk_phone_mips.mk index 818491ffa..d7217a0e9 100644 --- a/target/product/sdk_phone_mips.mk +++ b/target/product/sdk_phone_mips.mk @@ -22,7 +22,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) # Overrides -PRODUCT_BRAND := generic_mips +PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_mips PRODUCT_DEVICE := generic_mips PRODUCT_MODEL := Android SDK for Mips diff --git a/target/product/sdk_phone_mips64.mk b/target/product/sdk_phone_mips64.mk index afdb2a88c..8ddcb582a 100644 --- a/target/product/sdk_phone_mips64.mk +++ b/target/product/sdk_phone_mips64.mk @@ -23,7 +23,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) # Overrides -PRODUCT_BRAND := generic_mips64 +PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_mips64 PRODUCT_DEVICE := generic_mips64 PRODUCT_MODEL := Android SDK built for mips64 diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk index 95c49ab64..a58d26f87 100644 --- a/target/product/sdk_phone_x86.mk +++ b/target/product/sdk_phone_x86.mk @@ -22,7 +22,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) # Overrides -PRODUCT_BRAND := generic_x86 +PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_x86 PRODUCT_DEVICE := generic_x86 PRODUCT_MODEL := Android SDK built for x86 diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index 69e37afb5..c39b27421 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.mk @@ -23,7 +23,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) # Overrides -PRODUCT_BRAND := generic_x86_64 +PRODUCT_BRAND := Android PRODUCT_NAME := sdk_phone_x86_64 PRODUCT_DEVICE := generic_x86_64 PRODUCT_MODEL := Android SDK built for x86_64 From a149cf5901771f71fb2880e35396f372b6fc136c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 25 Nov 2015 01:01:17 +0000 Subject: [PATCH 22/79] "MHB56" --- 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 0e8e2cf4b..38d235ea8 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=MHB56 From a4cdbab2cb8c2258ad8ce1dcc4542986139d1f06 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 25 Nov 2015 08:00:10 +0000 Subject: [PATCH 23/79] "MHB56B" --- 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 0e8e2cf4b..da45b4599 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=MHB56B From d0d99783e0441797161c78280b5a875e3564af94 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 26 Nov 2015 08:00:15 +0000 Subject: [PATCH 24/79] "MHB57" --- 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 0e8e2cf4b..1a88cb89f 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=MHB57 From 9425a316c2b32f4d62f080a086707753a610ea3d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 30 Nov 2015 08:00:09 +0000 Subject: [PATCH 25/79] "MHB61" --- 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 0e8e2cf4b..ce8eb7d82 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=MHB61 From ce8bb2cdcfe6924ec006c372068a2ca72407d4c5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 1 Dec 2015 08:00:48 +0000 Subject: [PATCH 26/79] "MHB62" --- 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 0e8e2cf4b..9463e6dcc 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=MHB62 From 782d5b4100cfa6b2e7116173bd6c43c7c0490c5a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 2 Dec 2015 08:00:35 +0000 Subject: [PATCH 27/79] "MHB63" --- 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 0e8e2cf4b..c38393502 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=MHB63 From 912b51b24cb020fcfb64d12db0687e5ea4dd899f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 3 Dec 2015 08:00:36 +0000 Subject: [PATCH 28/79] "MHB64" --- 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 0e8e2cf4b..5774df589 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=MHB64 From cd118db2e6fbf5287f421c7f9ada698afead12eb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 7 Dec 2015 08:00:59 +0000 Subject: [PATCH 29/79] "MHB68" --- 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 0e8e2cf4b..d1f3881e9 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=MHB68 From 0d8ba9daaa8d08920bc43a8d752b78ca00aeae2e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 8 Dec 2015 08:01:50 +0000 Subject: [PATCH 30/79] "MHB69" --- 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 0e8e2cf4b..47c7649bc 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=MHB69 From 908d0d247b754992a145dd93f8ac9e78538baf82 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 9 Dec 2015 00:34:58 +0000 Subject: [PATCH 31/79] "MHB69B" --- 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 47c7649bc..0280be629 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=MHB69 +export BUILD_ID=MHB69B From 031349fa0182a39d59fa50e9c99c6d8ad481d289 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 9 Dec 2015 08:00:23 +0000 Subject: [PATCH 32/79] "MHB70" --- 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 0e8e2cf4b..1d3bc9502 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=MHB70 From 6019adf259eb304f206907fb695c33706b8c2714 Mon Sep 17 00:00:00 2001 From: Andy Huang Date: Wed, 9 Dec 2015 12:21:49 -0800 Subject: [PATCH 33/79] remove Exchange2 from core.mk Change-Id: I962d706d19eef5bbde3abed516d0a674ba50c1c1 --- target/product/core.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/target/product/core.mk b/target/product/core.mk index d453303ff..abb4c058a 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -33,7 +33,6 @@ PRODUCT_PACKAGES += \ DownloadProviderUi \ Email \ ExactCalculator \ - Exchange2 \ ExternalStorageProvider \ FusedLocation \ InputDevices \ From f0f73c06e25e17ecf8e06f42c51efac102597f57 Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Wed, 9 Dec 2015 12:46:59 -0800 Subject: [PATCH 34/79] Update Security String to 2016-02-01 b/26110717 Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 42ffb0058..b9595a170 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-01-01 + PLATFORM_SECURITY_PATCH := 2016-02-01 endif ifeq "" "$(PLATFORM_BASE_OS)" From f16bc41a553fb497654c5f2905d2e4eb99b80b78 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 9 Dec 2015 20:58:51 +0000 Subject: [PATCH 35/79] "MHB70B" --- 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 1d3bc9502..d152f8e42 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=MHB70 +export BUILD_ID=MHB70B From 929a4abd2b777715bc730593aee87643a30706d6 Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Wed, 9 Dec 2015 14:45:57 -0800 Subject: [PATCH 36/79] DO NOT MERGE - Update security string to 2016-02-01 b/26110717 Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 802c6a2b3..4b86e72a0 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -73,7 +73,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-01-01 + PLATFORM_SECURITY_PATCH := 2016-02-01 endif ifeq "" "$(PLATFORM_BASE_OS)" From 737dc60a02ea1947e2b3981a1659280dc2bd5162 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 10 Dec 2015 02:09:42 +0000 Subject: [PATCH 37/79] MHB70C --- 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 d152f8e42..5d10946d4 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=MHB70B +export BUILD_ID=MHB70C From 51c74aa6515fdfbefdd5c21983c0c29f11492401 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 10 Dec 2015 08:00:38 +0000 Subject: [PATCH 38/79] "MHB71" --- 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 0e8e2cf4b..0f06af60c 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=MHB71 From 542d1d2cd74c84e560d15467adc01ee79e34347c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 10 Dec 2015 19:53:01 +0000 Subject: [PATCH 39/79] "MHB71B" --- 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 0f06af60c..c58af5c1e 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=MHB71 +export BUILD_ID=MHB71B From 991ccde943aec66bc4f8a6f7d3086e93dc276f3a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 12 Dec 2015 00:17:58 +0000 Subject: [PATCH 40/79] MHB72 --- 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 c58af5c1e..016a75b45 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=MHB71B +export BUILD_ID=MHB72 From 97d42734f3f01217c953a1342312a595fdbae708 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 12 Dec 2015 00:57:06 +0000 Subject: [PATCH 41/79] "MHB72B" --- 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 0e8e2cf4b..fe0e57812 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=MHB72B From fe451ab3131a4cd115ae108e7571ea9f85eb6d9a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 14 Dec 2015 08:01:45 +0000 Subject: [PATCH 42/79] "MHB75" --- 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 0e8e2cf4b..44a86ad17 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=MHB75 From 3e284729fb8e57c33fc2d9f24f27f884adbb3efe Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 15 Dec 2015 08:00:43 +0000 Subject: [PATCH 43/79] "MHB76" --- 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 0e8e2cf4b..22ea429f0 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=MHB76 From b9073276efba4dc42440f393d770ff39d7218056 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 15 Dec 2015 22:24:05 +0000 Subject: [PATCH 44/79] MHB76B --- 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 0e8e2cf4b..8dc486a2b 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=MHB76B From 924236a096d61a619ea82e6bb67703caab488a9b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 20 Dec 2015 08:01:13 +0000 Subject: [PATCH 45/79] "MHB81" --- 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 0e8e2cf4b..41c9a8434 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=MHB81 From 7a6495c31d5bb6e155bfddf9563027e1d14fe729 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Dec 2015 08:00:11 +0000 Subject: [PATCH 46/79] "MHB82" --- 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 0e8e2cf4b..3f37794d0 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=MHB82 From 4c12b400daecebe44707c9dbb7ed208c83c6e424 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Dec 2015 08:00:27 +0000 Subject: [PATCH 47/79] "MHB83" --- 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 0e8e2cf4b..282bfe9ce 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=MHB83 From 00cab88e39762f63ae0c4b13a6b489f0f437fc34 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 23 Dec 2015 08:00:27 +0000 Subject: [PATCH 48/79] "MHB84" --- 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 0e8e2cf4b..760bb2488 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=MHB84 From 1508e31e1e5a3a9ee6f4f0394f68855612d57d95 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 27 Dec 2015 08:00:39 +0000 Subject: [PATCH 49/79] "MHB88" --- 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 0e8e2cf4b..ab2b38073 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=MHB88 From b905ec4ffb991e6b34e6f83ec7d5758d5b1a89e3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 28 Dec 2015 08:00:10 +0000 Subject: [PATCH 50/79] "MHB89" --- 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 0e8e2cf4b..ddb06e75e 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=MHB89 From 09601bd2a871b32a6d378d6cc19161b5d13efed0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 29 Dec 2015 08:00:14 +0000 Subject: [PATCH 51/79] "MHB90" --- 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 0e8e2cf4b..26a45eefe 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=MHB90 From 051988a7eb2a687370f8c6f5944f44e4a052527a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 30 Dec 2015 08:00:29 +0000 Subject: [PATCH 52/79] "MHB91" --- 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 0e8e2cf4b..0c2a96f11 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=MHB91 From d6d6135d082ed05fef1e15ba9ba5d1464837bdf3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 3 Jan 2016 08:00:20 +0000 Subject: [PATCH 53/79] "MHC03" --- 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 0e8e2cf4b..603d6bc31 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=MHC03 From 9c775eeede05b6b40c2c2fba62242c0934e261a8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 4 Jan 2016 08:00:10 +0000 Subject: [PATCH 54/79] "MHC04" --- 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 0e8e2cf4b..ece6cc1e6 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=MHC04 From b18f3843b59d394a935879c3da9b54330370e8e5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 5 Jan 2016 08:00:31 +0000 Subject: [PATCH 55/79] "MHC05" --- 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 0e8e2cf4b..6a9f9065c 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=MHC05 From e6e7e2aa07e22afc2b5ee1f82211b69d54f94449 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 5 Jan 2016 21:52:27 +0000 Subject: [PATCH 56/79] "MHC05B" --- 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 6a9f9065c..f3ad38be9 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=MHC05 +export BUILD_ID=MHC05B From 2e514375acc08f5064528b228544bba3807d0a5a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 6 Jan 2016 08:00:30 +0000 Subject: [PATCH 57/79] "MHC06" --- 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 0e8e2cf4b..42a238449 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=MHC06 From 92c9b39cbe3d0804d99f3a9591dccfc08aec12e6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 Jan 2016 15:05:45 +0000 Subject: [PATCH 58/79] "MHC08" --- 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 0e8e2cf4b..c3ffc1aef 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=MHC08 From 8871d8c5a70782e2195a376cec38b157daad23b0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 10 Jan 2016 00:00:31 -0800 Subject: [PATCH 59/79] "MHC10" --- 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 0e8e2cf4b..185d4c277 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=MHC10 From 56f53d8025771e89b551fc4134fc97fbf5c4ccaa Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 Jan 2016 00:00:14 -0800 Subject: [PATCH 60/79] "MHC11" --- 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 0e8e2cf4b..c924cc392 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=MHC11 From c24c6ccd4d5de8be010b74b9021b8fdb926e1dad Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Mon, 11 Jan 2016 17:12:37 -0800 Subject: [PATCH 61/79] Updating security patch string to 2016-03-01 b/26499556 Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 4b86e72a0..47505284f 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -73,7 +73,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-02-01 + PLATFORM_SECURITY_PATCH := 2016-03-01 endif ifeq "" "$(PLATFORM_BASE_OS)" From 1c2c7b6dfff5f47b4e3d3df9fa7d507b84f5d2e6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Jan 2016 00:00:43 -0800 Subject: [PATCH 62/79] "MHC12" --- 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 0e8e2cf4b..396014aad 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=MHC12 From 46e5844b58df573de87a365418bcacc9727318e7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 Jan 2016 00:00:58 -0800 Subject: [PATCH 63/79] "MHC13" --- 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 0e8e2cf4b..5244d4d7b 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=MHC13 From 7cf7588945038ade4fe7c0c2598e7c6cfef12927 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Jan 2016 05:29:04 -0800 Subject: [PATCH 64/79] "MHC14" --- 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 0e8e2cf4b..18572093e 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=MHC14 From 9a7d92f879f8027452d233b38308e14bd0a605ee Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Jan 2016 10:11:39 -0800 Subject: [PATCH 65/79] "MHC14B" --- 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 0e8e2cf4b..388f2f25e 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=MHC14B From 92574907f5b3af5a967cbdfa509c9fb6a9335a67 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Jan 2016 18:01:33 -0800 Subject: [PATCH 66/79] "MHC14C" --- 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 388f2f25e..27dabcc3c 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=MHC14B +export BUILD_ID=MHC14C From 3d7d858147816dbfe29d941d5b51a35adcac152b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 Jan 2016 17:16:19 -0800 Subject: [PATCH 67/79] "MHC15" --- 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 0e8e2cf4b..8ad800cbd 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=MHC15 From 72517317574b291244f878fa2051bfcc0cdfc204 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 17 Jan 2016 00:00:26 -0800 Subject: [PATCH 68/79] "MHC17" --- 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 0e8e2cf4b..ce3ad0927 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=MHC17 From 28fc15a256d440d57deb704da7af1abbca413495 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 18 Jan 2016 00:00:21 -0800 Subject: [PATCH 69/79] "MHC18" --- 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 0e8e2cf4b..80048d40b 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=MHC18 From 6c0d423aaf833c074a24d141e113a594c619c042 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 Jan 2016 00:00:33 -0800 Subject: [PATCH 70/79] "MHC19" --- 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 0e8e2cf4b..47b8db93c 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=MHC19 From 777fab422dae309202169e353948d64f505fc7c5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Jan 2016 03:06:41 -0800 Subject: [PATCH 71/79] "MHC19B" --- 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 47b8db93c..1b234bf1d 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=MHC19 +export BUILD_ID=MHC19B From c782f95592cfe4e38c6440c5cb5804cf2f5317e1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Jan 2016 18:14:50 -0800 Subject: [PATCH 72/79] "MHC19C" --- 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 1b234bf1d..19464d0e0 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=MHC19B +export BUILD_ID=MHC19C From 8dd70857478ca8a9410bf2d2ce4ec38267ee0488 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 Jan 2016 14:46:28 -0800 Subject: [PATCH 73/79] "MHC19D" --- 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 19464d0e0..3c63e9081 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=MHC19C +export BUILD_ID=MHC19D From 0e992411d6907b0677e0d4fbe8ddd72207c44a46 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Jan 2016 03:31:30 -0800 Subject: [PATCH 74/79] "MHC19E" --- 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 3c63e9081..94f3beb6a 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=MHC19D +export BUILD_ID=MHC19E From 03b5c5d77e959d5a9411013ee336e91c5c6ee082 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Jan 2016 16:29:25 -0800 Subject: [PATCH 75/79] "MHC19F" --- 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 94f3beb6a..b945b884a 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=MHC19E +export BUILD_ID=MHC19F From f02556d55c846a8ded1b5a35a0d29da6f7e70224 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 1 Feb 2016 14:33:57 -0800 Subject: [PATCH 76/79] "MHC19G" --- 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 b945b884a..f21d4e6ec 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=MHC19F +export BUILD_ID=MHC19G From 4ce2b1da7259315cfb27128396e2af558859d33d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Feb 2016 20:03:38 -0800 Subject: [PATCH 77/79] "MHC19H" --- 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 f21d4e6ec..488eb7db8 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=MHC19G +export BUILD_ID=MHC19H From 087c6f0743852a7d5385e7479b2c5068ed96ec3d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Feb 2016 13:19:20 -0800 Subject: [PATCH 78/79] "MHC19I" --- 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 488eb7db8..bfcf9b69d 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=MHC19H +export BUILD_ID=MHC19I From 57d06af7cd25a6e67ea33a4c1befecca1df623de Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Feb 2016 13:46:14 -0800 Subject: [PATCH 79/79] "MHC19J" --- 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 bfcf9b69d..c2f0b2852 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=MHC19I +export BUILD_ID=MHC19J