From de3edb7f8b01d446cd7d2436505a69b15079faad Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 24 Jul 2012 08:54:43 -0700 Subject: [PATCH 001/137] JOO24 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..8acb872dd9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO24 From 87af4ec5def55d078bbcc531fcf88fa96d5ae5ba Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 24 Jul 2012 14:17:39 -0700 Subject: [PATCH 002/137] JOO24B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8acb872dd9..e7ad2433ec 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO24 +export BUILD_ID=JOO24B From 747422665756395c85fd1356452501c34c334714 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 25 Jul 2012 07:12:17 -0700 Subject: [PATCH 003/137] JOO25 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..227c168dfb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO25 From 2b93d35f8d71e223d39aaecca4dbbf4fd011715b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 26 Jul 2012 07:12:39 -0700 Subject: [PATCH 004/137] JOO26 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..6a69d14b2f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO26 From 0173bc5ec804f33700a5158655611af817bd5770 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 26 Jul 2012 10:15:21 -0700 Subject: [PATCH 005/137] Fix build. Set BUILD_EMULATOR to true when HOST_OS is linux. Disable the emulator package target if BUILD_EMULATOR is not true. Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29 --- core/Makefile | 3 ++- core/main.mk | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index d813ab7999..a6974a39ed 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1299,7 +1299,7 @@ dalvikfiles: $(INTERNAL_DALVIK_MODULES) # ----------------------------------------------------------------- # The emulator package - +ifeq ($(BUILD_EMULATOR),true) INTERNAL_EMULATOR_PACKAGE_FILES += \ $(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \ prebuilts/qemu-kernel/$(TARGET_ARCH)/kernel-qemu \ @@ -1315,6 +1315,7 @@ $(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES) @echo "Package: $@" $(hide) zip -qj $@ $(INTERNAL_EMULATOR_PACKAGE_FILES) +endif # ----------------------------------------------------------------- # Old PDK stuffs, retired # The pdk package (Platform Development Kit) diff --git a/core/main.mk b/core/main.mk index 21e2e7f53d..64be9ff823 100644 --- a/core/main.mk +++ b/core/main.mk @@ -187,7 +187,9 @@ MACOSX_SDK := /Developer/SDKs/MacOSX$(MSDK).sdk ifeq ($(strip $(wildcard $(MACOSX_SDK))),) BUILD_EMULATOR := false endif -endif +else # HOST_OS is not darwin + BUILD_EMULATOR := true +endif # HOST_OS is darwin $(shell echo 'VERSIONS_CHECKED := $(VERSION_CHECK_SEQUENCE_NUMBER)' \ > $(OUT_DIR)/versions_checked.mk) From c741d502f43f63d9398d1252c00137f452b153fb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 26 Jul 2012 10:28:15 -0700 Subject: [PATCH 006/137] JOO26B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6a69d14b2f..e1443fde3e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO26 +export BUILD_ID=JOO26B From 101d32ebb80f5f015781b98cb53739e8ad933cb4 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 26 Jul 2012 15:56:13 -0700 Subject: [PATCH 007/137] Now zoneinfo prebuilts are Android modules. Bug: 6857263 Change-Id: I793f596926de485646ed9724d2b365a51fcf489f --- target/product/core.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/target/product/core.mk b/target/product/core.mk index 8cf3b3e765..c7ae51c10c 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -122,6 +122,9 @@ PRODUCT_PACKAGES := \ uiautomator \ telephony-common \ mms-common \ + zoneinfo.dat \ + zoneinfo.idx \ + zoneinfo.version PRODUCT_COPY_FILES += \ system/core/rootdir/init.usb.rc:root/init.usb.rc \ @@ -140,5 +143,8 @@ ifeq ($(WITH_HOST_DALVIK),true) libjavacore \ libssl \ libz-host \ - dalvik + dalvik \ + zoneinfo-host.dat \ + zoneinfo-host.idx \ + zoneinfo-host.version endif From ef6573acfa58d802910038d76d3918bb01ab84c3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 30 Jul 2012 07:15:33 -0700 Subject: [PATCH 008/137] JOO30 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..38d46e7b6c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO30 From e2253c078b127c256faf2090350ed1f8728ad1cb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 30 Jul 2012 09:46:30 -0700 Subject: [PATCH 009/137] JOO30B --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..830a59b792 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO30B From 1e54465d5f5f8b18b3918f94ee8eb381c252e2fa Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 31 Jul 2012 07:35:49 -0700 Subject: [PATCH 010/137] JOO31 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..350aba908d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO31 From decac39d59fa3630d70ecb7a8cdd2703f6fbd3c3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 31 Jul 2012 13:09:31 -0700 Subject: [PATCH 011/137] JOO31B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 350aba908d..c3e664c44b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO31 +export BUILD_ID=JOO31B From 551f180d515e3814149726683f80453dcf6a6f89 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Aug 2012 07:18:49 -0700 Subject: [PATCH 012/137] JOO32 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..e660c63303 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO32 From b387f0511f8151347365f4caa3150b8063bbe2e9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Aug 2012 07:00:53 -0700 Subject: [PATCH 013/137] JOO33 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..6c73ca09c1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO33 From 2f8c869a9ff0bfa7da50d6a4ff3a395392379d46 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Aug 2012 07:06:08 -0700 Subject: [PATCH 014/137] JOO32C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6c73ca09c1..f62feb5076 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO33 +export BUILD_ID=JOO32C From 709f96221f2147089fc6ebbb23bd8689bd298fdc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Aug 2012 08:18:45 -0700 Subject: [PATCH 015/137] JOO33 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..6c73ca09c1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO33 From 21a43ef5cf85d967b46ae882d046e0f2fd57783e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Aug 2012 13:00:44 -0700 Subject: [PATCH 016/137] JOO33 take two --- core/build_id.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/build_id.mk b/core/build_id.mk index 6c73ca09c1..de63433c87 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -20,3 +20,4 @@ # capitalized by convention. export BUILD_ID=JOO33 + From e7a6d7eae90842841b8fb60234a9308faeaf8dd9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Aug 2012 19:03:27 -0700 Subject: [PATCH 017/137] JOO33B --- core/build_id.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index de63433c87..2079c66d7c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,5 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO33 - +export BUILD_ID=JOO33B From 4c97191bde16a22a50ef51eed6cf65bad1cd1602 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Thu, 2 Aug 2012 14:46:42 -0700 Subject: [PATCH 018/137] add extra args to mkbootimg Arrange to take $(BOARD_MKBOOTIMG_ARGS) and pass it to all invocations of mkbootimg from within make, and to store it in the target_files so it can be used by future invocations of img_from_target_files and ota_from_target_files. Bug: 6918260 Change-Id: I7130ac52e96bd51d4d8b80ca036635e1626f01f1 --- core/Makefile | 5 +++-- core/tasks/factory_ramdisk.mk | 2 +- tools/releasetools/common.py | 15 ++++++++++++--- tools/releasetools/ota_from_target_files | 6 ++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/core/Makefile b/core/Makefile index 1a36277416..6b46451074 100644 --- a/core/Makefile +++ b/core/Makefile @@ -403,7 +403,7 @@ else # TARGET_BOOTIMAGE_USE_EXT2 != true $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(call pretty,"Target boot image: $@") - $(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) --output $@ + $(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@ $(hide) $(call assert-max-image-size,$@,$(BOARD_BOOTIMAGE_PARTITION_SIZE),raw) endif # TARGET_BOOTIMAGE_USE_EXT2 @@ -664,7 +664,7 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \ > $(TARGET_RECOVERY_ROOT_OUT)/default.prop $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk) - $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) --output $@ + $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@ @echo ----- Made recovery image -------- $@ $(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw) @@ -1126,6 +1126,7 @@ endif ifdef PRODUCT_EXTRA_RECOVERY_KEYS $(hide) echo "extra_recovery_keys=$(PRODUCT_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt endif + $(hide) echo "mkbootimg_args=$(BOARD_MKBOOTIMG_ARGS)" >> $(zip_root)/META/misc_info.txt $(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt) @# Zip everything up, preserving symlinks $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) diff --git a/core/tasks/factory_ramdisk.mk b/core/tasks/factory_ramdisk.mk index 576a159a1f..05d89b0ebd 100644 --- a/core/tasks/factory_ramdisk.mk +++ b/core/tasks/factory_ramdisk.mk @@ -83,7 +83,7 @@ endif $(INSTALLED_FACTORY_RAMDISK_TARGET) : $(MKBOOTIMG) $(TARGET_RAMDISK_KERNEL) $(INSTALLED_FACTORY_RAMDISK_FS) $(call pretty,"Target factory ram disk img format: $@") $(MKBOOTIMG) --kernel $(TARGET_RAMDISK_KERNEL) --ramdisk $(INSTALLED_FACTORY_RAMDISK_FS) \ - --base $(BOARD_KERNEL_BASE) $(RAMDISK_CMDLINE) --output $@ + --base $(BOARD_KERNEL_BASE) $(BOARD_MKBOOTIMG_ARGS) $(RAMDISK_CMDLINE) --output $@ endif diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 5e4055a219..5037ac5767 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -196,7 +196,7 @@ def DumpInfoDict(d): for k, v in sorted(d.items()): print "%-25s = (%s) %s" % (k, type(v).__name__, v) -def BuildBootableImage(sourcedir, fs_config_file): +def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): """Take a kernel, cmdline, and ramdisk directory from the input (in 'sourcedir'), and turn them into a boot image. Return the image data, or None if sourcedir does not appear to contains files for @@ -206,6 +206,9 @@ def BuildBootableImage(sourcedir, fs_config_file): not os.access(os.path.join(sourcedir, "kernel"), os.F_OK)): return None + if info_dict is None: + info_dict = OPTIONS.info_dict + ramdisk_img = tempfile.NamedTemporaryFile() img = tempfile.NamedTemporaryFile() @@ -239,6 +242,10 @@ def BuildBootableImage(sourcedir, fs_config_file): cmd.append("--pagesize") cmd.append(open(fn).read().rstrip("\n")) + args = info_dict.get("mkbootimg_args", None) + if args and args.strip(): + cmd.extend(args.split()) + cmd.extend(["--ramdisk", ramdisk_img.name, "--output", img.name]) @@ -256,7 +263,8 @@ def BuildBootableImage(sourcedir, fs_config_file): return data -def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir): +def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir, + info_dict=None): """Return a File object (with name 'name') with the desired bootable image. Look for it in 'unpack_dir'/BOOTABLE_IMAGES under the name 'prebuilt_name', otherwise construct it from the source files in @@ -270,7 +278,8 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir): print "building image from target_files %s..." % (tree_subdir,) fs_config = "META/" + tree_subdir.lower() + "_filesystem_config.txt" return File(name, BuildBootableImage(os.path.join(unpack_dir, tree_subdir), - os.path.join(unpack_dir, fs_config))) + os.path.join(unpack_dir, fs_config), + info_dict)) def UnzipTemp(filename, pattern=None): diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 3dcfbee40a..b8fe68c0e1 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -531,13 +531,15 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): script.AssertSomeFingerprint(source_fp, target_fp) source_boot = common.GetBootableImage( - "/tmp/boot.img", "boot.img", OPTIONS.source_tmp, "BOOT") + "/tmp/boot.img", "boot.img", OPTIONS.source_tmp, "BOOT", + OPTIONS.source_info_dict) target_boot = common.GetBootableImage( "/tmp/boot.img", "boot.img", OPTIONS.target_tmp, "BOOT") updating_boot = (source_boot.data != target_boot.data) source_recovery = common.GetBootableImage( - "/tmp/recovery.img", "recovery.img", OPTIONS.source_tmp, "RECOVERY") + "/tmp/recovery.img", "recovery.img", OPTIONS.source_tmp, "RECOVERY", + OPTIONS.source_info_dict) target_recovery = common.GetBootableImage( "/tmp/recovery.img", "recovery.img", OPTIONS.target_tmp, "RECOVERY") updating_recovery = (source_recovery.data != target_recovery.data) From 4991dc494395e09ca29da2372ed2840080d31372 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 Aug 2012 07:37:30 -0700 Subject: [PATCH 019/137] JOO33B take two --- core/build_id.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/build_id.mk b/core/build_id.mk index 2079c66d7c..a8a2f5d7d0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -20,3 +20,4 @@ # capitalized by convention. export BUILD_ID=JOO33B + From e103e677ec108580adf5836d38f67fb56e046850 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 Aug 2012 15:01:00 -0700 Subject: [PATCH 020/137] JOO33C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a8a2f5d7d0..25dc4660ef 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,5 +19,5 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO33B +export BUILD_ID=JOO33C From b1e70593751b6a63ce040412392b15198e1538cc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Aug 2012 06:30:31 -0700 Subject: [PATCH 021/137] JOO37 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..c134a3aabc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO37 From 2dbd17f434e28acf4684322760cef66e49c8a0e8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Aug 2012 13:06:02 -0700 Subject: [PATCH 022/137] JOO37B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c134a3aabc..7a79c61574 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO37 +export BUILD_ID=JOO37B From 113e8569691aa9fab1e19e08d5294ccfdd9f795b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Aug 2012 06:36:03 -0700 Subject: [PATCH 023/137] JOO38 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..c781df73a5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO38 From 9c593ceea014b9a7f21e97c27688ff70735155d1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Aug 2012 11:12:57 -0700 Subject: [PATCH 024/137] JOO38B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c781df73a5..55b2222703 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO38 +export BUILD_ID=JOO38B From 4579c9cbda71c957abf536882faf90624b8497dd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Aug 2012 06:48:58 -0700 Subject: [PATCH 025/137] JOO39 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..836d435e06 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO39 From 229dad6d21b63781dc075053f6a87ff4bdccfff0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Aug 2012 15:06:55 -0700 Subject: [PATCH 026/137] JOO39B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 836d435e06..4e3a63dbd3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO39 +export BUILD_ID=JOO39B From cd6afb8c4c0fb29f038ce14971541158b1236279 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Aug 2012 09:30:20 -0700 Subject: [PATCH 027/137] JOO40 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..6cab92c107 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO40 From d1dc01c4a3e3ca91d901629c38377fb63aa622c4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Aug 2012 16:02:33 -0700 Subject: [PATCH 028/137] JOO40B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6cab92c107..bf0aaffc8d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO40 +export BUILD_ID=JOO40B From dbf2e799fca8c2a532a01d4c00cc94865efd071b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 10 Aug 2012 11:53:27 -0700 Subject: [PATCH 029/137] JOO40C --- core/build_id.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index bf0aaffc8d..7a89c0d358 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,4 +1,3 @@ - # # Copyright (C) 2008 The Android Open Source Project # @@ -19,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO40B +export BUILD_ID=JOO40C From ee1809ec41fa24b703bb36ce1405def3a6d288a8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 10 Aug 2012 15:45:28 -0700 Subject: [PATCH 030/137] JOO40D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7a89c0d358..14789d69f8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO40C +export BUILD_ID=JOO40D From 2358c7c5e15d169353f28965047fb18145a93755 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Aug 2012 08:11:27 -0700 Subject: [PATCH 031/137] JOO44 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..c8a08b8ae9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO44 From e5cf7548b2523c3e32f5b8533503d8f8ab3e7e5c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Aug 2012 16:33:55 -0700 Subject: [PATCH 032/137] JOO44B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c8a08b8ae9..e197957120 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO44 +export BUILD_ID=JOO44B From 85a965e0e03163826ba5f78e25d664712f30b144 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Aug 2012 07:08:55 -0700 Subject: [PATCH 033/137] JOO45 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..0e3976f61b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO45 From 307c64c40e83ed81ad4d559e1582a99426687585 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Aug 2012 14:58:43 -0700 Subject: [PATCH 034/137] JOO45B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e3976f61b..cef7c5df5a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO45 +export BUILD_ID=JOO45B From e65645081198a6fda4b5d2d375d524b5bdb17aa6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Aug 2012 16:52:17 -0700 Subject: [PATCH 035/137] JOO45C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cef7c5df5a..3a4d2c4829 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO45B +export BUILD_ID=JOO45C From 0f32db15da0a22e26091211254d4ea47cda7b8e0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 Aug 2012 06:36:46 -0700 Subject: [PATCH 036/137] JOO46 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..a882c607bd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO46 From a93b122d49ffd1143111b1b1762d0ad9e206f878 Mon Sep 17 00:00:00 2001 From: Iliyan Malchev Date: Wed, 15 Aug 2012 08:12:01 -0700 Subject: [PATCH 037/137] build: register BOARD_HAVE_BLUETOOTH_QCOM Change-Id: I594abd6d3b152a4e5bc48b6ac447e155c85b2fe0 Signed-off-by: Iliyan Malchev --- core/product.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/product.mk b/core/product.mk index 57db68139c..20d1e975cd 100644 --- a/core/product.mk +++ b/core/product.mk @@ -230,6 +230,7 @@ _product_stash_var_list += \ BOARD_KERNEL_BASE \ BOARD_HAVE_BLUETOOTH \ BOARD_HAVE_BLUETOOTH_BCM \ + BOARD_HAVE_BLUETOOTH_QCOM \ BOARD_VENDOR_QCOM_AMSS_VERSION \ BOARD_VENDOR_USE_AKMD \ BOARD_EGL_CFG \ From a5b7e89f9a4d8af2a7b844fb7d662718c4dc1542 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 Aug 2012 11:47:00 -0700 Subject: [PATCH 038/137] JOO46B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a882c607bd..a8b0aa4471 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO46 +export BUILD_ID=JOO46B From 9ceb97464027acb744105495725b94ab3b792140 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 Aug 2012 17:43:36 -0700 Subject: [PATCH 039/137] JOO46C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a8b0aa4471..0e15e99011 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO46B +export BUILD_ID=JOO46C From b9ef08de400e34af32addb305fa9d4a222db0fb3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Aug 2012 06:35:51 -0700 Subject: [PATCH 040/137] JOO47 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..f9effbdcba 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO47 From d96091d0829a0b9c93b3f02d06108e5be7851f13 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Aug 2012 13:59:00 -0700 Subject: [PATCH 041/137] JOO47B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f9effbdcba..2cbc36572a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO47 +export BUILD_ID=JOO47B From 19fefd7c8fb5780b90f5600233cb368908ec42dc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Aug 2012 14:55:28 -0700 Subject: [PATCH 042/137] JOO47C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2cbc36572a..9f3c0a76c4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO47B +export BUILD_ID=JOO47C From 146da4b31c8ffba17d9203c82854c7d0f359fbcb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 20 Aug 2012 06:37:07 -0700 Subject: [PATCH 043/137] JOO51 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..54a561d6fb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO51 From 72d244dba789565aaefbbdb35691100cbea7e1d2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 20 Aug 2012 14:47:01 -0700 Subject: [PATCH 044/137] JOO51B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 54a561d6fb..e34e8d35f1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO51 +export BUILD_ID=JOO51B From 63512ad52fa8873402ec85997f604b80ac7b6eba Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Aug 2012 06:36:23 -0700 Subject: [PATCH 045/137] JOO52 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..b3c7d95ed4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO52 From dccfa520cd2204a1eb043b871bb61fed2d80d59d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Aug 2012 12:40:00 -0700 Subject: [PATCH 046/137] JOO52B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b3c7d95ed4..0a80519db9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO52 +export BUILD_ID=JOO52B From ede8e5d1878b087ced35d3ed5655dbca887f74fb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Aug 2012 15:39:05 -0700 Subject: [PATCH 047/137] JOO52C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0a80519db9..75117f1865 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO52B +export BUILD_ID=JOO52C From 57342f19bdbdabf5e0e82ee0c37aefd3f50cc0ca Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Aug 2012 06:35:31 -0700 Subject: [PATCH 048/137] JOO53 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..029275adf0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO53 From 779d548dcc70c7fd8da2587c79e43368ffd27f4c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Aug 2012 14:55:58 -0700 Subject: [PATCH 049/137] JOO53B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 029275adf0..f2daf8f61c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO53 +export BUILD_ID=JOO53B From c30c425d4dc8296b156071ccd57d8a20b4d4b6b3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Aug 2012 06:35:16 -0700 Subject: [PATCH 050/137] JOO54 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..dc1061ab41 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO54 From 7f55e081930faaa480c6660a7951f0f91f5e4a32 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Aug 2012 14:19:08 -0700 Subject: [PATCH 051/137] JOO54B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index dc1061ab41..33f1a2d258 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO54 +export BUILD_ID=JOO54B From 7e91484467c49c73a349d5a628561c0edafc2a34 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Aug 2012 17:52:52 -0700 Subject: [PATCH 052/137] JOO54C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 33f1a2d258..e79f85469a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO54B +export BUILD_ID=JOO54C From f8863ca65cd88969d6891376ca3070c8f9e7a191 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Aug 2012 01:19:29 -0700 Subject: [PATCH 053/137] JOO54D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e79f85469a..8145506a1c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO54C +export BUILD_ID=JOO54D From 66679a1c2fb908bc62cfe495da4deda7eb53dc35 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Aug 2012 10:32:57 -0700 Subject: [PATCH 054/137] JOO54E --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8145506a1c..f587dc03eb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO54D +export BUILD_ID=JOO54E From 72635452a6af4dd42acbc1282b2dc0e8afd6bf2f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Aug 2012 06:36:18 -0700 Subject: [PATCH 055/137] JOO58 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..e2d502fff6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO58 From 7c39614e517751456a8de1f41d13c8dbc0a5737c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Aug 2012 12:48:28 -0700 Subject: [PATCH 056/137] JOO58B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e2d502fff6..39c59d94f2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO58 +export BUILD_ID=JOO58B From c63e072e21caa864e3ec3a70e220eac0fef0c924 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Aug 2012 06:35:42 -0700 Subject: [PATCH 057/137] JOO59 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..4ef9dce138 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO59 From 9d0e07b079ada0281b352b5138dc2af2b38b00eb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Aug 2012 11:49:21 -0700 Subject: [PATCH 058/137] JOO59B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4ef9dce138..2432bd2497 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO59 +export BUILD_ID=JOO59B From e40cd5439c157faf42aa2f4a8f268bd647a175e9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Aug 2012 22:12:04 -0700 Subject: [PATCH 059/137] JOO59C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2432bd2497..ebc2477a11 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO59B +export BUILD_ID=JOO59C From 8b6f24b7753270abd2cc6cd89139217f4012b15d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Aug 2012 06:35:20 -0700 Subject: [PATCH 060/137] JOO60 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..31f6a92669 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO60 From 6ca9e605bf89c6f93f99453ec379a2353f577570 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Aug 2012 16:02:58 -0700 Subject: [PATCH 061/137] JOO60B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 31f6a92669..ebde666100 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO60 +export BUILD_ID=JOO60B From cdfdac205ac5ce0509de508478113924c1527936 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Aug 2012 17:38:03 -0700 Subject: [PATCH 062/137] JOO60C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ebde666100..deb56354a8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO60B +export BUILD_ID=JOO60C From d105f9b9782fdb33257af88ce9337264956f8fda Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Aug 2012 06:35:43 -0700 Subject: [PATCH 063/137] JOO61 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..f62c71d9e6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO61 From e087c1d7ad4cecb6add575315fc71ff5b7038872 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Aug 2012 11:00:49 -0700 Subject: [PATCH 064/137] JOO61B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f62c71d9e6..4770212abf 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO61 +export BUILD_ID=JOO61B From 47cc1d265a9c56d2f9ebe8a39997dc7d67e265d3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Aug 2012 15:39:16 -0700 Subject: [PATCH 065/137] JOO61C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4770212abf..c715702fb6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO61B +export BUILD_ID=JOO61C From b23b98c721e986b93817d98533762a5046ea581f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 31 Aug 2012 09:27:28 -0700 Subject: [PATCH 066/137] JOO61D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c715702fb6..134c856b76 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO61C +export BUILD_ID=JOO61D From 57858e4683b1c1506a0d19fd842bf8b04a9ec5f4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 31 Aug 2012 12:34:22 -0700 Subject: [PATCH 067/137] JOO61E --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 134c856b76..166bbc0356 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO61D +export BUILD_ID=JOO61E From 652069ac84b51103ae1d6579f4adb9cfb2fe9d87 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 31 Aug 2012 17:22:42 -0700 Subject: [PATCH 068/137] JOO61F --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 166bbc0356..63a4ded600 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO61E +export BUILD_ID=JOO61F From 5794e5869106d0b9f29734458043870a12ed44e5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 3 Sep 2012 06:36:05 -0700 Subject: [PATCH 069/137] JOO65 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..e1c17cd4d5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO65 From 8f8b0df301eeca32c72890c7f81bdb7c1f4dec68 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Sep 2012 06:33:59 -0700 Subject: [PATCH 070/137] JOO66 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..af7ecafeb2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO66 From 1155427f8b877afface333fa072e0006451f8136 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Sep 2012 14:31:53 -0700 Subject: [PATCH 071/137] JOO66B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index af7ecafeb2..afdc7cb0b8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO66 +export BUILD_ID=JOO66B From ef48bc16decc628d2fd4d2a8226721bda8b5d837 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 5 Sep 2012 06:35:29 -0700 Subject: [PATCH 072/137] JOO67 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..e48d34fd50 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO67 From 65eb24d9c72969146adae9b42e8de03eb3202b03 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 5 Sep 2012 13:16:44 -0700 Subject: [PATCH 073/137] JOO67B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e48d34fd50..e6bd25022b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO67 +export BUILD_ID=JOO67B From 75d6fa10af148cf7e75edda1005f33acd7740cf4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 5 Sep 2012 16:51:45 -0700 Subject: [PATCH 074/137] JOO67C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e6bd25022b..a795529c33 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO67B +export BUILD_ID=JOO67C From 6806adba51ab94698f7ddadd1261dad3b0cab9ed Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Sep 2012 06:35:55 -0700 Subject: [PATCH 075/137] JOO68 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..d9a985d065 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO68 From 8fb948752de714b12d8444c1e1c21312e87081f7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Sep 2012 14:29:42 -0700 Subject: [PATCH 076/137] JOO68B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d9a985d065..545942f0bd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO68 +export BUILD_ID=JOO68B From 2b499955fc2e386625c24d50b8a8221ff7c5b4d5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Sep 2012 16:09:10 -0700 Subject: [PATCH 077/137] JOO68C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 545942f0bd..65e5017c47 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO68B +export BUILD_ID=JOO68C From 229166e114139286889bc1b398a9dd265a9768ff Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 7 Sep 2012 16:14:45 -0700 Subject: [PATCH 078/137] JOO68D --- core/build_id.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 65e5017c47..a732ad2d91 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,4 +1,3 @@ - # # Copyright (C) 2008 The Android Open Source Project # @@ -19,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO68C +export BUILD_ID=JOO68D From 43093b8983887818eb3c8394eb1d174a6f1008e1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 8 Sep 2012 11:59:21 -0700 Subject: [PATCH 079/137] JOO68E --- core/build_id.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a732ad2d91..5b8ac18994 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -18,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO68D +export BUILD_ID=JOO68E From 9a53a7dd4133814796252f5b46515f63aa3256c3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 9 Sep 2012 07:03:09 -0700 Subject: [PATCH 080/137] JOO71 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..3f057203f8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO71 From d56a49b4a1e108c7057f6dc455ccb3b7d2b89238 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 9 Sep 2012 15:02:11 -0700 Subject: [PATCH 081/137] JOO71B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3f057203f8..2ca8cf5c52 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO71 +export BUILD_ID=JOO71B From 04ba21a58cfa70324007031b63ecc31d9a61da98 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Sep 2012 07:00:36 -0700 Subject: [PATCH 082/137] JOO72 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..93d0015fb0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO72 From accba1e68fd91a60412cae8de9de1517586d4d80 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Sep 2012 15:02:40 -0700 Subject: [PATCH 083/137] JOO72B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 93d0015fb0..42280a95cf 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO72 +export BUILD_ID=JOO72B From 818fe62cbac399e4d9c2a432fcd290b192be297e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Sep 2012 17:37:32 -0700 Subject: [PATCH 084/137] JOO72C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 42280a95cf..60c3323e36 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO72B +export BUILD_ID=JOO72C From 11d17ed5713831885c9a05c82654ff3c3f66dd23 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 11 Sep 2012 07:01:00 -0700 Subject: [PATCH 085/137] JOO73 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..4f262773c4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO73 From 92235190d7df115e338e0f988d077bc16d98e40b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 11 Sep 2012 07:38:49 -0700 Subject: [PATCH 086/137] JOO73B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4f262773c4..5b4cba2241 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO73 +export BUILD_ID=JOO73B From 7810dee7d4fda4099e80ffc919084863c6e39361 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 11 Sep 2012 11:29:46 -0700 Subject: [PATCH 087/137] JOO73C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5b4cba2241..3e1b3e3271 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO73B +export BUILD_ID=JOO73C From 3319f008dbc710c0040ed2ada353ae3351246ff4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 11 Sep 2012 16:16:50 -0700 Subject: [PATCH 088/137] JOO73D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3e1b3e3271..85088ace7d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO73C +export BUILD_ID=JOO73D From 605c864a2269f4f4ec0869a2f01d85aee04c3304 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Sep 2012 07:01:19 -0700 Subject: [PATCH 089/137] JOO74 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..034f528a6a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO74 From cbd588f064b9f97ff3fa48c29e594eb0bef32c2b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Sep 2012 10:37:41 -0700 Subject: [PATCH 090/137] JOO74B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 034f528a6a..a99d8b1c8d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO74 +export BUILD_ID=JOO74B From e60a2e82dba4e32b53eca9fe4b915b66df5f0f6b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Sep 2012 17:31:38 -0700 Subject: [PATCH 091/137] JOO74C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a99d8b1c8d..091dd0a7cd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO74B +export BUILD_ID=JOO74C From c2796ebb57458cf7e7f019437c443ae6f973398e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Sep 2012 19:10:24 -0700 Subject: [PATCH 092/137] JOO74D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 091dd0a7cd..e8e15cb8cf 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO74C +export BUILD_ID=JOO74D From 6cc77ba6e77016ec4c6d021886e062af65d2fd01 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 13 Sep 2012 07:01:36 -0700 Subject: [PATCH 093/137] JOO75 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..6edfc116d4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO75 From 2028de7ba901d585f801e26c76ca3233ef83db35 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 13 Sep 2012 15:43:28 -0700 Subject: [PATCH 094/137] JOO75B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6edfc116d4..7a9757b61c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO75 +export BUILD_ID=JOO75B From 259cd9685cab4e708a1dc57021906409cbdeff0a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 14 Sep 2012 07:14:02 -0700 Subject: [PATCH 095/137] JOO76 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..6433eb05b3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO76 From 53aa4e5064549d3a31e896d9f2d6a7cab4138c8b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 14 Sep 2012 09:43:38 -0700 Subject: [PATCH 096/137] JOO76B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6433eb05b3..0938ec15cd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO76 +export BUILD_ID=JOO76B From 62e2f88d921d78d14fe9fb5446050d34bdc9d4aa Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 14 Sep 2012 14:11:28 -0700 Subject: [PATCH 097/137] JOO76C --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..feda57af6d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO76C From 9163bacdf9c3494e64dd3032736851128dba5541 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 14 Sep 2012 17:32:39 -0700 Subject: [PATCH 098/137] JOO76D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index feda57af6d..603fef6719 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO76C +export BUILD_ID=JOO76D From 5db9eba98d8d95cb19d10c67e9ae7926f48bb32b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 14 Sep 2012 18:17:50 -0700 Subject: [PATCH 099/137] JOO76E --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 603fef6719..8cd734ca81 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO76D +export BUILD_ID=JOO76E From 18b111ea4d9928667dc1cf95b4fba56f53e980f4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 16 Sep 2012 07:01:30 -0700 Subject: [PATCH 100/137] JOO78 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..57d95f8bf9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO78 From 990d9c759132d1ae1ec36875bc12ad2636421ea3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 16 Sep 2012 17:13:09 -0700 Subject: [PATCH 101/137] JOO78B --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..04087170fb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO78B From 58ed221a41b5f2dce4c70bdf10d57794d8da2e43 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 17 Sep 2012 06:59:53 -0700 Subject: [PATCH 102/137] JOO79 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..4e360bfafe 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO79 From 9abc4e2b8a238a379af37d07869cb1beea0254ce Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 17 Sep 2012 13:51:32 -0700 Subject: [PATCH 103/137] JOO79B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4e360bfafe..e3955f4186 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO79 +export BUILD_ID=JOO79B From 973c18c9586be072993ead2d7129b1d56824cfc7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 18 Sep 2012 07:02:04 -0700 Subject: [PATCH 104/137] JOO80 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..86db3c5189 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO80 From c255fa3affc0c07cc4cf4bf216063b0a3591986e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 18 Sep 2012 14:22:19 -0700 Subject: [PATCH 105/137] JOO80B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 86db3c5189..8b182b8969 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO80 +export BUILD_ID=JOO80B From 6e9125bf4f9430ddb4999943b04f24dbb4893d92 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 18 Sep 2012 16:27:51 -0700 Subject: [PATCH 106/137] JOO80C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8b182b8969..500395739b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO80B +export BUILD_ID=JOO80C From ed43a0172fdaa7c00fdda6d9f5ad8a01c5bd342d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 19 Sep 2012 07:02:52 -0700 Subject: [PATCH 107/137] JOO81 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..03f264d8ac 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO81 From c84fa3565fbdaa879566e9b510bb847e9b953338 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 19 Sep 2012 14:09:41 -0700 Subject: [PATCH 108/137] JOO81B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 03f264d8ac..3b5e925d60 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO81 +export BUILD_ID=JOO81B From 53e104e78c13d616a073c62a37ffdf18d25db2df Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 19 Sep 2012 17:38:33 -0700 Subject: [PATCH 109/137] JOO81C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3b5e925d60..7106f8be35 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO81B +export BUILD_ID=JOO81C From cd22a00c090f3f701cdc96dcaccb8e91706281fc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Sep 2012 07:01:57 -0700 Subject: [PATCH 110/137] JOO82 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..2a8283a072 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO82 From 5beb5bb45bd474ed2e3d841a428d373e1c32751a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Sep 2012 14:44:11 -0700 Subject: [PATCH 111/137] JOO82B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2a8283a072..f6e036b398 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO82 +export BUILD_ID=JOO82B From 038fef81cdae42f3d37339f766dbb8b8cfde7268 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Sep 2012 17:46:51 -0700 Subject: [PATCH 112/137] JOO82C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f6e036b398..47c9ae55e6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO82B +export BUILD_ID=JOO82C From cb99c224763efce5c1e472bcfb9465c3f68fa533 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 20 Sep 2012 10:37:39 -0700 Subject: [PATCH 113/137] Use prebuilt for PDK builds. Change-Id: Ief723fe137b7a3aa051837e3ca1079fea772357d --- tools/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Android.mk b/tools/Android.mk index d6badab6b2..a29cd3dda9 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -14,7 +14,7 @@ # limitations under the License. # -ifeq ($(TARGET_BUILD_APPS),) +ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) LOCAL_PATH := $(call my-dir) include $(call first-makefiles-under,$(LOCAL_PATH)) endif From 320b94d030032228df769e513931a262f8637738 Mon Sep 17 00:00:00 2001 From: Keun young Park Date: Thu, 20 Sep 2012 13:50:02 -0700 Subject: [PATCH 114/137] fix PDK build - build tools not coming from prebuilts for PDK Change-Id: I5760a54f502b8aa2167976c8f1e17412f31c6f5f --- tools/Android.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/Android.mk b/tools/Android.mk index a29cd3dda9..f646c377b8 100644 --- a/tools/Android.mk +++ b/tools/Android.mk @@ -14,7 +14,15 @@ # limitations under the License. # -ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK))) +ifeq (,$(TARGET_BUILD_APPS)) + LOCAL_PATH := $(call my-dir) -include $(call first-makefiles-under,$(LOCAL_PATH)) + +ifeq ($(TARGET_BUILD_PDK),true) +include $(filter-out %/acp/Android.mk %/signapk/Android.mk %/zipalign/Android.mk,\ + $(call all-makefiles-under,$(LOCAL_PATH))) +else # !PDK +include $(call all-makefiles-under,$(LOCAL_PATH)) +endif # PDK + endif From 9fcb198c708f8ff8b7d145d3379842d0dc6d1c8e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 21 Sep 2012 07:01:59 -0700 Subject: [PATCH 115/137] JOO83 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..ac1b06ae3c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO83 From ee6f5491b5cd72ffcece78576cf90a0472379700 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 21 Sep 2012 15:40:59 -0700 Subject: [PATCH 116/137] JOO83B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ac1b06ae3c..617661bd8b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO83 +export BUILD_ID=JOO83B From 7ede0cfc155492424afedfa78517cc73cb97fca6 Mon Sep 17 00:00:00 2001 From: Siva Velusamy Date: Fri, 21 Sep 2012 14:09:57 -0700 Subject: [PATCH 117/137] Include videoeditor_jni in sdk product build. frameworks/base/media depends on libvideoeditor_jni. This change copies the dependencies from generic_no_telephony.mk Fixes Bug 7200384 Change-Id: I135fd4fc613d81aa962bcdf2573894a2ea8ab11d --- target/product/sdk.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/target/product/sdk.mk b/target/product/sdk.mk index 33b9bf41a0..13bbd5cbce 100644 --- a/target/product/sdk.mk +++ b/target/product/sdk.mk @@ -67,6 +67,13 @@ PRODUCT_PACKAGES := \ rild \ LegacyCamera +PRODUCT_PACKAGES += \ + librs_jni \ + libvideoeditor_jni \ + libvideoeditor_core \ + libvideoeditor_osal \ + libvideoeditor_videofilters \ + libvideoeditorplayer \ # Define the host tools and libs that are parts of the SDK. -include sdk/build/product_sdk.mk From 57b9a0da06634c37537341fcebfebfdff21470cf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 21 Sep 2012 16:26:24 -0700 Subject: [PATCH 118/137] JOO83C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 617661bd8b..12bf09aa63 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO83B +export BUILD_ID=JOO83C From bee64ff377eccd7bbd34b4e0a3b29f6d826e15c9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 22 Sep 2012 09:44:00 -0700 Subject: [PATCH 119/137] JOO84 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..86cd977a68 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO84 From 6be506fb586174d0a442ccbdccdbd45f4a8adf80 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 23 Sep 2012 06:59:48 -0700 Subject: [PATCH 120/137] JOO85 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..fa8e1c149f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO85 From 1601c69db835bb38a94d109c1fad767fcacae4b7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 23 Sep 2012 19:00:36 -0700 Subject: [PATCH 121/137] JOO85B --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..c76633d59c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO85B From 65549826144ce9a2de9d09e86c61d1b1e350e69e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 24 Sep 2012 06:59:50 -0700 Subject: [PATCH 122/137] JOO86 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..cc8383d670 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO86 From 00a95f3b9a332b8afd4c208527758d8c8dea2d31 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 24 Sep 2012 16:47:29 -0700 Subject: [PATCH 123/137] JOO86B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cc8383d670..e990d9a65a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO86 +export BUILD_ID=JOO86B From e128d8d9bdacd4346b5ce567a11ee3a43d211b5f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 25 Sep 2012 07:02:05 -0700 Subject: [PATCH 124/137] JOO87 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..5afa03c1dd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO87 From d6c869beb9eb584fd46d458d2e8bcc052c6b0b3d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 25 Sep 2012 11:06:38 -0700 Subject: [PATCH 125/137] JOO87B --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..2723135762 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO87B From 7e6e7d85d4f017fa9c6bc1e400ebc4062246979c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 25 Sep 2012 14:43:33 -0700 Subject: [PATCH 126/137] JOO87C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2723135762..3c05611423 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO87B +export BUILD_ID=JOO87C From 4aea0ed7703f50b838239c94ac6e1700809ebee8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 25 Sep 2012 17:34:26 -0700 Subject: [PATCH 127/137] JOO87D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3c05611423..702e44f4ed 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO87C +export BUILD_ID=JOO87D From 2d42874f26f64de205b5f8edeafc104f8ab0ffd6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 25 Sep 2012 20:46:44 -0700 Subject: [PATCH 128/137] JOO87E --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 702e44f4ed..e01ef7572b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO87D +export BUILD_ID=JOO87E From 366e37636fabda87ec2a0fb9b72f27fe3ca81b0a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 26 Sep 2012 07:01:24 -0700 Subject: [PATCH 129/137] JOO88 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..d4eba64c38 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO88 From 055d8804e7979b7fa427a418531a283ae239ccec Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 26 Sep 2012 12:17:50 -0700 Subject: [PATCH 130/137] JOO88B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d4eba64c38..48a24e65e8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO88 +export BUILD_ID=JOO88B From 68948a94ec27ec002efc4b4b5030633dae680e74 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 26 Sep 2012 18:38:33 -0700 Subject: [PATCH 131/137] JOO88C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 48a24e65e8..53e7efd40a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO88B +export BUILD_ID=JOO88C From edf8e122dd0c2a2481b110fa4a764c0b6db425b7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 27 Sep 2012 07:01:47 -0700 Subject: [PATCH 132/137] JOO89 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..497dc82987 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO89 From 8d1730d62b07ceb3fe69d939039b17270a410979 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 27 Sep 2012 17:29:30 -0700 Subject: [PATCH 133/137] JOO89B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 497dc82987..6682919b8d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO89 +export BUILD_ID=JOO89B From d30b099ec6c4aedf38aaa001cb708b371a51df5b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 27 Sep 2012 22:57:13 -0700 Subject: [PATCH 134/137] JOO89C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6682919b8d..14ca9ff32f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO89B +export BUILD_ID=JOO89C From 97925711d741ddadeb8eafacf6c83af3c4b1b0b2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 28 Sep 2012 07:01:05 -0700 Subject: [PATCH 135/137] JOO90 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..209b94182b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO90 From c088beb3d458a7df8b313e66ff4a06b443751851 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 28 Sep 2012 14:17:39 -0700 Subject: [PATCH 136/137] JOO90B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 209b94182b..9ea6d06f4e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JOO90 +export BUILD_ID=JOO90B From d58fb4f4c07e37b2f20e16b8846124838ccc81e2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 30 Sep 2012 07:01:34 -0700 Subject: [PATCH 137/137] JOO92 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd39..91632e1326 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -13,20 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -# -# Defines branch-specific values. -# - # BUILD_ID is usually used to specify the branch name # (like "MAIN") or a branch name and a release candidate -# (like "TC1-RC5"). It must be a single word, and is +# (like "CRB01"). It must be a single word, and is # capitalized by convention. -# -BUILD_ID := MASTER -# DISPLAY_BUILD_NUMBER should only be set for development branches, -# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for -# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY -# is the same as BUILD_ID -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=JOO92