From a37a077871b21ecf43a19118c45dd242a8d7dcc0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 16 Oct 2013 19:41:07 -0700 Subject: [PATCH 001/837] "KRT16" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..787b4f77310 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KRT16 From 5bd184ff3a509783e645f731793557afde27a468 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 17 Oct 2013 16:41:10 -0700 Subject: [PATCH 002/837] "KRT16B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 787b4f77310..b5343f4cb7e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16 +export BUILD_ID=KRT16B From ddc63479ed2c68a7c88d7bc8d16f7a6e34c5e8ac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 18 Oct 2013 14:50:23 -0700 Subject: [PATCH 003/837] "KRT16C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b5343f4cb7e..766775642d8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16B +export BUILD_ID=KRT16C From 26c110c74456563e02eb2d117bec725575c40989 Mon Sep 17 00:00:00 2001 From: Alex Medina Date: Fri, 18 Oct 2013 13:42:42 -0700 Subject: [PATCH 004/837] Include drawables for all densities - b/11270325 Change-Id: I0b1f9b930a13982756dca9428ca91aec0ef343f5 --- target/product/full_base.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/product/full_base.mk b/target/product/full_base.mk index b2e3189f5a0..059697e0ebe 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -49,6 +49,9 @@ PRODUCT_PROPERTY_OVERRIDES := \ # Put en_US first in the list, so make it default. PRODUCT_LOCALES := en_US +# Include drawables for all densities +PRODUCT_AAPT_CONFIG := normal hdpi xhdpi xxhdpi + # Get some sounds $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) From d6cd82decbd2fc14ffdc7059b4e4013c60565888 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 20 Oct 2013 12:33:24 -0700 Subject: [PATCH 005/837] "KRT16D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 766775642d8..a3693af9249 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16C +export BUILD_ID=KRT16D From 8ec2985d971870fdac7e02fdd3fac9422b6d91d0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Oct 2013 18:37:09 -0700 Subject: [PATCH 006/837] "KRT16E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a3693af9249..e4a47246ace 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16D +export BUILD_ID=KRT16E From ce3cc93abaefd1200232a955b9dd3a2280e98e30 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Oct 2013 11:31:03 -0700 Subject: [PATCH 007/837] "KRT16F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e4a47246ace..9d5338eeea1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16E +export BUILD_ID=KRT16F From 4a7e1668fc64833d23aa8c0dada5f5fed90d4c81 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Oct 2013 18:23:46 -0700 Subject: [PATCH 008/837] "KRT16G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9d5338eeea1..1ee8b5ebe6b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16F +export BUILD_ID=KRT16G From 3faae937b49073f1f822e4eb2b638910867a07b2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Oct 2013 19:20:52 -0700 Subject: [PATCH 009/837] KRT16H --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1ee8b5ebe6b..46b3f4e1c17 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16G +export BUILD_ID=KRT16H From 55ffe77d816e84edea64789020cdee731a4986ac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 23 Oct 2013 14:19:50 -0700 Subject: [PATCH 010/837] "KRT16I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 46b3f4e1c17..2cfd978f208 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16H +export BUILD_ID=KRT16I From 82128cfcdffd8714e87a208746488d36e65a0cdc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 25 Oct 2013 11:23:54 -0700 Subject: [PATCH 011/837] "KRT16J" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2cfd978f208..3e865cf4251 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16I +export BUILD_ID=KRT16J From 15c598b20c0b43e4cbebb57a5451b0e0eae85169 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 28 Oct 2013 16:38:15 -0700 Subject: [PATCH 012/837] "KRT16K" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3e865cf4251..72f918d5e7a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16J +export BUILD_ID=KRT16K From 70ab116737c805a53cd620dd19b19f7315923b8f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 28 Oct 2013 20:03:27 -0700 Subject: [PATCH 013/837] "KRT16L" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 72f918d5e7a..a87675419ec 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16K +export BUILD_ID=KRT16L From 4bcf88521d333eaad70117186d05ba90d9e3424a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 29 Oct 2013 16:07:39 -0700 Subject: [PATCH 014/837] "KRT29" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3e865cf4251..294cd5ab4cc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16J +export BUILD_ID=KRT29 From b18be4ac9da11ce8329fbea8682ae005d63b2353 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 29 Oct 2013 17:16:37 -0700 Subject: [PATCH 015/837] "KRT16M" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 294cd5ab4cc..c32d457af66 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT29 +export BUILD_ID=KRT16M From 84a770ada2c0f60f5be118d2166d8506327d2d7e Mon Sep 17 00:00:00 2001 From: XpLoDWilD Date: Fri, 23 Aug 2013 19:35:11 +0200 Subject: [PATCH 016/837] ota_from_target_files: Don't update recovery image --- tools/releasetools/ota_from_target_files | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index a6b9b693991..0192aace959 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -424,9 +424,9 @@ def WriteFullOTAPackage(input_zip, output_zip): boot_img = common.GetBootableImage("boot.img", "boot.img", OPTIONS.input_tmp, "BOOT") - recovery_img = common.GetBootableImage("recovery.img", "recovery.img", - OPTIONS.input_tmp, "RECOVERY") - MakeRecoveryPatch(OPTIONS.input_tmp, output_zip, recovery_img, boot_img) +# recovery_img = common.GetBootableImage("recovery.img", "recovery.img", +# OPTIONS.input_tmp, "RECOVERY") +# MakeRecoveryPatch(OPTIONS.input_tmp, output_zip, recovery_img, boot_img) Item.GetMetadata(input_zip) Item.Get("system").SetPermissions(script) @@ -562,11 +562,11 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): "/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", - OPTIONS.source_info_dict) - target_recovery = common.GetBootableImage( - "/tmp/recovery.img", "recovery.img", OPTIONS.target_tmp, "RECOVERY") +# source_recovery = common.GetBootableImage( +# "/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) # Here's how we divide up the progress bar: @@ -709,9 +709,9 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): script.Print("Unpacking new files...") script.UnpackPackageDir("system", "/system") - if updating_recovery: - script.Print("Unpacking new recovery...") - script.UnpackPackageDir("recovery", "/system") +# if updating_recovery: +# script.Print("Unpacking new recovery...") +# script.UnpackPackageDir("recovery", "/system") script.Print("Symlinks and permissions...") From 36e708f1ebccb5e32beb2ff13022d9b6d6fa18c1 Mon Sep 17 00:00:00 2001 From: xplodwild Date: Sat, 24 Aug 2013 17:40:37 +0100 Subject: [PATCH 017/837] build: Add bacon target, and mka/brunch/breakfast aliases --- core/Makefile | 8 +++++++- envsetup.sh | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 298eef1c8e1..65a2071e2a8 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1300,8 +1300,14 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) -k $(KEY_CERT_PAIR) \ $(BUILT_TARGET_FILES_PACKAGE) $@ -.PHONY: otapackage +CUSTOM_TARGET_PACKAGE := $(PRODUCT_OUT)/custom-$(ROM_VERSION).zip + +.PHONY: otapackage bacon otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) +bacon: otapackage + $(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(CUSTOM_TARGET_PACKAGE) + $(hide) $(MD5SUM) $(CUSTOM_TARGET_PACKAGE) > $(CUSTOM_TARGET_PACKAGE).md5sum + @echo -e "Package complete: $(CM_TARGET_PACKAGE)" # ----------------------------------------------------------------- # The update package diff --git a/envsetup.sh b/envsetup.sh index 0661fe66fa4..55ffef30807 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -450,6 +450,49 @@ function print_lunch_menu() echo } +function brunch() +{ + breakfast $* + if [ $? -eq 0 ]; then + time mka bacon + else + echo "No such item in brunch menu. Try 'breakfast'" + return 1 + fi + return $? +} + +function breakfast() +{ + target=$1 + CUSTOM_DEVICES_ONLY="true" + unset LUNCH_MENU_CHOICES + add_lunch_combo full-eng + for f in `/bin/ls vendor/custom/vendorsetup.sh 2> /dev/null` + do + echo "including $f" + . $f + done + unset f + + if [ $# -eq 0 ]; then + # No arguments, so let's have the full menu + lunch + else + echo "z$target" | grep -q "-" + if [ $? -eq 0 ]; then + # A buildtype was specified, assume a full device name + lunch $target + else + # This is probably just the custom model name + lunch custom_$target-userdebug + fi + fi + return $? +} + +alias bib=breakfast + function lunch() { local answer @@ -1295,6 +1338,18 @@ function godir () { \cd $T/$pathname } +# Make using all available CPUs +function mka() { + case `uname -s` in + Darwin) + make -j `sysctl hw.ncpu|cut -d" " -f2` "$@" + ;; + *) + schedtool -B -n 1 -e ionice -n 1 make -j `cat /proc/cpuinfo | grep "^processor" | wc -l` "$@" + ;; + esac +} + # Force JAVA_HOME to point to java 1.6 if it isn't already set function set_java_home() { if [ ! "$JAVA_HOME" ]; then From b5092423230f38fd828ad6e82ec0732f4c65bc81 Mon Sep 17 00:00:00 2001 From: xplodwild Date: Sun, 25 Aug 2013 18:23:57 +0100 Subject: [PATCH 018/837] Makefile: Fix target display Change-Id: I07e60e6b9a6b09d798ca50c6295072828b643a50 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 65a2071e2a8..7e8a0af5c55 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1307,7 +1307,7 @@ otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) bacon: otapackage $(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(CUSTOM_TARGET_PACKAGE) $(hide) $(MD5SUM) $(CUSTOM_TARGET_PACKAGE) > $(CUSTOM_TARGET_PACKAGE).md5sum - @echo -e "Package complete: $(CM_TARGET_PACKAGE)" + @echo -e "Package complete: $(CUSTOM_TARGET_PACKAGE)" # ----------------------------------------------------------------- # The update package From cc8d3b72d09b7421e58d1845bc0235ccb4250fe5 Mon Sep 17 00:00:00 2001 From: xplodwild Date: Sun, 25 Aug 2013 18:25:48 +0100 Subject: [PATCH 019/837] Generic target: Don't build Music, we have Apollo Change-Id: I3ff30b44dc53dcadb7155cfe69344810a5af77d7 --- target/product/generic_no_telephony.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index 1155b4e7ce2..289f83ac9b0 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk @@ -34,7 +34,6 @@ PRODUCT_PACKAGES := \ Keyguard \ LatinIME \ Launcher2 \ - Music \ MusicFX \ OneTimeInitializer \ PrintSpooler \ From c82980ccfcee98ca4694d6e9f30cb964581c52d0 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Thu, 25 Jul 2013 21:32:08 -0700 Subject: [PATCH 020/837] build: Allow building with OpenJDK Change-Id: I6348bc1187240729f75f50d7ef91802c68e7788b --- core/main.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/main.mk b/core/main.mk index d424b25bd8b..2b5ac9a119b 100644 --- a/core/main.mk +++ b/core/main.mk @@ -148,8 +148,9 @@ $(info $(space)) $(info You use OpenJDK but only Sun/Oracle JDK is supported.) $(info Please follow the machine setup instructions at) $(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) +$(info $(space)) +$(info Continue at your own peril!) $(info ************************************************************) -$(error stop) endif # Check for the correct version of java From f25503a09d2febd8bccb94f43bf5df74441a6ab8 Mon Sep 17 00:00:00 2001 From: Jerome Pilliet Date: Mon, 17 Dec 2012 11:12:50 +0100 Subject: [PATCH 021/837] Some changes added to compile and run with Java 6 and Java 7. - correction of errors with Javac 6: - target 1.5 and source empty. - correction of errors with Javadoc 7: - strange behavior when duplicate classes are given. Change-Id: Ib814ede143f7799ef18e0fb1b733547519b8b0e5 Conflicts: core/main.mk Change-Id: Ief980703f0ff747166c1ec79ad748c09d5979c01 --- core/combo/javac.mk | 6 +++--- core/droiddoc.mk | 6 ++++++ core/main.mk | 8 ++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/core/combo/javac.mk b/core/combo/javac.mk index f8c99fb7318..273e7789c33 100644 --- a/core/combo/javac.mk +++ b/core/combo/javac.mk @@ -10,9 +10,9 @@ # Whatever compiler is on this system. ifeq ($(BUILD_OS), windows) COMMON_JAVAC := development/host/windows/prebuilt/javawrap.exe -J-Xmx256m \ - -target 1.5 -Xmaxerrs 9999999 + -target 1.5 -source 1.5 -Xmaxerrs 9999999 else - COMMON_JAVAC := javac -J-Xmx512M -target 1.5 -Xmaxerrs 9999999 + COMMON_JAVAC := javac -J-Xmx512M -target 1.5 -source 1.5 -Xmaxerrs 9999999 endif # Eclipse. @@ -26,7 +26,7 @@ endif ifeq ($(CUSTOM_JAVA_COMPILER), openjdk) # We set the VM options (like -Xmx) in the javac script. COMMON_JAVAC := prebuilt/common/openjdk/bin/javac -target 1.5 \ - -Xmaxerrs 9999999 + -source 1.5 -Xmaxerrs 9999999 $(info CUSTOM_JAVA_COMPILER=openjdk) endif diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 0d3094d4a94..8b95558cf26 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -161,6 +161,9 @@ $(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_f $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) $(hide) ( \ + head -1 $(PRIVATE_SRC_LIST_FILE) | tr " " "\n" | sort | uniq | tr "\n" " " > $(PRIVATE_SRC_LIST_FILE)_temp; \ + cat $(PRIVATE_SRC_LIST_FILE) | sed '1 d' >> $(PRIVATE_SRC_LIST_FILE)_temp; \ + mv $(PRIVATE_SRC_LIST_FILE)_temp $(PRIVATE_SRC_LIST_FILE); \ javadoc \ \@$(PRIVATE_SRC_LIST_FILE) \ -J-Xmx1280m \ @@ -194,6 +197,9 @@ $(full_target): $(full_src_files) $(full_java_lib_deps) $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) $(hide) ( \ + head -1 $(PRIVATE_SRC_LIST_FILE) | tr " " "\n" | sort | uniq | tr "\n" " " > $(PRIVATE_SRC_LIST_FILE)_temp; \ + cat $(PRIVATE_SRC_LIST_FILE) | sed '1 d' >> $(PRIVATE_SRC_LIST_FILE)_temp; \ + mv $(PRIVATE_SRC_LIST_FILE)_temp $(PRIVATE_SRC_LIST_FILE); \ javadoc \ $(PRIVATE_DROIDDOC_OPTIONS) \ \@$(PRIVATE_SRC_LIST_FILE) \ diff --git a/core/main.mk b/core/main.mk index 2b5ac9a119b..b942ceb9502 100644 --- a/core/main.mk +++ b/core/main.mk @@ -154,14 +154,14 @@ $(info ************************************************************) endif # Check for the correct version of java -java_version := $(shell java -version 2>&1 | head -n 1 | grep '^java .*[ "]1\.6[\. "$$]') +java_version := $(shell java -version 2>&1 | head -n 1 | grep '^java .*[ "]1\.[67][\. "$$]') ifeq ($(strip $(java_version)),) $(info ************************************************************) $(info You are attempting to build with the incorrect version) $(info of java.) $(info $(space)) $(info Your version is: $(shell java -version 2>&1 | head -n 1).) -$(info The correct version is: Java SE 1.6.) +$(info The correct version is: Java SE 1.6 or 1.7.) $(info $(space)) $(info Please follow the machine setup instructions at) $(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) @@ -170,14 +170,14 @@ $(error stop) endif # Check for the correct version of javac -javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.6[\. "$$]') +javac_version := $(shell javac -version 2>&1 | head -n 1 | grep '[ "]1\.[67][\. "$$]') ifeq ($(strip $(javac_version)),) $(info ************************************************************) $(info You are attempting to build with the incorrect version) $(info of javac.) $(info $(space)) $(info Your version is: $(shell javac -version 2>&1 | head -n 1).) -$(info The correct version is: 1.6.) +$(info The correct version is: 1.6 or 1.7.) $(info $(space)) $(info Please follow the machine setup instructions at) $(info $(space)$(space)$(space)$(space)https://source.android.com/source/download.html) From a327f73992332971b7715183788f0c0a214c7165 Mon Sep 17 00:00:00 2001 From: pulser Date: Sun, 25 Aug 2013 14:15:02 +0200 Subject: [PATCH 022/837] build: Inline kernel building as a buildtime task By arcee Kernel image integration is now done in the build system. The "one true way" of doing this is to download the kernel source into kernel/TARGET_BOOTLOADER_NAME (by usage of the cm.dependencies mechanism or otherwise), and defining the TARGET_KERNEL_CONFIG variable in the device's BoardConfig makefile If the kernel's location doesn't match the automagic location (multi-device kernel source, for instance), TARGET_KERNEL_SOURCE can be used to specify a kernel path (i.e., "TARGET_KERNEL_SOURCE := kernel/shared-whatever") If the device requires out-of-kernel-tree modules to be built, the TARGET_KERNEL_MODULES variable can be used, pointing to a _make target_ that will build and install such modules. Definition of such a target is the device author's responsibility, the only restriction is that it is a normal makefile recipe (example below) Optionally (or as an alternative), a prebuilt binary can also be defined at BoardConfig, by usage of the TARGET_PREBUILT_KERNEL variable. This binary will be used if the kernel source is absent (or undefined). A minimal BoardConfig.mk should look something like this: TARGET_KERNEL_CONFIG := cyanogenmod__defconfig TARGET_PREBUILT_KERNEL := device///kernel To include, for example, the TI WLAN modules, this can be used: ----------------------------- TIWLAN_MODULES: make -C hardware/ti/wlan/wl1283/platforms/os/linux/ KERNEL_DIR=$(KERNEL_OUT) ARCH="arm" CROSS_COMPILE="arm-eabi-" TNETW=1273 RANDOM_MAC=n REPORT_LOG=n mv hardware/ti/wlan/wl1283/platforms/os/linux/tiwlan_drv.ko $(KERNEL_MODULES_OUT) make -C hardware/ti/wlan/wl1283_softAP/platforms/os/linux/ KERNEL_DIR=$(KERNEL_OUT) ARCH="arm" CROSS_COMPILE="arm-eabi-" TNETW=1273 REPORT_LOG=n mv hardware/ti/wlan/wl1283_softAP/platforms/os/linux/tiap_drv.ko $(KERNEL_MODULES_OUT) TARGET_KERNEL_MODULES := TIWLAN_MODULES --------------------------- Change-Id: I8634fa4c788a42dc6f62e62ca170825b66db126a --- core/tasks/kernel.mk | 196 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 196 insertions(+) create mode 100644 core/tasks/kernel.mk diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk new file mode 100644 index 00000000000..ac6c88734a0 --- /dev/null +++ b/core/tasks/kernel.mk @@ -0,0 +1,196 @@ +# Copyright (C) 2012 The CyanogenMod Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Android makefile to build kernel as a part of Android Build + +-include vendor/custom/branding.mk + +TARGET_AUTO_KDIR := $(shell echo $(TARGET_DEVICE_DIR) | sed -e 's/^device/kernel/g') + +## Externally influenced variables +# kernel location - optional, defaults to kernel// +TARGET_KERNEL_SOURCE ?= $(TARGET_AUTO_KDIR) +KERNEL_SRC := $(TARGET_KERNEL_SOURCE) +# kernel configuration - mandatory +KERNEL_DEFCONFIG := $(TARGET_KERNEL_CONFIG) +VARIANT_DEFCONFIG := $(TARGET_KERNEL_VARIANT_CONFIG) +SELINUX_DEFCONFIG := $(TARGET_KERNEL_SELINUX_CONFIG) + +## Internal variables +KERNEL_OUT := $(ANDROID_BUILD_TOP)/$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ +KERNEL_CONFIG := $(KERNEL_OUT)/.config + +ifeq ($(BOARD_USES_UBOOT),true) + TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/uImage + TARGET_PREBUILT_INT_KERNEL_TYPE := uImage +else ifeq ($(BOARD_USES_UNCOMPRESSED_BOOT),true) + TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/Image + TARGET_PREBUILT_INT_KERNEL_TYPE := Image +else + TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/zImage + TARGET_PREBUILT_INT_KERNEL_TYPE := zImage +endif + +ifeq "$(wildcard $(KERNEL_SRC) )" "" + ifneq ($(TARGET_PREBUILT_KERNEL),) + HAS_PREBUILT_KERNEL := true + NEEDS_KERNEL_COPY := true + else + $(foreach cf,$(PRODUCT_COPY_FILES), \ + $(eval _src := $(call word-colon,1,$(cf))) \ + $(eval _dest := $(call word-colon,2,$(cf))) \ + $(ifeq kernel,$(_dest), \ + $(eval HAS_PREBUILT_KERNEL := true))) + endif + + ifneq ($(HAS_PREBUILT_KERNEL),) + $(warning ***************************************************************) + $(warning * Using prebuilt kernel binary instead of source *) + $(warning * THIS IS DEPRECATED, AND WILL BE DISCONTINUED *) + $(warning * Please configure your device to download the kernel *) + $(warning * source repository to $(KERNEL_SRC)) + $(warning * See $(URL_INTEGRATED_KERNEL_BUILD) + $(warning * for more information *) + $(warning ***************************************************************) + FULL_KERNEL_BUILD := false + KERNEL_BIN := $(TARGET_PREBUILT_KERNEL) + else + $(warning ***************************************************************) + $(warning * *) + $(warning * No kernel source found, and no fallback prebuilt defined. *) + $(warning * Please make sure your device is properly configured to *) + $(warning * download the kernel repository to $(KERNEL_SRC)) + $(warning * and add the TARGET_KERNEL_CONFIG variable to BoardConfig.mk *) + $(warning * *) + $(warning * As an alternative, define the TARGET_PREBUILT_KERNEL *) + $(warning * variable with the path to the prebuilt binary kernel image *) + $(warning * in your BoardConfig.mk file *) + $(warning * *) + $(warning ***************************************************************) + $(error "NO KERNEL") + endif +else + NEEDS_KERNEL_COPY := true + ifeq ($(TARGET_KERNEL_CONFIG),) + $(warning **********************************************************) + $(warning * Kernel source found, but no configuration was defined *) + $(warning * Please add the TARGET_KERNEL_CONFIG variable to your *) + $(warning * BoardConfig.mk file *) + $(warning **********************************************************) + # $(error "NO KERNEL CONFIG") + else + #$(info Kernel source found, building it) + FULL_KERNEL_BUILD := true + ifeq ($(TARGET_USES_UNCOMPRESSED_KERNEL),true) + $(info Using uncompressed kernel) + KERNEL_BIN := $(KERNEL_OUT)/piggy + else + KERNEL_BIN := $(TARGET_PREBUILT_INT_KERNEL) + endif + endif +endif + +ifeq ($(FULL_KERNEL_BUILD),true) + +KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr +KERNEL_MODULES_INSTALL := system +KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules + +define mv-modules + mdpath=`find $(KERNEL_MODULES_OUT) -type f -name modules.order`;\ + if [ "$$mdpath" != "" ];then\ + mpath=`dirname $$mdpath`;\ + ko=`find $$mpath/kernel -type f -name *.ko`;\ + for i in $$ko; do $(ARM_EABI_TOOLCHAIN)/arm-eabi-strip --strip-unneeded $$i;\ + mv $$i $(KERNEL_MODULES_OUT)/; done;\ + fi +endef + +define clean-module-folder + mdpath=`find $(KERNEL_MODULES_OUT) -type f -name modules.order`;\ + if [ "$$mdpath" != "" ];then\ + mpath=`dirname $$mdpath`; rm -rf $$mpath;\ + fi +endef + +ifeq ($(TARGET_ARCH),arm) + ifneq ($(USE_CCACHE),) + # search executable + ccache = + ifneq ($(strip $(wildcard $(ANDROID_BUILD_TOP)/prebuilts/misc/$(HOST_PREBUILT_EXTRA_TAG)/ccache/ccache)),) + ccache := $(ANDROID_BUILD_TOP)/prebuilts/misc/$(HOST_PREBUILT_EXTRA_TAG)/ccache/ccache + else + ifneq ($(strip $(wildcard $(ANDROID_BUILD_TOP)/prebuilts/misc/$(HOST_PREBUILT_TAG)/ccache/ccache)),) + ccache := $(ANDROID_BUILD_TOP)/prebuilts/misc/$(HOST_PREBUILT_TAG)/ccache/ccache + endif + endif + endif + ifneq ($(TARGET_KERNEL_CUSTOM_TOOLCHAIN),) + ifeq ($(HOST_OS),darwin) + ARM_CROSS_COMPILE:=CROSS_COMPILE="$(ccache) $(ANDROID_BUILD_TOP)/prebuilt/darwin-x86/toolchain/$(TARGET_KERNEL_CUSTOM_TOOLCHAIN)/bin/arm-eabi-" + else + ARM_CROSS_COMPILE:=CROSS_COMPILE="$(ccache) $(ANDROID_BUILD_TOP)/prebuilt/linux-x86/toolchain/$(TARGET_KERNEL_CUSTOM_TOOLCHAIN)/bin/arm-eabi-" + endif + else + ARM_CROSS_COMPILE:=CROSS_COMPILE="$(ccache) $(ARM_EABI_TOOLCHAIN)/arm-eabi-" + endif + ccache = +endif + +ifeq ($(HOST_OS),darwin) + MAKE_FLAGS := C_INCLUDE_PATH=$(ANDROID_BUILD_TOP)/external/elfutils/libelf +endif + +ifeq ($(TARGET_KERNEL_MODULES),) + TARGET_KERNEL_MODULES := no-external-modules +endif + +$(KERNEL_OUT): + mkdir -p $(KERNEL_OUT) + mkdir -p $(KERNEL_MODULES_OUT) + +$(KERNEL_CONFIG): $(KERNEL_OUT) + $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG) + +$(KERNEL_OUT)/piggy : $(TARGET_PREBUILT_INT_KERNEL) + $(hide) gunzip -c $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/compressed/piggy.gzip > $(KERNEL_OUT)/piggy + +TARGET_KERNEL_BINARIES: $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL) + $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) $(TARGET_PREBUILT_INT_KERNEL_TYPE) + -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) modules + -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) modules_install + $(mv-modules) + $(clean-module-folder) + +$(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES + +$(TARGET_PREBUILT_INT_KERNEL): $(TARGET_KERNEL_MODULES) + $(mv-modules) + $(clean-module-folder) + +$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_CONFIG) + $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) headers_install + +endif # FULL_KERNEL_BUILD + +## Install it + +ifeq ($(NEEDS_KERNEL_COPY),true) +file := $(INSTALLED_KERNEL_TARGET) +ALL_PREBUILT += $(file) +$(file) : $(KERNEL_BIN) | $(ACP) + $(transform-prebuilt-to-target) + +ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET) +endif From d57380312be2691832821833522ac8b259559012 Mon Sep 17 00:00:00 2001 From: Pulser Date: Wed, 28 Aug 2013 11:59:17 +0100 Subject: [PATCH 023/837] build: Fix kernel.mk typos Change-Id: I5980d6a30dd66741a561a95e0dfba60a3ad0ef5d --- core/tasks/kernel.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index ac6c88734a0..3ee9e65a6f7 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -14,7 +14,7 @@ # Android makefile to build kernel as a part of Android Build --include vendor/custom/branding.mk +-include vendor/custom/config/branding.mk TARGET_AUTO_KDIR := $(shell echo $(TARGET_DEVICE_DIR) | sed -e 's/^device/kernel/g') @@ -60,7 +60,7 @@ ifeq "$(wildcard $(KERNEL_SRC) )" "" $(warning * THIS IS DEPRECATED, AND WILL BE DISCONTINUED *) $(warning * Please configure your device to download the kernel *) $(warning * source repository to $(KERNEL_SRC)) - $(warning * See $(URL_INTEGRATED_KERNEL_BUILD) + $(warning * See $(URL_INTEGRATED_KERNEL_BUILD)) $(warning * for more information *) $(warning ***************************************************************) FULL_KERNEL_BUILD := false From 6d3da301a20f2b1feca0e887deb61e2c8652d04d Mon Sep 17 00:00:00 2001 From: xplodwild Date: Wed, 28 Aug 2013 13:45:53 +0100 Subject: [PATCH 024/837] product: Remove MusicFX, we have DSPManager Change-Id: I6be4c766f83a91c2e6104cbaa18ee18abd7784cf --- target/product/generic_no_telephony.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index 289f83ac9b0..665e1fe84e6 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk @@ -34,7 +34,6 @@ PRODUCT_PACKAGES := \ Keyguard \ LatinIME \ Launcher2 \ - MusicFX \ OneTimeInitializer \ PrintSpooler \ Provision \ From ad867dcab8a020837efca576438cc326931b35d2 Mon Sep 17 00:00:00 2001 From: xplodwild Date: Thu, 29 Aug 2013 20:18:18 +0200 Subject: [PATCH 025/837] envsetup: Add pushboot function This function lets you push a file from your current OUT dir for your current device. It root/remount the device, push the file, and reboots it. Example: pushboot system/app/SystemUI.apk Change-Id: I8a404323a4091e8502fbdd24198c66f1ac598192 --- envsetup.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/envsetup.sh b/envsetup.sh index 55ffef30807..e65d7405e92 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -13,6 +13,7 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y - jgrep: Greps on all local Java files. - resgrep: Greps on all local res/*.xml files. - godir: Go to the directory containing a file. +- pushboot:Push a file from your OUT dir to your phone and reboots it, using absolute path. Look at the source to view more functions. The complete list is: EOF @@ -618,6 +619,21 @@ function tapas() printconfig } +function pushboot() { + if [ ! -f $OUT/$* ]; then + echo "File not found: $OUT/$*" + return 1 + fi + + adb root + sleep 1 + adb wait-for-device + adb remount + + adb push $OUT/$* /$* + adb reboot +} + function gettop { local TOPFILE=build/core/envsetup.mk From 98513a9e3effb1c3017a4c6408fc7cf07a8c3c65 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Mon, 20 Aug 2012 11:00:51 -0700 Subject: [PATCH 026/837] build: Add Qualcomm's helper macros * This is used everywhere in Qualcomm's code. There's no reason we need to constantly replace it with uglier stuff in our Makefiles. Change-Id: I0183a338470ec96a38f356a47bae65a0d3fb2c95 --- core/main.mk | 3 + core/qcom_utils.mk | 191 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 194 insertions(+) create mode 100755 core/qcom_utils.mk diff --git a/core/main.mk b/core/main.mk index b942ceb9502..8578d90a3ce 100644 --- a/core/main.mk +++ b/core/main.mk @@ -239,6 +239,9 @@ endif # Bring in standard build system definitions. include $(BUILD_SYSTEM)/definitions.mk +# Bring in Qualcomm helper macros +include $(BUILD_SYSTEM)/qcom_utils.mk + # Bring in dex_preopt.mk include $(BUILD_SYSTEM)/dex_preopt.mk diff --git a/core/qcom_utils.mk b/core/qcom_utils.mk new file mode 100755 index 00000000000..76cff81aded --- /dev/null +++ b/core/qcom_utils.mk @@ -0,0 +1,191 @@ +# vars for use by utils +empty := +space := $(empty) $(empty) +colon := $(empty):$(empty) +underscore := $(empty)_$(empty) + +# $(call match-word,w1,w2) +# checks if w1 == w2 +# How it works +# if (w1-w2 not empty or w2-w1 not empty) then not_match else match +# +# returns true or empty +#$(warning :$(1): :$(2): :$(subst $(1),,$(2)):) \ +#$(warning :$(2): :$(1): :$(subst $(2),,$(1)):) \ +# +define match-word +$(strip \ + $(if $(or $(subst $(1),$(empty),$(2)),$(subst $(2),$(empty),$(1))),,true) \ +) +endef + +# $(call find-word-in-list,w,wlist) +# finds an exact match of word w in word list wlist +# +# How it works +# fill wlist spaces with colon +# wrap w with colon +# search word w in list wl, if found match m, return stripped word w +# +# returns stripped word or empty +define find-word-in-list +$(strip \ + $(eval wl:= $(colon)$(subst $(space),$(colon),$(strip $(2)))$(colon)) \ + $(eval w:= $(colon)$(strip $(1))$(colon)) \ + $(eval m:= $(findstring $(w),$(wl))) \ + $(if $(m),$(1),) \ +) +endef + +# $(call match-word-in-list,w,wlist) +# does an exact match of word w in word list wlist +# How it works +# if the input word is not empty +# return output of an exact match of word w in wordlist wlist +# else +# return empty +# returns true or empty +define match-word-in-list +$(strip \ + $(if $(strip $(1)), \ + $(call match-word,$(call find-word-in-list,$(1),$(2)),$(strip $(1))), \ + ) \ +) +endef + +# $(call match-prefix,p,delim,w/wlist) +# matches prefix p in wlist using delimiter delim +# +# How it works +# trim the words in wlist w +# if find-word-in-list returns not empty +# return true +# else +# return empty +# +define match-prefix +$(strip \ + $(eval w := $(strip $(1)$(strip $(2)))) \ + $(eval text := $(patsubst $(w)%,$(1),$(3))) \ + $(if $(call match-word-in-list,$(1),$(text)),true,) \ +) +endef + +# ---- +# The following utilities are meant for board platform specific +# featurisation + +# $(call get-vendor-board-platforms,v) +# returns list of board platforms for vendor v +define get-vendor-board-platforms +$($(1)_BOARD_PLATFORMS) +endef + +# $(call is-board-platform,bp) +# returns true or empty +define is-board-platform +$(call match-word,$(1),$(TARGET_BOARD_PLATFORM)) +endef + +# $(call is-not-board-platform,bp) +# returns true or empty +define is-not-board-platform +$(if $(call match-word,$(1),$(TARGET_BOARD_PLATFORM)),,true) +endef + +# $(call is-board-platform-in-list,bpl) +# returns true or empty +define is-board-platform-in-list +$(call match-word-in-list,$(TARGET_BOARD_PLATFORM),$(1)) +endef + +# $(call is-vendor-board-platform,vendor) +# returns true or empty +define is-vendor-board-platform +$(strip \ + $(call match-word-in-list,$(TARGET_BOARD_PLATFORM),\ + $(call get-vendor-board-platforms,$(1)) \ + ) \ +) +endef + +# $(call is-chipset-in-board-platform,chipset) +# does a prefix match of chipset in TARGET_BOARD_PLATFORM +# uses underscore as a delimiter +# +# returns true or empty +define is-chipset-in-board-platform +$(call match-prefix,$(1),$(underscore),$(TARGET_BOARD_PLATFORM)) +endef + +# $(call is-chipset-prefix-in-board-platform,prefix) +# does a chipset prefix match in TARGET_BOARD_PLATFORM +# assumes '_' and 'a' as the delimiter to the chipset prefix +# +# How it works +# if ($(prefix)_ or $(prefix)a match in board platform) +# return true +# else +# return empty +# +define is-chipset-prefix-in-board-platform +$(strip \ + $(eval delim_a := $(empty)a$(empty)) \ + $(if \ + $(or \ + $(call match-prefix,$(1),$(delim_a),$(TARGET_BOARD_PLATFORM)), \ + $(call match-prefix,$(1),$(underscore),$(TARGET_BOARD_PLATFORM)), \ + ), \ + true, \ + ) \ +) +endef + +#---- +# The following utilities are meant for Android Code Name +# specific featurisation +# +# refer http://source.android.com/source/build-numbers.html +# for code names and associated sdk versions +CUPCAKE_SDK_VERSIONS := 3 +DONUT_SDK_VERSIONS := 4 +ECLAIR_SDK_VERSIONS := 5 6 7 +FROYO_SDK_VERSIONS := 8 +GINGERBREAD_SDK_VERSIONS := 9 10 +HONEYCOMB_SDK_VERSIONS := 11 12 13 +ICECREAM_SANDWICH_SDK_VERSIONS := 14 15 +JELLY_BEAN_SDK_VERSIONS := 16 + +# $(call is-android-codename,codename) +# codename is one of cupcake,donut,eclair,froyo,gingerbread,icecream +# please refer the $(codename)_SDK_VERSIONS declared above +define is-android-codename +$(strip \ + $(if \ + $(call match-word-in-list,$(PLATFORM_SDK_VERSION),$($(1)_SDK_VERSIONS)), \ + true, \ + ) \ +) +endef + +# $(call is-android-codename-in-list,cnlist) +# cnlist is combination/list of android codenames +define is-android-codename-in-list +$(strip \ + $(eval acn := $(empty)) \ + $(foreach \ + i,$(1),\ + $(eval acn += \ + $(if \ + $(call \ + match-word-in-list,\ + $(PLATFORM_SDK_VERSION),\ + $($(i)_SDK_VERSIONS)\ + ),\ + true,\ + )\ + )\ + ) \ + $(if $(strip $(acn)),true,) \ +) +endef From 9586635cc00bc3f2c1bfc746c81ccbb6f42d6ff6 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Fri, 7 Dec 2012 00:21:36 -0800 Subject: [PATCH 027/837] build: Add board platforms to qcom_utils Change-Id: I85458167bf2b9c04b029d09b87bf791ff4cfd04d --- core/qcom_utils.mk | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/core/qcom_utils.mk b/core/qcom_utils.mk index 76cff81aded..7f01c24e75c 100755 --- a/core/qcom_utils.mk +++ b/core/qcom_utils.mk @@ -1,3 +1,24 @@ +# Board platforms lists to be used for +# TARGET_BOARD_PLATFORM specific featurization +QCOM_BOARD_PLATFORMS := msm7627_surf +QCOM_BOARD_PLATFORMS += msm7627_6x +QCOM_BOARD_PLATFORMS += msm7627a +QCOM_BOARD_PLATFORMS += msm7630_surf +QCOM_BOARD_PLATFORMS += msm7630_fusion +QCOM_BOARD_PLATFORMS += msm8660 +QCOM_BOARD_PLATFORMS += msm8960 +QCOM_BOARD_PLATFORMS += msm8974 + +MSM7K_BOARD_PLATFORMS := msm7630_surf +MSM7K_BOARD_PLATFORMS += msm7630_fusion +MSM7K_BOARD_PLATFORMS += msm7627_surf +MSM7K_BOARD_PLATFORMS += msm7627_6x +MSM7K_BOARD_PLATFORMS += msm7627a +MSM7K_BOARD_PLATFORMS += msm7k + +QSD8K_BOARD_PLATFORMS := qsd8k + + # vars for use by utils empty := space := $(empty) $(empty) From 410cf69da08beb5b0cdfc6b5d7827b4231683a97 Mon Sep 17 00:00:00 2001 From: Rudolf Tammekivi Date: Wed, 9 Jan 2013 21:03:17 +0200 Subject: [PATCH 028/837] build: Use common name for QCOM 7K boards. This is needed to build QCOM HAL without external modifications. The device would now have to specify msm7x27 or msm7x30 instead of specifying the full name. Patch Set 2: Add msm7x27a into the list. Change-Id: I25018e397b5aad27fab5244731a574ae86752e17 --- core/qcom_utils.mk | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/core/qcom_utils.mk b/core/qcom_utils.mk index 7f01c24e75c..a6ee4943dca 100755 --- a/core/qcom_utils.mk +++ b/core/qcom_utils.mk @@ -1,19 +1,15 @@ # Board platforms lists to be used for # TARGET_BOARD_PLATFORM specific featurization -QCOM_BOARD_PLATFORMS := msm7627_surf -QCOM_BOARD_PLATFORMS += msm7627_6x -QCOM_BOARD_PLATFORMS += msm7627a -QCOM_BOARD_PLATFORMS += msm7630_surf -QCOM_BOARD_PLATFORMS += msm7630_fusion +QCOM_BOARD_PLATFORMS := msm7x27 +QCOM_BOARD_PLATFORMS += msm7x27a +QCOM_BOARD_PLATFORMS += msm7x30 QCOM_BOARD_PLATFORMS += msm8660 QCOM_BOARD_PLATFORMS += msm8960 QCOM_BOARD_PLATFORMS += msm8974 -MSM7K_BOARD_PLATFORMS := msm7630_surf -MSM7K_BOARD_PLATFORMS += msm7630_fusion -MSM7K_BOARD_PLATFORMS += msm7627_surf -MSM7K_BOARD_PLATFORMS += msm7627_6x -MSM7K_BOARD_PLATFORMS += msm7627a +MSM7K_BOARD_PLATFORMS := msm7x30 +MSM7K_BOARD_PLATFORMS += msm7x27 +MSM7K_BOARD_PLATFORMS += msm7x27a MSM7K_BOARD_PLATFORMS += msm7k QSD8K_BOARD_PLATFORMS := qsd8k From 66a4b2725c4fdf34f9f701720e4b23e2444bd81d Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Thu, 14 Feb 2013 22:24:01 -0800 Subject: [PATCH 029/837] Add new version to qcom_utils.mk Change-Id: I1ca1532fd4968450715ecd0cca7729e0e6d507ef --- core/qcom_utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/qcom_utils.mk b/core/qcom_utils.mk index a6ee4943dca..50584ccd155 100755 --- a/core/qcom_utils.mk +++ b/core/qcom_utils.mk @@ -171,7 +171,7 @@ FROYO_SDK_VERSIONS := 8 GINGERBREAD_SDK_VERSIONS := 9 10 HONEYCOMB_SDK_VERSIONS := 11 12 13 ICECREAM_SANDWICH_SDK_VERSIONS := 14 15 -JELLY_BEAN_SDK_VERSIONS := 16 +JELLY_BEAN_SDK_VERSIONS := 16 17 # $(call is-android-codename,codename) # codename is one of cupcake,donut,eclair,froyo,gingerbread,icecream From 0dd8e0ca385b5b55b413a45521168debafb7e4ce Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Fri, 13 Sep 2013 21:06:09 +0000 Subject: [PATCH 030/837] Allow a device to generically define its own headers We have a few cases of devices including specific versions of projects just because of modified headers (msm_mdp.h comes to mind), and I just had enough of ifdeffing header files for specific cases (the P990 needs a lot of these). Now... if a target defines a TARGET_SPECIFIC_HEADER_PATH, any headers in there will take precedence over the standard ones; for example, on the p990, I have TARGET_SPECIFIC_HEADER_PATH := device/lge/p990/include which makes, for example, the device/lge/p990/include/hardware_legacy/AudioHardwareInterface.h be used instead of hardware/libhardware_legacy/include/hardware_legacy/AudioHardwareInterface.h whenever a source file uses Change-Id: I41b62668b60e3f62a6ebd3738d8d2675103a81e6 --- core/binary.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/binary.mk b/core/binary.mk index 554b8c71a8a..e488e659c7d 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -617,6 +617,11 @@ normal_objects := \ all_objects := $(normal_objects) $(gen_o_objects) +## Allow a device's own headers to take precedence over global ones +ifneq ($(TARGET_SPECIFIC_HEADER_PATH),) +LOCAL_C_INCLUDES += $(TOPDIR)$(TARGET_SPECIFIC_HEADER_PATH) +endif + LOCAL_C_INCLUDES += $(TOPDIR)$(LOCAL_PATH) $(intermediates) ifndef LOCAL_SDK_VERSION From 547da6a42e069c61e3f7a218517859e324bd0bc6 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Thu, 27 Sep 2012 18:11:25 +0530 Subject: [PATCH 031/837] envsetup: set OUT_DIR to an absolute path always OUT_DIR was set to $(TOPDIR)out previously, but $(TOPDIR) was null, so it was a relative path. This broke releasetools, inline kernel building, etc since they require absolute paths. Fix it so that it is set to $(shell readlink -f .)/out if $(TOPDIR) is null. Also remove hacks which checked if (OUT_DIR) was out and changed it to $(ANDROID_BUILD_TOP)/out to workaround the aforementioned problem. Change-Id: I459a3b1325a1bbea0565cd73f6acf160d4ed9b39 Conflicts: core/base_rules.mk core/tasks/kernel.mk Change-Id: I52a7a6024f0f2b708c230e53c0152ed138726cc1 --- core/envsetup.mk | 4 ++++ core/tasks/kernel.mk | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index 8ac437ebee6..96bbe568b7b 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -139,8 +139,12 @@ endif ifeq (,$(strip $(OUT_DIR))) ifeq (,$(strip $(OUT_DIR_COMMON_BASE))) +ifneq ($(TOPDIR),) OUT_DIR := $(TOPDIR)out else +OUT_DIR := $(shell readlink -f .)/out +endif +else OUT_DIR := $(OUT_DIR_COMMON_BASE)/$(notdir $(PWD)) endif endif diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index 3ee9e65a6f7..00a1e2e53f5 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -28,7 +28,7 @@ VARIANT_DEFCONFIG := $(TARGET_KERNEL_VARIANT_CONFIG) SELINUX_DEFCONFIG := $(TARGET_KERNEL_SELINUX_CONFIG) ## Internal variables -KERNEL_OUT := $(ANDROID_BUILD_TOP)/$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ +KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ KERNEL_CONFIG := $(KERNEL_OUT)/.config ifeq ($(BOARD_USES_UBOOT),true) From 9d01bb28f8c4b2e4cb9c081de6b09f999301ade5 Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Sat, 28 Sep 2013 15:26:50 -0400 Subject: [PATCH 032/837] envsetup: Set CUSTOM_BUILD environment variable This is used to gate a few features, including backuptool Change-Id: I02fee9e0765cca88c833bb0514762aa3b14642e3 --- envsetup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/envsetup.sh b/envsetup.sh index e65d7405e92..7ca0233f9cc 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -58,6 +58,14 @@ function check_product() echo "Couldn't locate the top of the tree. Try setting TOP." >&2 return fi + + if (echo -n $1 | grep -q -e "^custom_") ; then + CUSTOM_BUILD=$(echo -n $1 | sed -e 's/^custom_//g') + else + CUSTOM_BUILD= + fi + export CUSTOM_BUILD + CALLED_FROM_SETUP=true BUILD_SYSTEM=build/core \ TARGET_PRODUCT=$1 \ TARGET_BUILD_VARIANT= \ From 7c94f8a7aa0fd951fe574afe601184166329bb6a Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Sat, 28 Sep 2013 15:24:20 -0400 Subject: [PATCH 033/837] Add backuptool support to the releasetools system Pulled from CyanogenMod 10.1 Change-Id: Iffd9a45865011ad9108508d31f79e53d609dd6f4 --- core/Makefile | 7 +++++++ tools/releasetools/edify_generator.py | 16 ++++++++++++++++ tools/releasetools/ota_from_target_files | 16 ++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/core/Makefile b/core/Makefile index 7e8a0af5c55..6140fb890cf 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1293,11 +1293,18 @@ INTERNAL_OTA_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip $(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR) +ifneq ($(CUSTOM_BUILD),) + $(INTERNAL_OTA_PACKAGE_TARGET): backuptool := true +else + $(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false +endif + $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) @echo "Package OTA: $@" $(hide) ./build/tools/releasetools/ota_from_target_files -v \ -p $(HOST_OUT) \ -k $(KEY_CERT_PAIR) \ + --backup=$(backuptool) \ $(BUILT_TARGET_FILES_PACKAGE) $@ CUSTOM_TARGET_PACKAGE := $(PRODUCT_OUT)/custom-$(ROM_VERSION).zip diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index 2c3b9e7564c..46ebc2d2fd1 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -106,6 +106,16 @@ def AssertSomeBootloader(self, *bootloaders): ");") self.script.append(self._WordWrap(cmd)) + def RunBackup(self, command): + self.script.append('package_extract_file("system/bin/backuptool.sh", "/tmp/backuptool.sh");') + self.script.append('package_extract_file("system/bin/backuptool.functions", "/tmp/backuptool.functions");') + self.script.append('set_perm(0, 0, 0777, "/tmp/backuptool.sh");') + self.script.append('set_perm(0, 0, 0644, "/tmp/backuptool.functions");') + self.script.append(('run_program("/tmp/backuptool.sh", "%s");' % command)) + if command == "restore": + self.script.append('delete("/system/bin/backuptool.sh");') + self.script.append('delete("/system/bin/backuptool.functions");') + def ShowProgress(self, frac, dur): """Update the progress bar, advancing it over 'frac' over the next 'dur' seconds. 'dur' may be zero to advance it via SetProgress @@ -150,6 +160,12 @@ def Mount(self, mount_point): p.device, p.mount_point)) self.mounts.add(p.mount_point) + def Unmount(self, mount_point): + """Unmount the partiiton with the given mount_point.""" + if mount_point in self.mounts: + self.mounts.remove(mount_point) + self.script.append('unmount("%s");' % (mount_point,)) + def UnpackPackageDir(self, src, dst): """Unpack a given directory from the OTA package into the given destination directory.""" diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 0192aace959..d2ad99325ae 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -52,6 +52,9 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package -a (--aslr_mode) Specify whether to turn on ASLR for the package (on by default). + --backup + Enable or disable the execution of backuptool.sh. + Disabled by default. """ import sys @@ -88,6 +91,7 @@ OPTIONS.omit_prereq = False OPTIONS.extra_script = None OPTIONS.aslr_mode = True OPTIONS.worker_threads = 3 +OPTIONS.backuptool = False def MostPopularKey(d, default): """Given a dict, return the key corresponding to the largest @@ -406,6 +410,11 @@ def WriteFullOTAPackage(input_zip, output_zip): device_specific.FullOTA_Assertions() device_specific.FullOTA_InstallBegin() + if OPTIONS.backuptool: + script.Mount("/system") + script.RunBackup("backup") + script.Unmount("/system") + script.ShowProgress(0.5, 0) if OPTIONS.wipe_user_data: @@ -435,6 +444,10 @@ def WriteFullOTAPackage(input_zip, output_zip): common.ZipWriteStr(output_zip, "boot.img", boot_img.data) script.ShowProgress(0.2, 0) + if OPTIONS.backuptool: + script.ShowProgress(0.2, 10) + script.RunBackup("restore") + script.ShowProgress(0.2, 10) script.WriteRawImage("/boot", "boot.img") @@ -773,6 +786,8 @@ def main(argv): OPTIONS.aslr_mode = False elif o in ("--worker_threads"): OPTIONS.worker_threads = int(a) + elif o in ("--backup"): + OPTIONS.backuptool = bool(a.lower() == 'true') else: return False return True @@ -787,6 +802,7 @@ def main(argv): "extra_script=", "worker_threads=", "aslr_mode=", + "backup=", ], extra_option_handler=option_handler) From 44c58d485e473e50fc8b2adac5d9b26c151fe839 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Wed, 21 Apr 2010 11:39:48 -0400 Subject: [PATCH 034/837] Allow override of device asserts, including multi-device support. Set in board file with TARGET_OTA_ASSERT_DEVICE. (cherry-picked from commit 0f452f21fc9323b9d1fe746161761cf40aaa5030) Change-Id: Icd10de924f2b88168912c9575174cebf6b0104ba --- core/Makefile | 7 +++++++ tools/releasetools/ota_from_target_files | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index 6140fb890cf..d6b76b33861 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1299,12 +1299,19 @@ else $(INTERNAL_OTA_PACKAGE_TARGET): backuptool := false endif +ifeq ($(TARGET_OTA_ASSERT_DEVICE),) + $(INTERNAL_OTA_PACKAGE_TARGET): override_device := auto +else + $(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_OTA_ASSERT_DEVICE) +endif + $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) @echo "Package OTA: $@" $(hide) ./build/tools/releasetools/ota_from_target_files -v \ -p $(HOST_OUT) \ -k $(KEY_CERT_PAIR) \ --backup=$(backuptool) \ + --override_device=$(override_device) \ $(BUILT_TARGET_FILES_PACKAGE) $@ CUSTOM_TARGET_PACKAGE := $(PRODUCT_OUT)/custom-$(ROM_VERSION).zip diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index d2ad99325ae..2a59fbbbe4e 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -55,6 +55,10 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package --backup Enable or disable the execution of backuptool.sh. Disabled by default. + + --override_device + Override device-specific asserts. Can be a comma-separated list. + """ import sys @@ -92,6 +96,7 @@ OPTIONS.extra_script = None OPTIONS.aslr_mode = True OPTIONS.worker_threads = 3 OPTIONS.backuptool = False +OPTIONS.override_device = 'auto' def MostPopularKey(d, default): """Given a dict, return the key corresponding to the largest @@ -319,8 +324,12 @@ def SignOutput(temp_zip_name, output_zip_name): whole_file=True) -def AppendAssertions(script, info_dict): - device = GetBuildProp("ro.product.device", info_dict) + +def AppendAssertions(script, input_zip): + if OPTIONS.override_device == "auto": + device = GetBuildProp("ro.product.device", input_zip) + else: + device = OPTIONS.override_device script.AssertDevice(device) @@ -788,6 +797,8 @@ def main(argv): OPTIONS.worker_threads = int(a) elif o in ("--backup"): OPTIONS.backuptool = bool(a.lower() == 'true') + elif o in ("--override_device"): + OPTIONS.override_device = a else: return False return True @@ -803,6 +814,7 @@ def main(argv): "worker_threads=", "aslr_mode=", "backup=", + "override_device=" ], extra_option_handler=option_handler) From 2951714ebf2c7de6bb326f482e2b31a9bffc2683 Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 30 Jun 2013 10:04:25 +0530 Subject: [PATCH 035/837] envsetup: add a helper to fix "out/target/common" not being really common * out/target/common isn't really common, and if you do back to back builds for multiple devices, that is noticable. * Use out/target/common-$device instead, and link the appropriate dir to out/target/common every time lunch() is run, if ANDROID_FIXUP_COMMON_OUT is set. * Refer https://groups.google.com/forum/#!topic/android-building/ispbOgzoyg8 for more info. Change-Id: I11e7df0e68e2a60ce32576f06397d60fc9465b60 --- envsetup.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/envsetup.sh b/envsetup.sh index 7ca0233f9cc..889a155ede3 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -571,6 +571,8 @@ function lunch() echo + fixup_common_out_dir + set_stuff_for_environment printconfig } @@ -1374,6 +1376,24 @@ function mka() { esac } +function fixup_common_out_dir() { + common_out_dir=$(get_build_var OUT_DIR)/target/common + target_device=$(get_build_var TARGET_DEVICE) + if [ ! -z $ANDROID_FIXUP_COMMON_OUT ]; then + if [ -d ${common_out_dir} ] && [ ! -L ${common_out_dir} ]; then + mv ${common_out_dir} ${common_out_dir}-${target_device} + ln -s ${common_out_dir}-${target_device} ${common_out_dir} + else + [ -L ${common_out_dir} ] && rm ${common_out_dir} + mkdir -p ${common_out_dir}-${target_device} + ln -s ${common_out_dir}-${target_device} ${common_out_dir} + fi + else + [ -L ${common_out_dir} ] && rm ${common_out_dir} + mkdir -p ${common_out_dir} + fi +} + # Force JAVA_HOME to point to java 1.6 if it isn't already set function set_java_home() { if [ ! "$JAVA_HOME" ]; then From c16e7487526ffe26a1f76d0db4987d8c37f8b583 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Wed, 16 Nov 2011 16:45:03 -0800 Subject: [PATCH 036/837] recovery: fix custom recoveries This is a squashed set of commits with some updates to minimize conflict with AOSP recovery: custom recovery build fixes Patch by Koush Extract uboot image creation from core/Makefile http://memegenerator.net/instance/12495768 This change utilizes BOARD_CUSTOM_BOOTIMG_MK to extract out the Uboot boot and recovery image generation out into it's own file (approx 130 lines). This should: * Clean up the already huge Makefile and the keep ifdeffyness down * Make sure Uboot changes don't effect other builds * Extract a lot of code that is only for 3 devices This depreciates BOARD_USES_UBOOT but BOARD_USES_UBOOT_MULTIIMAGE is still valid. Boards who use uboot boot images should remove BOARD_USES_UBOOT and add BOARD_CUSTOM_BOOTIMG_MK := device/common/uboot-bootimg.mk to their BoardConfig.mk (location of the makefile is not finalized) Conflicts: core/Makefile Patch by nemith remove unused BOARD_USES_COMBINED_RECOVERY Change-Id: I79520c510488d63d469b0d1a3a099420f7de1fe6 Patch by codeworkx Change-Id: I6bcab88b76272526bdc558fbf8d7b43347bb5ef1 --- core/Makefile | 49 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/core/Makefile b/core/Makefile index d6b76b33861..e3567162482 100644 --- a/core/Makefile +++ b/core/Makefile @@ -629,7 +629,12 @@ ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY))) INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img recovery_initrc := $(call include-path-for, recovery)/etc/init.rc -recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system +ifneq ($(TARGET_PREBUILT_RECOVERY_KERNEL),) + recovery_kernel := $(TARGET_PREBUILT_RECOVERY_KERNEL) # Use prebuilt recovery kernel +else + recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system +endif +recovery_uncompressed_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.cpio recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img recovery_build_prop := $(INSTALLED_BUILD_PROP_TARGET) recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery @@ -681,6 +686,12 @@ ifdef BOARD_KERNEL_PAGESIZE INTERNAL_RECOVERYIMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE) endif +INTERNAL_RECOVERY_FILES := $(filter $(TARGET_RECOVERY_OUT)/%, \ + $(ALL_PREBUILT) \ + $(ALL_COPIED_HEADERS) \ + $(ALL_GENERATED_SOURCES) \ + $(ALL_DEFAULT_INSTALLED_MODULES)) + # Keys authorized to sign OTA packages this build will accept. The # build always uses dev-keys for this; release packaging tools will # substitute other keys for this one. @@ -699,17 +710,18 @@ $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) @mkdir -p $(dir $@) java -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@ -$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ +TARGET_RECOVERY_ROOT_TIMESTAMP := $(TARGET_RECOVERY_OUT)/root.ts + +$(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ $(INSTALLED_RAMDISK_TARGET) \ $(INSTALLED_BOOTIMAGE_TARGET) \ $(recovery_binary) \ - $(recovery_initrc) $(recovery_kernel) \ + $(recovery_initrc) \ $(INSTALLED_2NDBOOTLOADER_TARGET) \ $(recovery_build_prop) $(recovery_resource_deps) \ $(recovery_fstab) \ $(RECOVERY_INSTALL_OTA_KEYS) - @echo ----- Making recovery image ------ - $(hide) rm -rf $(TARGET_RECOVERY_OUT) + @echo ----- Making recovery filesystem ------ $(hide) mkdir -p $(TARGET_RECOVERY_OUT) $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/tmp @echo Copying baseline ramdisk... @@ -717,8 +729,11 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ @echo Modifying ramdisk contents... $(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc $(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/ + $(hide) -cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/ $(hide) cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/ + rm -f $(TARGET_RECOVERY_ROOT_OUT)/init.*.rc + mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/bin $(hide) cp -rf $(recovery_resources_common) $(TARGET_RECOVERY_ROOT_OUT)/ $(hide) cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png $(hide) $(foreach item,$(recovery_resources_private), \ @@ -728,10 +743,28 @@ $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTFS) $(MKBOOTIMG) $(MINIGZIP) \ $(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys $(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \ > $(TARGET_RECOVERY_ROOT_OUT)/default.prop - $(hide) $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) | $(MINIGZIP) > $(recovery_ramdisk) + @echo ----- Made recovery filesystem -------- $(TARGET_RECOVERY_ROOT_OUT) + @touch $(TARGET_RECOVERY_ROOT_TIMESTAMP) + +$(recovery_uncompressed_ramdisk): $(MINIGZIP) \ + $(TARGET_RECOVERY_ROOT_TIMESTAMP) + @echo ----- Making uncompressed recovery ramdisk ------ + $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) > $@ + +$(recovery_ramdisk): $(MKBOOTFS) \ + $(recovery_uncompressed_ramdisk) + @echo ----- Making recovery ramdisk ------ + $(MINIGZIP) < $(recovery_uncompressed_ramdisk) > $@ + +ifndef BOARD_CUSTOM_BOOTIMG_MK +$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) \ + $(recovery_ramdisk) \ + $(recovery_kernel) + @echo ----- Making recovery image ------ $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@ $(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw) @echo ----- Made recovery image: $@ -------- +endif $(RECOVERY_RESOURCE_ZIP): $(INSTALLED_RECOVERYIMAGE_TARGET) $(hide) mkdir -p $(dir $@) @@ -828,7 +861,11 @@ SYSTEMIMAGE_SOURCE_DIR := $(TARGET_OUT) # image size check calculation. ifneq ($(INSTALLED_RECOVERYIMAGE_TARGET),) intermediates := $(call intermediates-dir-for,PACKAGING,recovery_patch) +ifndef BOARD_CUSTOM_BOOTIMG_MK RECOVERY_FROM_BOOT_PATCH := $(intermediates)/recovery_from_boot.p +else +RECOVERY_FROM_BOOT_PATCH := +endif $(RECOVERY_FROM_BOOT_PATCH): $(INSTALLED_RECOVERYIMAGE_TARGET) \ $(INSTALLED_BOOTIMAGE_TARGET) \ $(HOST_OUT_EXECUTABLES)/imgdiff \ From 2f985b4ddf423fd7474dbaca27196481ac310c40 Mon Sep 17 00:00:00 2001 From: codeworkx Date: Thu, 17 Nov 2011 17:31:00 +0100 Subject: [PATCH 037/837] build: fix BOARD_CUSTOM_BOOTIMG_MK Change-Id: I1b9fa7d8eb67bdcaaae7b55ca538b33545e73581 --- core/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/Makefile b/core/Makefile index e3567162482..3991a39c6ac 100644 --- a/core/Makefile +++ b/core/Makefile @@ -791,6 +791,10 @@ else BOARD_NAND_SPARE_SIZE := 64 endif +ifdef BOARD_CUSTOM_BOOTIMG_MK +include $(BOARD_CUSTOM_BOOTIMG_MK) +endif + # ----------------------------------------------------------------- # system image # From c75472985bfdc9b493b67c3c9980d60a843aae2a Mon Sep 17 00:00:00 2001 From: codeworkx Date: Thu, 17 Nov 2011 17:33:44 +0100 Subject: [PATCH 038/837] build: add support for custom releasetools Change-Id: I2337559ac669bb5868708c4726cbacbf5713261a --- core/Makefile | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index 3991a39c6ac..89855ef7af3 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1346,9 +1346,15 @@ else $(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_OTA_ASSERT_DEVICE) endif +ifeq ($(TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT),) + OTA_FROM_TARGET_SCRIPT := ./build/tools/releasetools/ota_from_target_files +else + OTA_FROM_TARGET_SCRIPT := $(TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT) +endif + $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) @echo "Package OTA: $@" - $(hide) ./build/tools/releasetools/ota_from_target_files -v \ + $(OTA_FROM_TARGET_SCRIPT) -v \ -p $(HOST_OUT) \ -k $(KEY_CERT_PAIR) \ --backup=$(backuptool) \ @@ -1382,9 +1388,15 @@ else $(INTERNAL_UPDATE_PACKAGE_TARGET): extensions := $(TARGET_RELEASETOOLS_EXTENSIONS) endif +ifeq ($(TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT),) + IMG_FROM_TARGET_SCRIPT := ./build/tools/releasetools/img_from_target_files +else + IMG_FROM_TARGET_SCRIPT := $(TARGET_RELEASETOOL_IMG_FROM_TARGET_SCRIPT) +endif + $(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) @echo "Package: $@" - $(hide) ./build/tools/releasetools/img_from_target_files -v \ + $(IMG_FROM_TARGET_SCRIPT) -v \ -s $(extensions) \ -p $(HOST_OUT) \ $(BUILT_TARGET_FILES_PACKAGE) $@ From 5fed162ff393499ae6fe412729fb25b7e240b81b Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Fri, 3 May 2013 14:54:48 +0530 Subject: [PATCH 039/837] releasetools: use prebuilt boot image if using a custom boot image makefile Change-Id: Ic348d31e8df7933dc4f9f055b7a5a2beacc21d32 --- core/Makefile | 2 ++ tools/releasetools/common.py | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 89855ef7af3..6db9ff7c219 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1354,6 +1354,7 @@ endif $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) @echo "Package OTA: $@" + MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \ $(OTA_FROM_TARGET_SCRIPT) -v \ -p $(HOST_OUT) \ -k $(KEY_CERT_PAIR) \ @@ -1396,6 +1397,7 @@ endif $(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) @echo "Package: $@" + MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \ $(IMG_FROM_TARGET_SCRIPT) -v \ -s $(extensions) \ -p $(HOST_OUT) \ diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 58582ba690f..aefc1f9c3a8 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -332,7 +332,13 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir, 'prebuilt_name', otherwise construct it from the source files in 'unpack_dir'/'tree_subdir'.""" - prebuilt_path = os.path.join(unpack_dir, "BOOTABLE_IMAGES", prebuilt_name) + prebuilt_dir = os.path.join(unpack_dir, "BOOTABLE_IMAGES") + prebuilt_path = os.path.join(prebuilt_dir, prebuilt_name) + custom_bootimg_mk = os.getenv('MKBOOTIMG') + if custom_bootimg_mk: + bootimage_path = os.path.join(os.getenv('OUT'), "boot.img") + os.mkdir(prebuilt_dir) + shutil.copyfile(bootimage_path, prebuilt_path) if os.path.exists(prebuilt_path): print "using prebuilt %s..." % (prebuilt_name,) return File.FromLocalFile(name, prebuilt_path) From 14a5e1ce58673c149cb2c4020c2eecce25d47c24 Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Tue, 22 Nov 2011 00:00:15 +0100 Subject: [PATCH 040/837] Add ARMv6J and ARMv6-VFP processor combo option Cherry-picked from gingerbread branch. Change-Id: I8015149184ab3e1ee61ef93c62a395233ad1d156 --- core/combo/arch/arm/armv6-vfp.mk | 30 ++++++++++++++++++++++++++++++ core/combo/arch/arm/armv6j.mk | 22 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 core/combo/arch/arm/armv6-vfp.mk create mode 100644 core/combo/arch/arm/armv6j.mk diff --git a/core/combo/arch/arm/armv6-vfp.mk b/core/combo/arch/arm/armv6-vfp.mk new file mode 100644 index 00000000000..a00a2d17fa0 --- /dev/null +++ b/core/combo/arch/arm/armv6-vfp.mk @@ -0,0 +1,30 @@ +# Configuration for Linux on ARM. +# Generating binaries for the ARMv6-VFP architecture and higher +# +ARCH_ARM_HAVE_THUMB_SUPPORT := true +ARCH_ARM_HAVE_FAST_INTERWORKING := true +ARCH_ARM_HAVE_64BIT_DATA := true +ARCH_ARM_HAVE_HALFWORD_MULTIPLY := true +ARCH_ARM_HAVE_CLZ := true +ARCH_ARM_HAVE_FFS := true +ARCH_ARM_HAVE_VFP := true + +ifeq ($(strip $(TARGET_ARCH_VARIANT_FPU)),) +TARGET_ARCH_VARIANT_FPU := vfp +endif +ifeq ($(strip $(TARGET_ARCH_VARIANT_CPU)),) +TARGET_ARCH_VARIANT_CPU := arm1136jf-s +endif + +# Note: Hard coding the 'tune' value here is probably not ideal, +# and a better solution should be found in the future. +# +arch_variant_cflags := \ + -mcpu=$(TARGET_ARCH_VARIANT_CPU) \ + -mfloat-abi=softfp \ + -mfpu=$(TARGET_ARCH_VARIANT_FPU) \ + -D__ARM_ARCH_5__ \ + -D__ARM_ARCH_5T__ \ + -D__ARM_ARCH_5E__ \ + -D__ARM_ARCH_5TE__ + diff --git a/core/combo/arch/arm/armv6j.mk b/core/combo/arch/arm/armv6j.mk new file mode 100644 index 00000000000..beca884b99e --- /dev/null +++ b/core/combo/arch/arm/armv6j.mk @@ -0,0 +1,22 @@ +# Configuration for Linux on ARM. +# Generating binaries for the ARMv6J architecture and higher +# +ARCH_ARM_HAVE_THUMB_SUPPORT := true +ARCH_ARM_HAVE_FAST_INTERWORKING := true +ARCH_ARM_HAVE_64BIT_DATA := true +ARCH_ARM_HAVE_HALFWORD_MULTIPLY := true +ARCH_ARM_HAVE_CLZ := true +ARCH_ARM_HAVE_FFS := true + +# Note: Hard coding the 'tune' value here is probably not ideal, +# and a better solution should be found in the future. +# +arch_variant_cflags := \ + -march=armv6j \ + -mtune=arm1136jf-s \ + -pipe \ + -fomit-frame-pointer \ + -D__ARM_ARCH_5__ \ + -D__ARM_ARCH_5T__ \ + -D__ARM_ARCH_5E__ \ + -D__ARM_ARCH_5TE__ From 94603f2737a92eb4e5dd4a709ec3885571e46294 Mon Sep 17 00:00:00 2001 From: AndroidMeda Date: Wed, 31 Jul 2013 16:41:50 +0300 Subject: [PATCH 041/837] Re-add ARCH_ARM_HAVE_TLS_REGISTER for armv7 OpenGL needs this flag for armv7 For more information : https://github.com/androidarmv6/android_bionic/commit/7bc88df02f887229738b08fd7f7bd2668805f306 https://github.com/androidarmv6/android_frameworks_native/commit/4ffa795a3e9f2d2a26766147b1cfedbe78e823d4 Change-Id: Ib68c17e2f8dd3c8c15f8f3ea235fe25a46d05b6a --- core/combo/arch/arm/armv7-a-neon.mk | 1 + core/combo/arch/arm/armv7-a.mk | 1 + target/board/generic/BoardConfig.mk | 1 + 3 files changed, 3 insertions(+) diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk index 057ce9333bd..6a8dc270398 100644 --- a/core/combo/arch/arm/armv7-a-neon.mk +++ b/core/combo/arch/arm/armv7-a-neon.mk @@ -2,6 +2,7 @@ # Generating binaries for the ARMv7-a architecture and higher with NEON # ARCH_ARM_HAVE_ARMV7A := true +ARCH_ARM_HAVE_TLS_REGISTER := true ARCH_ARM_HAVE_VFP := true ARCH_ARM_HAVE_VFP_D32 := true ARCH_ARM_HAVE_NEON := true diff --git a/core/combo/arch/arm/armv7-a.mk b/core/combo/arch/arm/armv7-a.mk index 4a519770f5a..2ed1a237c62 100644 --- a/core/combo/arch/arm/armv7-a.mk +++ b/core/combo/arch/arm/armv7-a.mk @@ -2,6 +2,7 @@ # Generating binaries for the ARMv7-a architecture and higher # ARCH_ARM_HAVE_ARMV7A := true +ARCH_ARM_HAVE_TLS_REGISTER := true ARCH_ARM_HAVE_VFP := true # Note: Hard coding the 'tune' value here is probably not ideal, diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 60decfb3e45..5b2c8b93426 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -23,6 +23,7 @@ TARGET_ARCH_VARIANT := armv7-a TARGET_CPU_VARIANT := generic TARGET_CPU_ABI := armeabi-v7a TARGET_CPU_ABI2 := armeabi +ARCH_ARM_HAVE_TLS_REGISTER := true HAVE_HTC_AUDIO_DRIVER := true BOARD_USES_GENERIC_AUDIO := true From 9c88cd5fbd436ff3b8d1186b207a612eb19f0137 Mon Sep 17 00:00:00 2001 From: Pulser Date: Sun, 29 Sep 2013 09:56:55 +0100 Subject: [PATCH 042/837] Add repopick script from CM patchset 4: cybojenix clean up the script: remove fetching from github cleaned up fetching locations of binaries if ANDROID_BUILD_TOP isn't defined, error out PS 5: Added back the check if fetch succeeded. Fixed verbose print about fetching. patchset 6: final changes fix detecting ANDROID_BUILD_TOP send all relavant data to stderr Change-Id: If67c5f178d03fadd8b79b1908f4a9cb231efbb28 --- envsetup.sh | 7 ++ tools/repopick.py | 266 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 273 insertions(+) create mode 100755 tools/repopick.py diff --git a/envsetup.sh b/envsetup.sh index 889a155ede3..3c174dfbd68 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1408,6 +1408,13 @@ function set_java_home() { fi } +function repopick() { + set_stuff_for_environment + T=$(gettop) + $T/build/tools/repopick.py $@ +} + + # Print colored exit condition function pez { "$@" diff --git a/tools/repopick.py b/tools/repopick.py new file mode 100755 index 00000000000..f1bb4d6a88b --- /dev/null +++ b/tools/repopick.py @@ -0,0 +1,266 @@ +#!/usr/bin/env python +# +# Copyright (C) 2013 The CyanogenMod Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# +# Run repopick.py -h for a description of this utility. +# + +from __future__ import print_function + +import sys +import json +import os +import subprocess +import re +import argparse +import textwrap + +try: + # For python3 + import urllib.request +except ImportError: + # For python2 + import imp + import urllib2 + urllib = imp.new_module('urllib') + urllib.request = urllib2 + +# Parse the command line +parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter, description=textwrap.dedent('''\ + repopick.py is a utility to simplify the process of cherry picking + patches from OmniROM's Gerrit instance. + + Given a list of change numbers, repopick will cd into the project path + and cherry pick the latest patch available. + + With the --start-branch argument, the user can specify that a branch + should be created before cherry picking. This is useful for + cherry-picking many patches into a common branch which can be easily + abandoned later (good for testing other's changes.) + + The --abandon-first argument, when used in conjuction with the + --start-branch option, will cause repopick to abandon the specified + branch in all repos first before performing any cherry picks.''')) +parser.add_argument('change_number', nargs='+', help='change number to cherry pick') +parser.add_argument('-i', '--ignore-missing', action='store_true', help='do not error out if a patch applies to a missing directory') +parser.add_argument('-s', '--start-branch', nargs=1, help='start the specified branch before cherry picking') +parser.add_argument('-a', '--abandon-first', action='store_true', help='before cherry picking, abandon the branch specified in --start-branch') +parser.add_argument('-b', '--auto-branch', action='store_true', help='shortcut to "--start-branch auto --abandon-first --ignore-missing"') +parser.add_argument('-q', '--quiet', action='store_true', help='print as little as possible') +parser.add_argument('-v', '--verbose', action='store_true', help='print extra information to aid in debug') +args = parser.parse_args() +if args.start_branch == None and args.abandon_first: + parser.error('if --abandon-first is set, you must also give the branch name with --start-branch') +if args.auto_branch: + args.abandon_first = True + args.ignore_missing = True + if not args.start_branch: + args.start_branch = ['auto'] +if args.quiet and args.verbose: + parser.error('--quiet and --verbose cannot be specified together') + +# Helper function to determine whether a path is an executable file +def is_exe(fpath): + return os.path.isfile(fpath) and os.access(fpath, os.X_OK) + +# Implementation of Unix 'which' in Python +# +# From: http://stackoverflow.com/questions/377017/test-if-executable-exists-in-python +def which(program): + fpath, fname = os.path.split(program) + if fpath: + if is_exe(program): + return program + else: + for path in os.environ["PATH"].split(os.pathsep): + path = path.strip('"') + exe_file = os.path.join(path, program) + if is_exe(exe_file): + return exe_file + sys.stderr.write('ERROR: Could not find the %s program in $PATH\n' % program) + sys.exit(1) + +# Simple wrapper for os.system() that: +# - exits on error +# - prints out the command if --verbose +# - suppresses all output if --quiet +def execute_cmd(cmd, exit_on_fail=True): + if args.verbose: + print('Executing: %s' % cmd) + if args.quiet: + cmd = cmd.replace(' && ', ' &> /dev/null && ') + cmd = cmd + " &> /dev/null" + ret = os.system(cmd) + if ret and exit_on_fail: + if not args.verbose: + sys.stderr.write('\nERROR: Command that failed:\n%s' % cmd) + sys.exit(1) + +# Verifies whether pathA is a subdirectory (or the same) as pathB +def is_pathA_subdir_of_pathB(pathA, pathB): + pathA = os.path.realpath(pathA) + '/' + pathB = os.path.realpath(pathB) + '/' + return(pathB == pathA[:len(pathB)]) + +# Find the necessary bins - repo +repo_bin = which('repo') + +# Find the necessary bins - git +git_bin = which('git') + +# Change current directory to the top of the tree +if os.environ.get('ANDROID_BUILD_TOP', None): + top = os.environ['ANDROID_BUILD_TOP'] + if not is_pathA_subdir_of_pathB(os.getcwd(), top): + sys.stderr.write('ERROR: You must run this tool from within $ANDROID_BUILD_TOP!\n') + sys.exit(1) + os.chdir(os.environ['ANDROID_BUILD_TOP']) +else: + sys.stderr.write('ERROR: $ANDROID_BUILD_TOP is not defined. please check build/envsetup.sh\n') + sys.exit(1) + +# Sanity check that we are being run from the top level of the tree +if not os.path.isdir('.repo'): + sys.stderr.write('ERROR: No .repo directory found. Please run this from the top of your tree.\n') + sys.exit(1) + +# If --abandon-first is given, abandon the branch before starting +if args.abandon_first: + # Determine if the branch already exists; skip the abandon if it does not + plist = subprocess.Popen([repo_bin,"info"], stdout=subprocess.PIPE) + needs_abandon = False + while(True): + pline = plist.stdout.readline().rstrip() + if not pline: + break + matchObj = re.match(r'Local Branches.*\[(.*)\]', pline.decode()) + if matchObj: + local_branches = re.split('\s*,\s*', matchObj.group(1)) + if any(args.start_branch[0] in s for s in local_branches): + needs_abandon = True + + if needs_abandon: + # Perform the abandon only if the branch already exists + if not args.quiet: + print('Abandoning branch: %s' % args.start_branch[0]) + cmd = '%s abandon %s' % (repo_bin, args.start_branch[0]) + execute_cmd(cmd) + if not args.quiet: + print('') + +# Get the list of projects that repo knows about +# - convert the project name to a project path +project_name_to_path = {} +plist = subprocess.Popen([repo_bin,"list"], stdout=subprocess.PIPE) +project_path = None +while(True): + pline = plist.stdout.readline().rstrip() + if not pline: + break + ppaths = re.split('\s*:\s*', pline.decode()) + project_name_to_path[ppaths[1]] = ppaths[0] + +# Iterate through the requested change numbers +for change in args.change_number: + if not args.quiet: + print('Applying change number %s ...' % change) + + # Fetch information about the change from Gerrit's REST API + # + # gerrit returns two lines, a magic string and then valid JSON: + # )]}' + # [ ... valid JSON ... ] + url = 'https://gerrit.omnirom.org/changes/?q=%s&o=CURRENT_REVISION&o=CURRENT_COMMIT&pp=0' % change + if args.verbose: + print('Fetching from: %s\n' % url) + f = urllib.request.urlopen(url) + d = f.read().decode("utf-8") + if args.verbose: + print('Result from request:\n' + d) + + # Clean up the result + d = d.split('\n')[1] + matchObj = re.match(r'\[\s*\]', d) + if matchObj: + sys.stderr.write('ERROR: Change number %s was not found on the server\n' % change) + sys.exit(1) + d = re.sub(r'\[(.*)\]', r'\1', d) + + # Parse the JSON + try: + data = json.loads(d) + except ValueError: + sys.stderr.write('ERROR: The response from the server could not be parsed properly\n') + if args.verbose: + sys.stderr.write('The malformed response was: %s\n' % d) + sys.exit(1) + + # Extract information from the JSON response + date_fluff = '.000000000' + project_name = data['project'] + change_number = data['_number'] + current_revision = data['revisions'][data['current_revision']] + patch_number = current_revision['_number'] + fetch_url = current_revision['fetch']['http']['url'] + fetch_ref = current_revision['fetch']['http']['ref'] + author_name = current_revision['commit']['author']['name'] + author_email = current_revision['commit']['author']['email'] + author_date = current_revision['commit']['author']['date'].replace(date_fluff, '') + committer_name = current_revision['commit']['committer']['name'] + committer_email = current_revision['commit']['committer']['email'] + committer_date = current_revision['commit']['committer']['date'].replace(date_fluff, '') + subject = current_revision['commit']['subject'] + + # Convert the project name to a project path + # - check that the project path exists + if project_name in project_name_to_path: + project_path = project_name_to_path[project_name]; + elif args.ignore_missing: + print('WARNING: Skipping %d since there is no project directory for: %s\n' % (change_number, project_name)) + continue; + else: + sys.stderr.write('ERROR: For %d, could not determine the project path for project %s\n' % (change_number, project_name)) + sys.exit(1) + + # If --start-branch is given, create the branch (more than once per path is okay; repo ignores gracefully) + if args.start_branch: + cmd = '%s start %s %s' % (repo_bin, args.start_branch[0], project_path) + execute_cmd(cmd) + + # Print out some useful info + if not args.quiet: + print('--> Subject: "%s"' % subject) + print('--> Project path: %s' % project_path) + print('--> Change number: %d (Patch Set %d)' % (change_number, patch_number)) + print('--> Author: %s <%s> %s' % (author_name, author_email, author_date)) + print('--> Committer: %s <%s> %s' % (committer_name, committer_email, committer_date)) + + if args.verbose: + print('Trying to fetch the change from Gerrit') + cmd = 'cd %s && git fetch %s %s' % (project_path, fetch_url, fetch_ref) + execute_cmd(cmd) + # Check if it worked + FETCH_HEAD = '%s/.git/FETCH_HEAD' % project_path + if os.stat(FETCH_HEAD).st_size == 0: + # That didn't work, print error and exit + sys.stderr.write('ERROR: Fetching change from Gerrit failed. Exiting...') + sys.exit(1); + # Perform the cherry-pick + cmd = 'cd %s && git cherry-pick FETCH_HEAD' % (project_path) + execute_cmd(cmd) + if not args.quiet: + print('') From daefe42d1bf684e22bd7812fe361464141339b9d Mon Sep 17 00:00:00 2001 From: OmniBot Auto Verifier Date: Wed, 16 Oct 2013 13:24:22 +0200 Subject: [PATCH 043/837] repopick: Add a way to checkout instead of cherrypick This helps if you want to take a commit and its dependencies, and not just a particular commit Change-Id: Ib245cce560c7b0d6fd03198a8c69a13d4720a4cb --- tools/repopick.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/repopick.py b/tools/repopick.py index f1bb4d6a88b..304373e5b5f 100755 --- a/tools/repopick.py +++ b/tools/repopick.py @@ -57,6 +57,7 @@ branch in all repos first before performing any cherry picks.''')) parser.add_argument('change_number', nargs='+', help='change number to cherry pick') parser.add_argument('-i', '--ignore-missing', action='store_true', help='do not error out if a patch applies to a missing directory') +parser.add_argument('-c', '--checkout', action='store_true', help='checkout instead of cherry pick') parser.add_argument('-s', '--start-branch', nargs=1, help='start the specified branch before cherry picking') parser.add_argument('-a', '--abandon-first', action='store_true', help='before cherry picking, abandon the branch specified in --start-branch') parser.add_argument('-b', '--auto-branch', action='store_true', help='shortcut to "--start-branch auto --abandon-first --ignore-missing"') @@ -259,8 +260,12 @@ def is_pathA_subdir_of_pathB(pathA, pathB): # That didn't work, print error and exit sys.stderr.write('ERROR: Fetching change from Gerrit failed. Exiting...') sys.exit(1); - # Perform the cherry-pick - cmd = 'cd %s && git cherry-pick FETCH_HEAD' % (project_path) + # Perform the cherry-pick or checkout + if args.checkout: + cmd = 'cd %s && git checkout FETCH_HEAD' % (project_path) + else: + cmd = 'cd %s && git cherry-pick FETCH_HEAD' % (project_path) + execute_cmd(cmd) if not args.quiet: print('') From 0de2f69e2af5fb0b5d6bb57f13914349cb5a24c1 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sat, 26 Jun 2010 22:53:55 -0700 Subject: [PATCH 044/837] add support for overriding build.prop settings. Change-Id: Ie4224d608b7bcb0c2087bd77bc954f8f5f9b6495 --- core/Makefile | 1 + core/product.mk | 1 + core/product_config.mk | 3 +++ 3 files changed, 5 insertions(+) diff --git a/core/Makefile b/core/Makefile index 6db9ff7c219..fff5eafafc9 100644 --- a/core/Makefile +++ b/core/Makefile @@ -190,6 +190,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \ TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \ TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \ + $(PRODUCT_BUILD_PROP_OVERRIDES) \ bash $(BUILDINFO_SH) > $@ $(hide) $(foreach file,$(system_prop_file), \ if [ -f "$(file)" ]; then \ diff --git a/core/product.mk b/core/product.mk index a2f4abc48a5..d201efa4ed3 100644 --- a/core/product.mk +++ b/core/product.mk @@ -65,6 +65,7 @@ endef # _product_var_list := \ + PRODUCT_BUILD_PROP_OVERRIDES \ PRODUCT_NAME \ PRODUCT_MODEL \ PRODUCT_LOCALES \ diff --git a/core/product_config.mk b/core/product_config.mk index e4b68cff398..491b2adb53d 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -364,6 +364,9 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEFAULT_PROPERTY_OVERRIDES)) +PRODUCT_BUILD_PROP_OVERRIDES := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BUILD_PROP_OVERRIDES)) + # Should we use the default resources or add any product specific overlays PRODUCT_PACKAGE_OVERLAYS := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGE_OVERLAYS)) From 7d5334e37bc303bc4a32ac20b5154e4d29b5c671 Mon Sep 17 00:00:00 2001 From: xplodwild Date: Thu, 17 Oct 2013 17:35:40 +0100 Subject: [PATCH 045/837] brunch: custom->omni Change-Id: I5482c765a7c78d6caae371d6fabb8f55e10ac655 --- envsetup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index 3c174dfbd68..9ffb62dd7ed 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -59,8 +59,8 @@ function check_product() return fi - if (echo -n $1 | grep -q -e "^custom_") ; then - CUSTOM_BUILD=$(echo -n $1 | sed -e 's/^custom_//g') + if (echo -n $1 | grep -q -e "^omni_") ; then + CUSTOM_BUILD=$(echo -n $1 | sed -e 's/^omni_//g') else CUSTOM_BUILD= fi @@ -494,7 +494,7 @@ function breakfast() lunch $target else # This is probably just the custom model name - lunch custom_$target-userdebug + lunch omni_$target-userdebug fi fi return $? From f0d7f5433b76e3d79392d65787aed83a99db2b5f Mon Sep 17 00:00:00 2001 From: Anurag Gupta Date: Fri, 13 Sep 2013 19:00:26 +0000 Subject: [PATCH 046/837] FM Radio: Add support for FM Radio in Android Creating interface and framework for using FM Radio RX and TX from different vendors. Change-Id: I1a71aed01bfffdddfabf1cdfbfa3707cb1ed016b Signed-off-by: Benn Porscke Conflicts: core/pathmap.mk target/product/core.mk --- core/pathmap.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/pathmap.mk b/core/pathmap.mk index 5dfc543756f..754da2b6cf6 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -90,6 +90,7 @@ FRAMEWORKS_BASE_SUBDIRS := \ telephony \ wifi \ keystore \ + fmradio \ ) # From 27e819cd6b6c44cbb86a0dc2bd3d735ad5dc09e7 Mon Sep 17 00:00:00 2001 From: David Ferguson Date: Thu, 4 Oct 2012 10:15:58 -0400 Subject: [PATCH 047/837] build: work around missing readlink -f on Mac Change-Id: I5d56366cf33a2b02f1886c87815d00cff279779d --- core/envsetup.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index 96bbe568b7b..90ddb3250fc 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -142,7 +142,7 @@ ifeq (,$(strip $(OUT_DIR_COMMON_BASE))) ifneq ($(TOPDIR),) OUT_DIR := $(TOPDIR)out else -OUT_DIR := $(shell readlink -f .)/out +OUT_DIR := $(shell python -c 'import os,sys; print os.path.realpath(sys.argv[1])' .)/out endif else OUT_DIR := $(OUT_DIR_COMMON_BASE)/$(notdir $(PWD)) From 2430830dbd2fe0065f2f53566b71caebde75a455 Mon Sep 17 00:00:00 2001 From: Dominik Marszk Date: Fri, 18 Oct 2013 19:38:18 +0100 Subject: [PATCH 048/837] build: Rename ota packages from custom to omni. Change-Id: Idc344f404244cca466770f884dee361f38ea2ebe --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index fff5eafafc9..eb2ea46258b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1363,7 +1363,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) --override_device=$(override_device) \ $(BUILT_TARGET_FILES_PACKAGE) $@ -CUSTOM_TARGET_PACKAGE := $(PRODUCT_OUT)/custom-$(ROM_VERSION).zip +CUSTOM_TARGET_PACKAGE := $(PRODUCT_OUT)/omni-$(ROM_VERSION).zip .PHONY: otapackage bacon otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) From 9f8e200cf08ca01d95955e644c530892e3517542 Mon Sep 17 00:00:00 2001 From: Lalit Maganti Date: Sat, 19 Oct 2013 19:19:42 +0200 Subject: [PATCH 049/837] build: change custom -> omni in a few more places * these weren't changed when the transtition occured - fix them now Change-Id: I47bedb96ad63a41959baa98e1a265cb616d17918 --- core/tasks/kernel.mk | 2 +- envsetup.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index 00a1e2e53f5..cad4fcca9ef 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -14,7 +14,7 @@ # Android makefile to build kernel as a part of Android Build --include vendor/custom/config/branding.mk +-include vendor/omni/config/branding.mk TARGET_AUTO_KDIR := $(shell echo $(TARGET_DEVICE_DIR) | sed -e 's/^device/kernel/g') diff --git a/envsetup.sh b/envsetup.sh index 9ffb62dd7ed..e3f4c4edd94 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -477,7 +477,7 @@ function breakfast() CUSTOM_DEVICES_ONLY="true" unset LUNCH_MENU_CHOICES add_lunch_combo full-eng - for f in `/bin/ls vendor/custom/vendorsetup.sh 2> /dev/null` + for f in `/bin/ls vendor/omni/vendorsetup.sh 2> /dev/null` do echo "including $f" . $f @@ -493,7 +493,7 @@ function breakfast() # A buildtype was specified, assume a full device name lunch $target else - # This is probably just the custom model name + # This is probably just the omni model name lunch omni_$target-userdebug fi fi From 116fb5bcd54383fcb1818d3d10dbc81892f18341 Mon Sep 17 00:00:00 2001 From: Yajnavalkya Bandyopadhyay Date: Sat, 19 Nov 2011 16:02:04 -0700 Subject: [PATCH 050/837] releasetools: support more partitions and different fstab types * add BML support for Samsung legacy devices * add ext2, ext3 and vfat, f2fs support for EMMC * fix recovery.fstab for ADV recovery Change-Id: I6b76d2a21fe68096cf1b0cd850cdfb3a313370d1 --- tools/releasetools/common.py | 15 +++++++++++---- tools/releasetools/edify_generator.py | 5 +++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index aefc1f9c3a8..e06b52ee81a 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -187,7 +187,7 @@ class Partition(object): line = line.strip() if not line or line.startswith("#"): continue pieces = line.split() - if not (3 <= len(pieces) <= 4): + if not (3 <= len(pieces) <= 7): raise ValueError("malformed recovery.fstab line: \"%s\"" % (line,)) p = Partition() @@ -196,7 +196,7 @@ class Partition(object): p.device = pieces[2] p.length = 0 options = None - if len(pieces) >= 4: + if len(pieces) >= 4 and pieces[3] != 'NULL': if pieces[3].startswith("/"): p.device2 = pieces[3] if len(pieces) >= 5: @@ -951,8 +951,15 @@ def worker(): # map recovery.fstab's fs_types to mount/format "partition types" -PARTITION_TYPES = { "yaffs2": "MTD", "mtd": "MTD", - "ext4": "EMMC", "emmc": "EMMC" } +PARTITION_TYPES = { "bml": "BML", + "ext2": "EMMC", + "ext3": "EMMC", + "ext4": "EMMC", + "emmc": "EMMC", + "mtd": "MTD", + "f2fs": "EMMC", + "yaffs2": "MTD", + "vfat": "EMMC" } def GetTypeAndDevice(mount_point, info): fstab = info["fstab"] diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index 46ebc2d2fd1..ffc6e9c0780 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -230,6 +230,11 @@ def WriteRawImage(self, mount_point, fn): elif partition_type == "EMMC": self.script.append( 'package_extract_file("%(fn)s", "%(device)s");' % args) + elif partition_type == "BML": + self.script.append( + ('assert(package_extract_file("%(fn)s", "/tmp/%(device)s.img"),\n' + ' write_raw_image("/tmp/%(device)s.img", "%(device)s"),\n' + ' delete("/tmp/%(device)s.img"));') % args) else: raise ValueError("don't know how to write \"%s\" partitions" % (p.fs_type,)) From 324aa6fe9ce13ea6c2ade4951cba621ab9ee69b3 Mon Sep 17 00:00:00 2001 From: myfluxi Date: Sat, 19 Oct 2013 22:05:27 +0200 Subject: [PATCH 051/837] build: Build with colors Based on tpruvot/chirayudesai's commits, add some color to stdout and but make it a little easier to customize. Colors are now mapped to categories and can be edited in Makefile if you or your terminal's background color do not like them. Defaults: host stuff: yellow target stuff: cyan install/copy: green filesystem/images: green imports/exports/includes/notices: green deletes: red complete msg: bold green Coloring can be disabled with "export BUILD_WITH_COLORS=0" Change-Id: Idcfe9bbf925759f88425f914269855da05c5eef0 --- core/Makefile | 84 ++++++++++++++++++++++--------- core/base_rules.mk | 8 +-- core/binary.mk | 4 +- core/cleanbuild.mk | 4 +- core/definitions.mk | 64 +++++++++++------------ core/dex_preopt.mk | 2 +- core/distdir.mk | 2 +- core/droiddoc.mk | 6 +-- core/dynamic_binary.mk | 8 +-- core/host_java_library.mk | 4 +- core/java.mk | 12 ++--- core/java_library.mk | 6 +-- core/main.mk | 6 +-- core/notice_files.mk | 2 +- core/package.mk | 6 +-- core/pdk_config.mk | 2 +- core/raw_executable.mk | 2 +- core/static_java_library.mk | 2 +- core/tasks/apicheck.mk | 2 +- core/tasks/collect_gpl_sources.mk | 2 +- core/tasks/product-graph.mk | 2 +- core/tasks/sdk-addon.mk | 2 +- tools/apicheck/Android.mk | 2 +- 23 files changed, 136 insertions(+), 98 deletions(-) diff --git a/core/Makefile b/core/Makefile index eb2ea46258b..60e0da5f49f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1,5 +1,43 @@ # Put some miscellaneous rules here +# Build system colors + +ifneq ($(BUILD_WITH_COLORS),0) +# Define colors + CL_RST="\033[0m" + CL_BLK="\033[30m" + CL_RED="\033[31m" + CL_GRN="\033[32m" + CL_YLW="\033[33m" + CL_BLU="\033[34m" + CL_MAG="\033[35m" + CL_CYN="\033[36m" + CL_WHT="\033[37m" + CL_BLD_BLK="\033[1m\033[30m" + CL_BLD_RED="\033[1m\033[31m" + CL_BLD_GRN="\033[1m\033[32m" + CL_BLD_YLW="\033[1m\033[33m" + CL_BLD_BLU="\033[1m\033[34m" + CL_BLD_MAG="\033[1m\033[35m" + CL_BLD_CYN="\033[1m\033[36m" + CL_BLD_WHT="\033[1m\033[37m" +# Map colors + # host + PRT_HST := $(CL_YLW) + # target + PRT_TGT := $(CL_CYN) + # install/copy + PRT_INS := $(CL_GRN) + # FS/images + PRT_IMG := $(CL_GRN) + # import/export/includes/notice + PRT_IMP := $(CL_GRN) + # delete + PRT_DEL := $(CL_RED) + # complete msg + PRT_CPL := $(CL_BLD_GRN) +endif + # Pick a reasonable string to use to identify files. ifneq "" "$(filter eng.%,$(BUILD_NUMBER))" # BUILD_NUMBER has a timestamp in it, which means that @@ -549,7 +587,7 @@ endif # TARGET_BUILD_APPS $(kernel_notice_file): \ prebuilts/qemu-kernel/arm/LINUX_KERNEL_COPYING \ | $(ACP) - @echo Copying: $@ + @echo -e ${PRT_INS}"Copying:"${CL_RST}" $@" $(hide) mkdir -p $(dir $@) $(hide) $(ACP) $< $@ @@ -706,7 +744,7 @@ DUMPKEY_JAR := $(HOST_OUT_JAVA_LIBRARIES)/dumpkey.jar $(RECOVERY_INSTALL_OTA_KEYS): PRIVATE_OTA_PUBLIC_KEYS := $(OTA_PUBLIC_KEYS) $(RECOVERY_INSTALL_OTA_KEYS): extra_keys := $(patsubst %,%.x509.pem,$(PRODUCT_EXTRA_RECOVERY_KEYS)) $(RECOVERY_INSTALL_OTA_KEYS): $(OTA_PUBLIC_KEYS) $(DUMPKEY_JAR) $(extra_keys) - @echo "DumpPublicKey: $@ <= $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys)" + @echo -e ${PRT_INS}"DumpPublicKey: $@ <= $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys)"${CL_RST} @rm -rf $@ @mkdir -p $(dir $@) java -jar $(DUMPKEY_JAR) $(PRIVATE_OTA_PUBLIC_KEYS) $(extra_keys) > $@ @@ -722,12 +760,12 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ $(recovery_build_prop) $(recovery_resource_deps) \ $(recovery_fstab) \ $(RECOVERY_INSTALL_OTA_KEYS) - @echo ----- Making recovery filesystem ------ + @echo -e ${PRT_IMG}"----- Making recovery filesystem ------"${CL_RST} $(hide) mkdir -p $(TARGET_RECOVERY_OUT) $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/tmp - @echo Copying baseline ramdisk... + @echo -e ${PRT_IMG}"Copying baseline ramdisk..."${CL_RST} $(hide) cp -R $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) - @echo Modifying ramdisk contents... + @echo -e ${PRT_IMG}"Modifying ramdisk contents..."${CL_RST} $(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc $(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/ @@ -744,27 +782,27 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ $(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys $(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \ > $(TARGET_RECOVERY_ROOT_OUT)/default.prop - @echo ----- Made recovery filesystem -------- $(TARGET_RECOVERY_ROOT_OUT) + @echo -e ${PRT_IMG}"----- Made recovery filesystem -------- $(TARGET_RECOVERY_ROOT_OUT)"${CL_RST} @touch $(TARGET_RECOVERY_ROOT_TIMESTAMP) $(recovery_uncompressed_ramdisk): $(MINIGZIP) \ $(TARGET_RECOVERY_ROOT_TIMESTAMP) - @echo ----- Making uncompressed recovery ramdisk ------ + @echo -e ${PRT_IMG}"----- Making uncompressed recovery ramdisk ------"${CL_RST} $(MKBOOTFS) $(TARGET_RECOVERY_ROOT_OUT) > $@ $(recovery_ramdisk): $(MKBOOTFS) \ $(recovery_uncompressed_ramdisk) - @echo ----- Making recovery ramdisk ------ + @echo -e ${PRT_IMG}"----- Making recovery ramdisk ------"${CL_RST} $(MINIGZIP) < $(recovery_uncompressed_ramdisk) > $@ ifndef BOARD_CUSTOM_BOOTIMG_MK $(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) \ $(recovery_ramdisk) \ $(recovery_kernel) - @echo ----- Making recovery image ------ + @echo -e ${PRT_IMG}"----- Making recovery image ------"${CL_RST} $(hide) $(MKBOOTIMG) $(INTERNAL_RECOVERYIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@ $(hide) $(call assert-max-image-size,$@,$(BOARD_RECOVERYIMAGE_PARTITION_SIZE),raw) - @echo ----- Made recovery image: $@ -------- + @echo -e ${PRT_IMG}"----- Made recovery image: $@ --------"${CL_RST} endif $(RECOVERY_RESOURCE_ZIP): $(INSTALLED_RECOVERYIMAGE_TARGET) @@ -845,7 +883,7 @@ BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img # $(1): output file define build-systemimage-target - @echo "Target system fs image: $(1)" + @echo -e ${PRT_IMG}"Target system fs image: $(1)"${CL_RST} @mkdir -p $(dir $(1)) $(systemimage_intermediates) && rm -rf $(systemimage_intermediates)/system_image_info.txt $(call generate-userimage-prop-dictionary, $(systemimage_intermediates)/system_image_info.txt, skip_fsck=true) $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \ @@ -875,14 +913,14 @@ $(RECOVERY_FROM_BOOT_PATCH): $(INSTALLED_RECOVERYIMAGE_TARGET) \ $(INSTALLED_BOOTIMAGE_TARGET) \ $(HOST_OUT_EXECUTABLES)/imgdiff \ $(HOST_OUT_EXECUTABLES)/bsdiff - @echo "Construct recovery from boot" + @echo -e ${PRT_IMG}"Construct recovery from boot"${CL_RST} mkdir -p $(dir $@) PATH=$(HOST_OUT_EXECUTABLES):$$PATH $(HOST_OUT_EXECUTABLES)/imgdiff $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_RECOVERYIMAGE_TARGET) $@ endif $(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) | $(ACP) - @echo "Install system fs image: $@" + @echo -e ${PRT_IMG}"Install system fs image: $@"${CL_RST} $(copy-file-to-target) $(hide) $(call assert-max-image-size,$@ $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE),yaffs) @@ -891,7 +929,7 @@ systemimage: $(INSTALLED_SYSTEMIMAGE) .PHONY: systemimage-nodeps snod systemimage-nodeps snod: $(filter-out systemimage-nodeps snod,$(MAKECMDGOALS)) \ | $(INTERNAL_USERIMAGES_DEPS) - @echo "make $@: ignoring dependencies" + @echo -e ${PRT_IMG}"make $@: ignoring dependencies"${CL_RST} $(call build-systemimage-target,$(INSTALLED_SYSTEMIMAGE)) $(hide) $(call assert-max-image-size,$(INSTALLED_SYSTEMIMAGE),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE),yaffs) @@ -1220,7 +1258,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ $(APKCERTS_FILE) \ $(HOST_OUT_EXECUTABLES)/fs_config \ | $(ACP) - @echo "Package target files: $@" + @echo -e ${PRT_HST}"Package target files: $@"${CL_RST} $(hide) rm -rf $@ $(zip_root) $(hide) mkdir -p $(dir $@) $(zip_root) @# Components of the recovery image @@ -1354,7 +1392,7 @@ else endif $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) - @echo "Package OTA: $@" + @echo -e ${PRT_HST}"Package OTA: $@"${CL_RST} MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \ $(OTA_FROM_TARGET_SCRIPT) -v \ -p $(HOST_OUT) \ @@ -1370,7 +1408,7 @@ otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) bacon: otapackage $(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(CUSTOM_TARGET_PACKAGE) $(hide) $(MD5SUM) $(CUSTOM_TARGET_PACKAGE) > $(CUSTOM_TARGET_PACKAGE).md5sum - @echo -e "Package complete: $(CUSTOM_TARGET_PACKAGE)" + @echo -e ${PRT_CPL}"Package complete: $(CUSTOM_TARGET_PACKAGE)"${CL_RST} # ----------------------------------------------------------------- # The update package @@ -1397,7 +1435,7 @@ else endif $(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) - @echo "Package: $@" + @echo -e ${PRT_HST}"Package:"${CL_RST}" $@" MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \ $(IMG_FROM_TARGET_SCRIPT) -v \ -s $(extensions) \ @@ -1435,7 +1473,7 @@ $(BUILT_TESTS_ZIP_PACKAGE): zip_root := $(intermediates)/$(name) $(BUILT_TESTS_ZIP_PACKAGE): \ $(INTERNAL_USERDATAIMAGE_FILES) \ | $(ACP) - @echo "Package test files: $@" + @echo -e ${PRT_HST}"Package test files:"${CL_RST} $@" $(hide) rm -rf $@ $(zip_root) $(hide) mkdir -p $(dir $@) $(zip_root) @# Contents of the data image @@ -1480,7 +1518,7 @@ name := $(name)-apps-$(FILE_NAME_TAG) APPS_ZIP := $(PRODUCT_OUT)/$(name).zip $(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE) - @echo "Package apps: $@" + @echo -e ${PRT_HST}"Package apps:"${CL_RST}" $@" $(hide) rm -rf $@ $(hide) mkdir -p $(dir $@) $(hide) zip -qj $@ $(TARGET_OUT_APPS)/* @@ -1494,7 +1532,7 @@ ifeq (true,$(EMMA_INSTRUMENT)) EMMA_META_ZIP := $(PRODUCT_OUT)/emma_meta.zip # the dependency will be set up later in build/core/main.mk. $(EMMA_META_ZIP) : - @echo "Collecting Emma coverage meta files." + @echo -e ${PRT_HST}"Collecting Emma coverage meta files."${CL_RST}" $@" $(hide) find $(TARGET_COMMON_OUT_ROOT) -name "coverage.em" | \ zip -@ -q $@ @@ -1541,7 +1579,7 @@ name := $(TARGET_PRODUCT)-emulator-$(FILE_NAME_TAG) INTERNAL_EMULATOR_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip $(INTERNAL_EMULATOR_PACKAGE_TARGET): $(INTERNAL_EMULATOR_PACKAGE_FILES) - @echo "Package: $@" + @echo -e ${PRT_HST}"Package:"${CL_RST}" $@" $(hide) zip -qj $@ $(INTERNAL_EMULATOR_PACKAGE_FILES) endif @@ -1653,7 +1691,7 @@ $(INTERNAL_SDK_TARGET): PRIVATE_INPUT_FILES := $(sdk_atree_files) #SDK_GNU_ERROR := true $(INTERNAL_SDK_TARGET): $(deps) - @echo "Package SDK: $@" + @echo -e ${PRT_HST}"Package SDK:"${CL_RST}" $@" $(hide) rm -rf $(PRIVATE_DIR) $@ $(hide) for f in $(target_gnu_MODULES); do \ if [ -f $$f ]; then \ diff --git a/core/base_rules.mk b/core/base_rules.mk index 36f36c19100..745a43b94c5 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -466,7 +466,7 @@ $(cleantarget) : PRIVATE_CLEAN_FILES := \ $(LOCAL_INSTALLED_MODULE) \ $(intermediates) $(cleantarget):: - @echo "Clean: $(PRIVATE_MODULE)" + @echo -e ${PRT_TGT}"Clean:"${CL_RST}" $(PRIVATE_MODULE)" $(hide) rm -rf $(PRIVATE_CLEAN_FILES) ########################################################### @@ -526,12 +526,12 @@ ifndef LOCAL_UNINSTALLABLE_MODULE $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD) ifneq ($(LOCAL_ACP_UNAVAILABLE),true) $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) | $(ACP) - @echo "Install: $@" + @echo -e ${PRT_INS}"Install: $@"${CL_RST} $(copy-file-to-new-target) $(PRIVATE_POST_INSTALL_CMD) else $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) - @echo "Install: $@" + @echo -e ${PRT_INSPRT_INSPRT_INSPRT_INSPRT_INSPRT_INSPRT_INSPRT_INSPRT_INSPRT_INS}"Install: $@"${CL_RST} $(copy-file-to-target-with-cp) endif @@ -539,7 +539,7 @@ ifdef LOCAL_DEX_PREOPT installed_odex := $(basename $(LOCAL_INSTALLED_MODULE)).odex built_odex := $(basename $(LOCAL_BUILT_MODULE)).odex $(installed_odex) : $(built_odex) $(LOCAL_BUILT_MODULE) | $(ACP) - @echo "Install: $@" + @echo -e ${PRT_INS}"Install: $@"${CL_RST} $(copy-file-to-target) $(LOCAL_INSTALLED_MODULE) : $(installed_odex) diff --git a/core/binary.mk b/core/binary.mk index e488e659c7d..3f5aa646b83 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -586,7 +586,7 @@ import_includes_deps := $(strip \ $(foreach l, $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES), \ $(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE))/export_includes)) $(import_includes) : $(import_includes_deps) - @echo Import includes file: $@ + @echo -e ${PRT_IMP}Import includes file:${CL_RST} $@ $(hide) mkdir -p $(dir $@) && rm -f $@ ifdef import_includes_deps $(hide) for f in $^; do \ @@ -766,7 +766,7 @@ $(LOCAL_INSTALLED_MODULE): | $(installed_static_library_notice_file_targets) export_includes := $(intermediates)/export_includes $(export_includes): PRIVATE_EXPORT_C_INCLUDE_DIRS := $(LOCAL_EXPORT_C_INCLUDE_DIRS) $(export_includes) : $(LOCAL_MODULE_MAKEFILE) - @echo Export includes file: $< -- $@ + @echo -e ${PRT_IMP}Export includes file:${CL_RST} $< -- $@ $(hide) mkdir -p $(dir $@) && rm -f $@ ifdef LOCAL_EXPORT_C_INCLUDE_DIRS $(hide) for d in $(PRIVATE_EXPORT_C_INCLUDE_DIRS); do \ diff --git a/core/cleanbuild.mk b/core/cleanbuild.mk index fa673320c92..841a219f10c 100644 --- a/core/cleanbuild.mk +++ b/core/cleanbuild.mk @@ -216,13 +216,13 @@ endif dataclean: FILES := $(dataclean_files) dataclean: $(hide) rm -rf $(FILES) - @echo "Deleted emulator userdata images." + @echo -e ${PRT_DEL}"Deleted emulator userdata images."${CL_RST} .PHONY: installclean installclean: FILES := $(installclean_files) installclean: dataclean $(hide) rm -rf $(FILES) - @echo "Deleted images and staging directories." + @echo -e ${PRT_DEL}"Deleted images and staging directories."${CL_RST} ifeq "$(force_installclean)" "true" $(info *** Forcing "make installclean"...) diff --git a/core/definitions.mk b/core/definitions.mk index 290bb2f4517..a96b11255d4 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -918,7 +918,7 @@ endef define transform-cpp-to-o @mkdir -p $(dir $@) -@echo "target $(PRIVATE_ARM_MODE) C++: $(PRIVATE_MODULE) <= $<" +@echo -e ${PRT_TGT}"target $(PRIVATE_ARM_MODE) C++:"${CL_RST}" $(PRIVATE_MODULE) <= $<" $(hide) $(PRIVATE_CXX) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \ $(shell cat $(PRIVATE_IMPORT_INCLUDES)) \ @@ -967,12 +967,12 @@ $(hide) $(PRIVATE_CC) \ endef define transform-c-to-o-no-deps -@echo "target $(PRIVATE_ARM_MODE) C: $(PRIVATE_MODULE) <= $<" +@echo -e ${PRT_TGT}"target $(PRIVATE_ARM_MODE) C:"${CL_RST}" $(PRIVATE_MODULE) <= $<" $(call transform-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_CONLYFLAGS) $(PRIVATE_DEBUG_CFLAGS)) endef define transform-s-to-o-no-deps -@echo "target asm: $(PRIVATE_MODULE) <= $<" +@echo -e ${PRT_TGT}"target asm:"${CL_RST}" $(PRIVATE_MODULE) <= $<" $(call transform-c-or-s-to-o-no-deps, $(PRIVATE_ASFLAGS)) endef @@ -993,7 +993,7 @@ endef ########################################################### define transform-m-to-o-no-deps -@echo "target ObjC: $(PRIVATE_MODULE) <= $<" +@echo -e ${PRT_TGT}"target ObjC:"${CL_RST}" $(PRIVATE_MODULE) <= $<" $(call transform-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_DEBUG_CFLAGS)) endef @@ -1008,7 +1008,7 @@ endef define transform-host-cpp-to-o @mkdir -p $(dir $@) -@echo "host C++: $(PRIVATE_MODULE) <= $<" +@echo -e ${PRT_HST}"host C++:"${CL_RST}" $(PRIVATE_MODULE) <= $<" $(hide) $(PRIVATE_CXX) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \ $(shell cat $(PRIVATE_IMPORT_INCLUDES)) \ @@ -1054,12 +1054,12 @@ $(hide) $(PRIVATE_CC) \ endef define transform-host-c-to-o-no-deps -@echo "host C: $(PRIVATE_MODULE) <= $<" +@echo -e ${PRT_HST}"host C:"${CL_RST}" $(PRIVATE_MODULE) <= $<" $(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_CONLYFLAGS) $(PRIVATE_DEBUG_CFLAGS)) endef define transform-host-s-to-o-no-deps -@echo "host asm: $(PRIVATE_MODULE) <= $<" +@echo -e ${PRT_HST}"host asm:"${CL_RST}" $(PRIVATE_MODULE) <= $<" $(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_ASFLAGS)) endef @@ -1078,7 +1078,7 @@ endef ########################################################### define transform-host-m-to-o-no-deps -@echo "host ObjC: $(PRIVATE_MODULE) <= $<" +@echo -e ${PRT_HST}"host ObjC:"${CL_RST}" $(PRIVATE_MODULE) <= $<" $(call transform-host-c-or-s-to-o-no-deps, $(PRIVATE_CFLAGS) $(PRIVATE_DEBUG_CFLAGS)) endef @@ -1113,7 +1113,7 @@ endef # $(1): the full path of the source static library. define _extract-and-include-single-target-whole-static-lib -@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]" +@echo -e ${PRT_HST}"preparing StaticLib:"${CL_RST}" $(PRIVATE_MODULE) [including $(1)]" $(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;\ rm -rf $$ldir; \ mkdir -p $$ldir; \ @@ -1137,7 +1137,7 @@ define transform-o-to-static-lib @mkdir -p $(dir $@) @rm -f $@ $(extract-and-include-target-whole-static-libs) -@echo "target StaticLib: $(PRIVATE_MODULE) ($@)" +@echo -e ${PRT_TGT}"target StaticLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(call split-long-arguments,$(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^)) endef @@ -1147,7 +1147,7 @@ endef # $(1): the full path of the source static library. define _extract-and-include-single-host-whole-static-lib -@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]" +@echo -e ${PRT_HST}"preparing StaticLib:"${CL_RST}" $(PRIVATE_MODULE) [including $(1)]" $(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;\ rm -rf $$ldir; \ mkdir -p $$ldir; \ @@ -1171,7 +1171,7 @@ define transform-host-o-to-static-lib @mkdir -p $(dir $@) @rm -f $@ $(extract-and-include-host-whole-static-libs) -@echo "host StaticLib: $(PRIVATE_MODULE) ($@)" +@echo -e ${PRT_HST}"host StaticLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(call split-long-arguments,$(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^)) endef @@ -1208,13 +1208,13 @@ endif define transform-host-o-to-shared-lib @mkdir -p $(dir $@) -@echo "host SharedLib: $(PRIVATE_MODULE) ($@)" +@echo -e ${PRT_HST}"host SharedLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(transform-host-o-to-shared-lib-inner) endef define transform-host-o-to-package @mkdir -p $(dir $@) -@echo "host Package: $(PRIVATE_MODULE) ($@)" +@echo -e ${PRT_HST}"host Package:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(transform-host-o-to-shared-lib-inner) endef @@ -1258,13 +1258,13 @@ endif define transform-o-to-shared-lib @mkdir -p $(dir $@) -@echo "target SharedLib: $(PRIVATE_MODULE) ($@)" +@echo -e ${PRT_TGT}"target SharedLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(transform-o-to-shared-lib-inner) endef define transform-o-to-package @mkdir -p $(dir $@) -@echo "target Package: $(PRIVATE_MODULE) ($@)" +@echo -e ${PRT_TGT}"target Package:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(transform-o-to-shared-lib-inner) endef @@ -1275,7 +1275,7 @@ endef define transform-to-stripped @mkdir -p $(dir $@) -@echo "target Strip: $(PRIVATE_MODULE) ($@)" +@echo -e ${PRT_TGT}"target Strip:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(hide) $(TARGET_STRIP_COMMAND) endef @@ -1307,7 +1307,7 @@ endif define transform-o-to-executable @mkdir -p $(dir $@) -@echo "target Executable: $(PRIVATE_MODULE) ($@)" +@echo -e ${PRT_TGT}"target Executable:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(transform-o-to-executable-inner) endef @@ -1326,7 +1326,7 @@ endif define transform-o-to-static-executable @mkdir -p $(dir $@) -@echo "target StaticExecutable: $(PRIVATE_MODULE) ($@)" +@echo -e ${PRT_TGT}"target StaticExecutable:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(transform-o-to-static-executable-inner) endef @@ -1360,7 +1360,7 @@ endif define transform-host-o-to-executable @mkdir -p $(dir $@) -@echo "host Executable: $(PRIVATE_MODULE) ($@)" +@echo -e ${PRT_HST}"host Executable:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(transform-host-o-to-executable-inner) endef @@ -1520,7 +1520,7 @@ $(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \ endef define transform-java-to-classes.jar -@echo "target Java: $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))" +@echo -e ${PRT_TGT}"target Java:"${CL_RST}" $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))" $(call compile-java,$(TARGET_JAVAC),$(PRIVATE_BOOTCLASSPATH)) endef @@ -1540,7 +1540,7 @@ $(hide) if [ -e $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stamp ] ; then \ fi $(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \ | sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq -@echo "(Incremental) build source files:" +@echo -e ${PRT_HST}"(Incremental) build source files:"${CL_RST}" @cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \ $(1) -encoding UTF-8 \ @@ -1572,7 +1572,7 @@ $(hide) mv $(PRIVATE_CLASS_INTERMEDIATES_DIR)/newstamp $(PRIVATE_CLASS_INTERMEDI endef define transform-java-to-classes.jar -@echo "target Java: $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))" +@echo -e ${PRT_TGT}"target Java:"${CL_RST}" $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))" $(call compile-java,$(TARGET_JAVAC),$(PRIVATE_BOOTCLASSPATH)) endef endif # ENABLE_INCREMENTALJAVAC @@ -1587,7 +1587,7 @@ endef # only core.jar and framework.jar need a heap this big. # Avoid the memory arguments on Windows, dx fails to load for some reason with them. define transform-classes.jar-to-dex -@echo "target Dex: $(PRIVATE_MODULE)" +@echo -e ${PRT_TGT}"target Dex:"${CL_RST}" $(PRIVATE_MODULE)" @mkdir -p $(dir $@) $(hide) $(DX) \ $(if $(findstring windows,$(HOST_OS)),,-JXms16M -JXmx2048M) \ @@ -1718,7 +1718,7 @@ endef # Note: we intentionally don't clean PRIVATE_CLASS_INTERMEDIATES_DIR # in transform-java-to-classes for the sake of vm-tests. define transform-host-java-to-package -@echo "host Java: $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))" +@echo -e ${PRT_HST}"host Java:"${CL_RST}" $(PRIVATE_MODULE) ($(PRIVATE_CLASS_INTERMEDIATES_DIR))" $(call compile-java,$(HOST_JAVAC),$(PRIVATE_BOOTCLASSPATH)) $(if $(PRIVATE_EXTRA_JAR_ARGS), $(call add-java-resources-to-package)) endef @@ -1732,7 +1732,7 @@ endef # $(2): destination header define copy-one-header $(2): $(1) - @echo "Header: $$@" + @echo -e ${PRT_INS}"Header:"${CL_RST}" $$@" $$(copy-file-to-new-target-with-cp) endef @@ -1741,7 +1741,7 @@ endef # $(2): destination file define copy-one-file $(2): $(1) | $(ACP) - @echo "Copy: $$@" + @echo -e ${PRT_INS}"Copy:"${CL_RST}" $$@" $$(copy-file-to-target) endef @@ -1762,7 +1762,7 @@ endef # $(2): destination file, must end with .xml. define copy-xml-file-checked $(2): $(1) | $(ACP) - @echo "Copy xml: $$@" + @echo -e ${PRT_INS}"Copy xml:"${CL_RST}" $$@" $(hide) xmllint $$< >/dev/null # Don't print the xml file to stdout. $$(copy-file-to-target) endef @@ -1820,19 +1820,19 @@ endef # Copy a prebuilt file to a target location. define transform-prebuilt-to-target -@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt: $(PRIVATE_MODULE) ($@)" +@echo -e "$(if $(PRIVATE_IS_HOST_MODULE),host,target) "${PRT_INS}"Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(copy-file-to-target) endef # Copy a prebuilt file to a target location, using zipalign on it. define transform-prebuilt-to-target-with-zipalign -@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt APK: $(PRIVATE_MODULE) ($@)" +@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) "${PRT_INS}"Prebuilt APK:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(copy-file-to-target-with-zipalign) endef # Copy a prebuilt file to a target location, stripping "# comment" comments. define transform-prebuilt-to-target-strip-comments -@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt: $(PRIVATE_MODULE) ($@)" +@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) "${PRT_INS}"Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(copy-file-to-target-strip-comments) endef @@ -1876,7 +1876,7 @@ endef ########################################################### define transform-generated-source -@echo "target Generated: $(PRIVATE_MODULE) <= $<" +@echo -e ${PRT_TGT}"target Generated:"${CL_RST}" $(PRIVATE_MODULE) <= $<" @mkdir -p $(dir $@) $(hide) $(PRIVATE_CUSTOM_TOOL) endef diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index e2e76b83098..1564b62edaa 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -48,7 +48,7 @@ $(eval _dbj_jar_no_dex := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(1)_nodex.jar) $(eval _dbj_src_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(1),,COMMON)/javalib.jar) $(eval $(_dbj_odex): PRIVATE_DBJ_JAR := $(_dbj_jar)) $(_dbj_odex) : $(_dbj_src_jar) | $(ACP) $(DEXPREOPT) $(DEXOPT) - @echo "Dexpreopt Boot Jar: $$@" + @echo -e ${PRT_TGT}"Dexpreopt Boot Jar:"${CL_RST}" $$@" $(hide) rm -f $$@ $(hide) mkdir -p $$(dir $$@) $(hide) $(ACP) -fp $$< $$(PRIVATE_DBJ_JAR) diff --git a/core/distdir.mk b/core/distdir.mk index 51ec46efeff..6c12751182e 100644 --- a/core/distdir.mk +++ b/core/distdir.mk @@ -37,7 +37,7 @@ ifdef dist_goal define copy-one-dist-file $(3): $(2) $(2): $(1) - @echo "Dist: $$@" + @echo -e ${PRT_HST}"Dist:"${CL_RST}" $$@" $$(copy-file-to-new-target-with-cp) endef diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 8b95558cf26..72095124cea 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -156,7 +156,7 @@ $(full_target): PRIVATE_LOCAL_PATH := $(LOCAL_PATH) html_dir_files := $(shell find $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR) -type f) $(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_files) $(full_java_lib_deps) $(LOCAL_ADDITIONAL_DEPENDENCIES) - @echo Docs droiddoc: $(PRIVATE_OUT_DIR) + @echo -e ${PRT_HST}"Docs droiddoc:"${CL_RST}" $(PRIVATE_OUT_DIR)" $(hide) mkdir -p $(dir $@) $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) @@ -192,7 +192,7 @@ else ## ## $(full_target): $(full_src_files) $(full_java_lib_deps) - @echo Docs javadoc: $(PRIVATE_OUT_DIR) + @echo -e ${PRT_HST}"Docs javadoc:"${CL_RST}" $(PRIVATE_OUT_DIR)" @mkdir -p $(dir $@) $(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \ $(PRIVATE_SOURCE_INTERMEDIATES_DIR) $(PRIVATE_ADDITIONAL_JAVA_DIR)) @@ -232,7 +232,7 @@ ifeq ($(strip $(LOCAL_UNINSTALLABLE_MODULE)),) out_zip := $(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip $(out_zip): PRIVATE_DOCS_DIR := $(out_dir) $(out_zip): $(full_target) - @echo Package docs: $@ + @echo -e ${PRT_HST}"Package docs:"${CL_RST}" $@" @rm -f $@ @mkdir -p $(dir $@) $(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_DOCS_DIR) && zip -rq $$F * ) diff --git a/core/dynamic_binary.mk b/core/dynamic_binary.mk index 77784776e6d..10e49c922bf 100644 --- a/core/dynamic_binary.mk +++ b/core/dynamic_binary.mk @@ -84,7 +84,7 @@ compress_output := $(intermediates)/COMPRESSED-$(LOCAL_BUILT_MODULE_STEM) #TODO: define a rule to build TARGET_SYMBOL_FILTER_FILE, and # make it depend on ALL_ORIGINAL_DYNAMIC_BINARIES. $(compress_output): $(compress_input) $(TARGET_SYMBOL_FILTER_FILE) | $(ACP) - @echo "target Compress Symbols: $(PRIVATE_MODULE) ($@)" + @echo -e ${PRT_TGT}"target Compress Symbols:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(copy-file-to-target) else # Skip this step. @@ -97,7 +97,7 @@ endif symbolic_input := $(compress_output) symbolic_output := $(LOCAL_UNSTRIPPED_PATH)/$(LOCAL_INSTALLED_MODULE_STEM) $(symbolic_output) : $(symbolic_input) | $(ACP) - @echo "target Symbolic: $(PRIVATE_MODULE) ($@)" + @echo -e ${PRT_TGT}"target Symbolic:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(copy-file-to-target) @@ -123,11 +123,11 @@ else # use cp(1) instead. ifneq ($(LOCAL_ACP_UNAVAILABLE),true) $(strip_output): $(strip_input) | $(ACP) - @echo "target Unstripped: $(PRIVATE_MODULE) ($@)" + @echo -e ${PRT_TGT}"target Unstripped:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(copy-file-to-target) else $(strip_output): $(strip_input) - @echo "target Unstripped: $(PRIVATE_MODULE) ($@)" + @echo -e ${PRT_TGT}"target Unstripped:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(copy-file-to-target-with-cp) endif endif # LOCAL_STRIP_MODULE diff --git a/core/host_java_library.mk b/core/host_java_library.mk index 391050c9ff1..587e5f10131 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -101,12 +101,12 @@ $(full_classes_jarjar_jar): $(full_classes_compiled_jar) $(LOCAL_JARJAR_RULES) | $(hide) java -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@ else $(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(ACP) - @echo Copying: $@ + @echo -e ${PRT_HST}"Copying:"${CL_RST}" $@" $(hide) $(ACP) -fp $< $@ endif $(full_classes_jar): $(full_classes_jarjar_jar) | $(ACP) - @echo Copying: $@ + @echo -e ${PRT_HST}"Copying:"${CL_RST}" $@" $(hide) $(ACP) -fp $< $@ $(built_dex): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON) diff --git a/core/java.mk b/core/java.mk index f237965a382..0deb4510d83 100644 --- a/core/java.mk +++ b/core/java.mk @@ -306,7 +306,7 @@ ifdef full_classes_jar # PRIVATE_ vars to be preserved. $(full_classes_stubs_jar): PRIVATE_SOURCE_FILE := $(full_classes_jar) $(full_classes_stubs_jar) : $(LOCAL_BUILT_MODULE) | $(ACP) - @echo Copying $(PRIVATE_SOURCE_FILE) + @echo -e ${PRT_TGT}"Copying"${CL_RST}" $(PRIVATE_SOURCE_FILE)" $(hide) $(ACP) -fp $(PRIVATE_SOURCE_FILE) $@ ALL_MODULES.$(LOCAL_MODULE).STUBS := $(full_classes_stubs_jar) @@ -335,11 +335,11 @@ $(full_classes_compiled_jar): PRIVATE_JAVAC_DEBUG_FLAGS := -g ifneq ($(strip $(LOCAL_JARJAR_RULES)),) $(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES) $(full_classes_jarjar_jar): $(full_classes_compiled_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR) - @echo JarJar: $@ + @echo -e ${PRT_TGT}"JarJar:"${CL_RST}" $@" $(hide) java -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@ else $(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(ACP) - @echo Copying: $@ + @echo -e ${PRT_TGT}"Copying:"${CL_RST}" $@" $(hide) $(ACP) -fp $< $@ endif @@ -362,13 +362,13 @@ $(full_classes_emma_jar): $(full_classes_jarjar_jar) | $(EMMA_JAR) else $(full_classes_emma_jar): $(full_classes_jarjar_jar) | $(ACP) - @echo Copying: $@ + @echo -e ${PRT_TGT}"Copying:"${CL_RST}" $@" $(copy-file-to-target) endif # Keep a copy of the jar just before proguard processing. $(full_classes_jar): $(full_classes_emma_jar) | $(ACP) - @echo Copying: $@ + @echo -e ${PRT_TGT}"Copying:"${CL_RST}" $@" $(hide) $(ACP) -fp $< $@ # Run proguard if necessary, otherwise just copy the file. @@ -458,7 +458,7 @@ endif $(built_dex_intermediate): $(full_classes_proguard_jar) $(DX) $(transform-classes.jar-to-dex) $(built_dex): $(built_dex_intermediate) | $(ACP) - @echo Copying: $@ + @echo -e ${PRT_TGT}"Copying:"${CL_RST}" $@" $(hide) $(ACP) -fp $< $@ ifneq ($(GENERATE_DEX_DEBUG),) $(install-dex-debug) diff --git a/core/java_library.mk b/core/java_library.mk index 4c6b65256e2..eee3e784c4c 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -71,7 +71,7 @@ $(common_javalib.jar) : $(full_classes_proguard_jar) else $(common_javalib.jar) : $(full_classes_jar) endif - @echo "target Static Jar: $(PRIVATE_MODULE) ($@)" + @echo -e ${PRT_TGT}"target Static Jar:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(copy-file-to-target) ifneq ($(extra_jar_args),) $(add-java-resources-to-package) @@ -84,7 +84,7 @@ else # !LOCAL_IS_STATIC_JAVA_LIBRARY $(common_javalib.jar): PRIVATE_DEX_FILE := $(built_dex) $(common_javalib.jar) : $(built_dex) $(java_resource_sources) - @echo "target Jar: $(PRIVATE_MODULE) ($@)" + @echo -e ${PRT_TGT}"target Jar:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(create-empty-package) $(add-dex-to-package) $(add-carried-java-resources) @@ -111,7 +111,7 @@ $(built_odex): PRIVATE_MODULE := $(LOCAL_MODULE) # Make sure the boot jars get dex-preopt-ed first $(built_odex) : $(DEXPREOPT_BOOT_ODEXS) $(built_odex) : $(common_javalib.jar) | $(DEXPREOPT) $(DEXOPT) - @echo "Dexpreopt Jar: $(PRIVATE_MODULE) ($@)" + @echo -e ${PRT_TGT}"Dexpreopt Jar:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(hide) rm -f $@ @mkdir -p $(dir $@) $(call dexpreopt-one-file,$<,$@) diff --git a/core/main.mk b/core/main.mk index 8578d90a3ce..d546dd53e71 100644 --- a/core/main.mk +++ b/core/main.mk @@ -914,7 +914,7 @@ $(foreach module,$(sample_MODULES),$(eval $(call \ sample_ADDITIONAL_INSTALLED := \ $(filter-out $(modules_to_install) $(modules_to_check) $(ALL_PREBUILT),$(sample_MODULES)) samplecode: $(sample_APKS_COLLECTION) - @echo "Collect sample code apks: $^" + @echo -e ${PRT_TGT}"Collect sample code apks:"${CL_RST}" $^" # remove apks that are not intended to be installed. rm -f $(sample_ADDITIONAL_INSTALLED) @@ -924,7 +924,7 @@ findbugs: $(INTERNAL_FINDBUGS_HTML_TARGET) $(INTERNAL_FINDBUGS_XML_TARGET) .PHONY: clean clean: @rm -rf $(OUT_DIR) - @echo "Entire build directory removed." + @echo -e ${PRT_TGT}"Entire build directory removed."${CL_RST} .PHONY: clobber clobber: clean @@ -934,7 +934,7 @@ clobber: clean #xxx scrape this from ALL_MODULE_NAME_TAGS .PHONY: modules modules: - @echo "Available sub-modules:" + @echo -e ${PRT_TGT}"Available sub-modules:"${CL_RST} @echo "$(call module-names-for-tag-list,$(ALL_MODULE_TAGS))" | \ tr -s ' ' '\n' | sort -u | $(COLUMN) diff --git a/core/notice_files.mk b/core/notice_files.mk index 5af01137f38..7bb49437933 100644 --- a/core/notice_files.mk +++ b/core/notice_files.mk @@ -62,7 +62,7 @@ installed_notice_file := $($(my_prefix)OUT_NOTICE_FILES)/src/$(module_installed_ $(installed_notice_file): PRIVATE_INSTALLED_MODULE := $(module_installed_filename) $(installed_notice_file): $(notice_file) - @echo Notice file: $< -- $@ + @echo -e ${PRT_IMP}Notice file:${CL_RST} $< -- $@ $(hide) mkdir -p $(dir $@) $(hide) cat $< > $@ diff --git a/core/package.mk b/core/package.mk index 551028c41d1..f06b76726b7 100644 --- a/core/package.mk +++ b/core/package.mk @@ -234,7 +234,7 @@ $(R_file_stamp): PRIVATE_RESOURCE_PUBLICS_OUTPUT := \ $(intermediates.COMMON)/public_resources.xml $(R_file_stamp): PRIVATE_PROGUARD_OPTIONS_FILE := $(proguard_options_file) $(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_stamp) $(AAPT) | $(ACP) - @echo "target R.java/Manifest.java: $(PRIVATE_MODULE) ($@)" + @echo -e ${PRT_HST}"target R.java/Manifest.java:"${CL_RST}" $(PRIVATE_MODULE) ($@)" @rm -f $@ $(create-resource-java-files) $(hide) for GENERATED_MANIFEST_FILE in `find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) \ @@ -266,7 +266,7 @@ $(R_file_stamp): $(resource_export_package) $(resource_export_package): PRIVATE_PRODUCT_AAPT_CONFIG := $(resource_export_package): PRIVATE_PRODUCT_AAPT_PREF_CONFIG := $(resource_export_package): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_stamp) $(AAPT) - @echo "target Export Resources: $(PRIVATE_MODULE) ($@)" + @echo -e ${PRT_TGT}"target Export Resources:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(create-empty-package) $(add-assets-to-package) endif @@ -408,7 +408,7 @@ else $(LOCAL_BUILT_MODULE): PRIVATE_PRODUCT_AAPT_PREF_CONFIG := $(PRODUCT_AAPT_PREF_CONFIG) endif $(LOCAL_BUILT_MODULE): $(all_res_assets) $(jni_shared_libraries) $(full_android_manifest) - @echo "target Package: $(PRIVATE_MODULE) ($@)" + @echo -e ${PRT_TGT}"target Package:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(create-empty-package) $(add-assets-to-package) ifneq ($(jni_shared_libraries),) diff --git a/core/pdk_config.mk b/core/pdk_config.mk index 9590d7028f9..d3a67300707 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -97,7 +97,7 @@ endif endif $(_pdk_fusion_stamp) : $(PDK_FUSION_PLATFORM_ZIP) - @echo "Unzip $(dir $@) <- $<" + @echo -e ${PRT_HST}"Unzip"${CL_RST}" $(dir $@) <- $<" $(hide) rm -rf $(dir $@) && mkdir -p $(dir $@) $(hide) unzip -qo $< -d $(dir $@) $(call split-long-arguments,-touch,$(_pdk_fusion_files)) diff --git a/core/raw_executable.mk b/core/raw_executable.mk index b64173a696a..ce1894e2c49 100644 --- a/core/raw_executable.mk +++ b/core/raw_executable.mk @@ -14,7 +14,7 @@ $(all_objects) : PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(LOCAL_BUILT_MODULE): $(all_objects) $(all_libraries) @$(mkdir -p $(dir $@) - @echo "target Linking: $(PRIVATE_MODULE)" + @echo -e ${PRT_TGT}"target Linking:"${CL_RST}" $(PRIVATE_MODULE)" $(hide) $(TARGET_LD) \ $(addprefix --script ,$(PRIVATE_LINK_SCRIPT)) \ $(PRIVATE_RAW_EXECUTABLE_LDFLAGS) \ diff --git a/core/static_java_library.mk b/core/static_java_library.mk index f95a382f720..92e3e7527bc 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -115,7 +115,7 @@ $(R_file_stamp): PRIVATE_MANIFEST_PACKAGE_NAME := $(R_file_stamp): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(R_file_stamp) : $(all_resources) $(full_android_manifest) $(AAPT) $(framework_res_package_export_deps) - @echo "target R.java/Manifest.java: $(PRIVATE_MODULE) ($@)" + @echo -e ${PRT_HST}"target R.java/Manifest.java:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(create-resource-java-files) $(hide) find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name R.java | xargs cat > $@ diff --git a/core/tasks/apicheck.mk b/core/tasks/apicheck.mk index 00b78b9746f..a2f6267265c 100644 --- a/core/tasks/apicheck.mk +++ b/core/tasks/apicheck.mk @@ -67,7 +67,7 @@ $(eval $(call check-api, \ .PHONY: update-api update-api: $(INTERNAL_PLATFORM_API_FILE) | $(ACP) - @echo Copying current.txt + @echo -e ${PRT_TGT}"Copying current.txt"${CL_RST} $(hide) $(ACP) $(INTERNAL_PLATFORM_API_FILE) frameworks/base/api/current.txt endif diff --git a/core/tasks/collect_gpl_sources.mk b/core/tasks/collect_gpl_sources.mk index 3c7afcc3b84..6eb0e43e374 100644 --- a/core/tasks/collect_gpl_sources.mk +++ b/core/tasks/collect_gpl_sources.mk @@ -16,7 +16,7 @@ gpl_source_tgz := $(call intermediates-dir-for,PACKAGING,gpl_source,HOST,COMMON) $(gpl_source_tgz): PRIVATE_PATHS := $(sort $(patsubst %/, %, $(dir $(ALL_GPL_MODULE_LICENSE_FILES)))) $(gpl_source_tgz) : $(ALL_GPL_MODULE_LICENSE_FILES) - @echo Package gpl sources: $@ + @echo -e ${PRT_TGT}"Package gpl sources:"${CL_RST}" $@" @rm -rf $(dir $@) && mkdir -p $(dir $@) $(hide) tar cfz $@ --exclude ".git*" $(PRIVATE_PATHS) diff --git a/core/tasks/product-graph.mk b/core/tasks/product-graph.mk index fcec27775dc..f729064f9a1 100644 --- a/core/tasks/product-graph.mk +++ b/core/tasks/product-graph.mk @@ -136,7 +136,7 @@ $(foreach p,$(really_all_products), \ ) $(products_pdf): $(products_graph) - @echo Product graph PDF: $@ + @echo -e ${PRT_TGT}"Product graph PDF:"${CL_RST}" $@" dot -Tpdf -Nshape=box -o $@ $< $(products_svg): $(products_graph) $(product_debug_files) diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index 5a24a008a83..e40ef58df69 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -79,7 +79,7 @@ $(full_target): PRIVATE_DOCS_DIRS := $(addprefix $(OUT_DOCS)/, $(doc_modules)) $(full_target): PRIVATE_STAGING_DIR := $(staging) $(full_target): $(sdk_addon_deps) | $(ACP) - @echo Packaging SDK Addon: $@ + @echo -e ${PRT_TGT}"Packaging SDK Addon:"${CL_RST}" $@" $(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs $(hide) for d in $(PRIVATE_DOCS_DIRS); do \ $(ACP) -r $$d $(PRIVATE_STAGING_DIR)/docs ;\ diff --git a/tools/apicheck/Android.mk b/tools/apicheck/Android.mk index 1674a17e93d..4b1daff3eb1 100644 --- a/tools/apicheck/Android.mk +++ b/tools/apicheck/Android.mk @@ -32,7 +32,7 @@ include $(BUILD_SYSTEM)/base_rules.mk $(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/apicheck | $(ACP) - @echo "Copy: $(PRIVATE_MODULE) ($@)" + @echo -e ${PRT_INS}"Copy:"${CL_RST}" $(PRIVATE_MODULE) ($@)" $(copy-file-to-new-target) $(hide) chmod 755 $@ From 419b7227dd7ed2a23faaba0d393d6d6ee5c46925 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Fri, 20 Jul 2012 19:38:16 +0100 Subject: [PATCH 052/837] Allow disabling PIE for dynamically linked executables arm: Allow disabling PIE for dynamically linked executables PIE can and does break some binaries that were built without it, resulting in relocation-related issues (addressing memory wrongly assumed to be at a fixed position). Use this as a last resort measure for compatibility with pre-JB binary blobs, and only if confirmed to fix a broken executable. If you're not sure, do NOT enable this on a device. Change-Id: I3b7001e682a6f7a845e62278fe2afa9ccf5552a4 arm: Drop linker script when building without PIE The current section headers generated by bionic are incompatible with this (interp is in, ctors were dropped, and other tiny changes related to Elf32_Dyn). But... we don't actually need this to disable PIE, so drop it entirely instead of writing a new one. Change-Id: I3b350a9f6251e60bf52114343d190f3d6d83b216 --- core/combo/TARGET_linux-arm.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 4d0d93602fe..ece5b98b94b 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -96,7 +96,7 @@ endif android_config_h := $(call select-android-config-h,linux-arm) TARGET_GLOBAL_CFLAGS += \ - -msoft-float -fpic -fPIE \ + -msoft-float -fpic $(PIE_GLOBAL_CFLAGS) \ -ffunction-sections \ -fdata-sections \ -funwind-tables \ @@ -255,7 +255,7 @@ $(hide) $(PRIVATE_CXX) \ endef define transform-o-to-executable-inner -$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ +$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic $(PIE_EXECUTABLE_TRANSFORM) \ -Wl,-dynamic-linker,/system/bin/linker \ -Wl,--gc-sections \ -Wl,-z,nocopyreloc \ From f0ccb2fabd8123c35efe88f1a3d511bf86449571 Mon Sep 17 00:00:00 2001 From: Jake Weinstein Date: Sat, 14 Sep 2013 13:10:43 -0500 Subject: [PATCH 053/837] build: update qcom_utils.mk This is a combination of 2 commits. commit 65849f502ad3e16f6916ddc640d4305c36b7bebc Author: Jake Weinstein Date: Sat Sep 14 13:10:43 2013 -0500 Build: update qcom_utils.mk Add build macro to determine Android Release Adding platform sdk version 18 for JB MR2. Change-Id: I79aa831ddd335bd14bd777506c210acc5d9960f1 commit 677d8efcb831b4b29c5bb5123897943870a55627 Author: andrew.boren Date: Sat May 18 22:15:13 2013 -0700 qcom_utils: Add qsd8k to qcom platforms PS2: fix typo Change-Id: Id85569d1dd7be2f4c0620827da6d89e63b658aa9 Change-Id: I58d70c079c6ec2c76ab7fc169664f1e4c55fb552 --- core/qcom_utils.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/core/qcom_utils.mk b/core/qcom_utils.mk index 50584ccd155..359f55c6537 100755 --- a/core/qcom_utils.mk +++ b/core/qcom_utils.mk @@ -3,6 +3,7 @@ QCOM_BOARD_PLATFORMS := msm7x27 QCOM_BOARD_PLATFORMS += msm7x27a QCOM_BOARD_PLATFORMS += msm7x30 +QCOM_BOARD_PLATFORMS += qsd8k QCOM_BOARD_PLATFORMS += msm8660 QCOM_BOARD_PLATFORMS += msm8960 QCOM_BOARD_PLATFORMS += msm8974 @@ -171,7 +172,17 @@ FROYO_SDK_VERSIONS := 8 GINGERBREAD_SDK_VERSIONS := 9 10 HONEYCOMB_SDK_VERSIONS := 11 12 13 ICECREAM_SANDWICH_SDK_VERSIONS := 14 15 -JELLY_BEAN_SDK_VERSIONS := 16 17 +JELLY_BEAN_SDK_VERSIONS := 16 17 18 + +# $(call is-platform-sdk-version-at-least,version) +# version is a numeric SDK_VERSION defined above +define is-platform-sdk-version-at-least +$(strip \ + $(if $(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= $(1) ))" )), \ + true, \ + ) \ +) +endef # $(call is-android-codename,codename) # codename is one of cupcake,donut,eclair,froyo,gingerbread,icecream From 18e14bcb7604819b150c5a92d2c0d644e4c51581 Mon Sep 17 00:00:00 2001 From: cybojenix Date: Thu, 17 Oct 2013 03:34:57 +0400 Subject: [PATCH 054/837] build: tools: add in roomservice This is a new implementation of roomservice use the new github search api to reduce the memory footprint, and make it less processor intensive allow for unofficial devices to fetch dependencies. just specify your github organization to fetch dependencies: add a file called 'omni.dependencies' to the root of your device tree an example configuration for the dependency file is: [ { "repository": "android_device_sony_common", "target_path": "device/sony/common" }, { "repository": "legacybop/android_hardware_qcom_display-legacy", "target_path": "hardware/qcom/display-legacy", "revision": "omni-4.3" } please note that comments can not go into this file. It must be valid json PatchSet 7: add support to change port script to another team with config finished pep8'ing more checks on manifest parsing Change-Id: I3d7a8d46d3effbb3d2480c136c9b6b6e610b9b2e --- envsetup.sh | 14 +++ tools/roomservice.py | 287 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 301 insertions(+) create mode 100755 tools/roomservice.py diff --git a/envsetup.sh b/envsetup.sh index e3f4c4edd94..d1227d28d4c 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -542,6 +542,20 @@ function lunch() local product=$(echo -n $selection | sed -e "s/-.*$//") check_product $product if [ $? -ne 0 ] + then + # if we can't find the product, try to grab it from our github + T=$(gettop) + pushd $T > /dev/null + build/tools/roomservice.py $product + popd > /dev/null + check_product $product + else + T=$(gettop) + pushd $T > /dev/null + build/tools/roomservice.py $product true + popd > /dev/null + fi + if [ $? -ne 0 ] then echo echo "** Don't have a product spec for: '$product'" diff --git a/tools/roomservice.py b/tools/roomservice.py new file mode 100755 index 00000000000..972cbba3703 --- /dev/null +++ b/tools/roomservice.py @@ -0,0 +1,287 @@ +#!/usr/bin/env python + +# Copyright (C) 2013 Cybojenix +# Copyright (C) 2013 The OmniROM Project +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from __future__ import print_function +import json +import sys +import os +from xml.etree import ElementTree as ES +# Use the urllib importer from the Cyanogenmod roomservice +try: + # For python3 + import urllib.request +except ImportError: + # For python2 + import imp + import urllib2 + urllib = imp.new_module('urllib') + urllib.request = urllib2 + +# Config +# set this to the default remote to use in repo +default_rem = "github" +# set this to the default revision to use (branch/tag name) +default_rev = "android-4.3" +# set this to the remote that you use for projects from your team repos +# example fetch="https://github.com/omnirom" +default_team_rem = "omnirom" +# this shouldn't change unless google makes changes +local_manifest_dir = ".repo/local_manifests" +# change this to your name on github (or equivalent hosting) +android_team = "omnirom" + + +def check_repo_exists(git_data): + if not int(git_data.get('total_count', 0)): + raise Exception("{} not found in {} Github, exiting " + "roomservice".format(device, android_team)) + + +# Note that this can only be done 5 times per minute +def search_github_for_device(device): + git_search_url = "https://api.github.com/search/repositories" \ + "?q=%40{}+android_device+{}".format(android_team, device) + git_req = urllib.request.Request(git_search_url) + # this api is a preview at the moment. accept the custom media type + git_req.add_header('Accept', 'application/vnd.github.preview') + try: + response = urllib.request.urlopen(git_req) + except urllib.request.HTTPError: + raise Exception("There was an issue connecting to github." + " Please try again in a minute") + git_data = json.load(response) + check_repo_exists(git_data) + print("found the {} device repo".format(device)) + return git_data + + +def get_device_url(git_data): + device_url = "" + for item in git_data['items']: + temp_url = item.get('html_url') + if "{}/android_device".format(android_team) in temp_url: + try: + temp_url = temp_url[temp_url.index("android_device"):] + except ValueError: + pass + else: + if temp_url.endswith(device): + device_url = temp_url + break + + if device_url: + return device_url + raise Exception("{} not found in {} Github, exiting " + "roomservice".format(device, android_team)) + + +def parse_device_directory(device_url): + to_strip = "android_device" + repo_name = device_url[device_url.index(to_strip) + len(to_strip):] + repo_dir = repo_name.replace("_", "/") + return "device{}".format(repo_dir) + + +# Thank you RaYmAn +def iterate_manifests(): + files = [] + for file in os.listdir(local_manifest_dir): + files.append(os.path.join(local_manifest_dir, file)) + files.append('.repo/manifest.xml') + for file in files: + try: + man = ES.parse(file) + man = man.getroot() + except IOError, ES.ParseError: + print("WARNING: error while parsing %s" % file) + else: + for project in man.findall("project"): + yield project + + +def check_project_exists(url): + for project in iterate_manifests(): + if project.get("name") == url: + return True + return False + + +# Use the indent function from http://stackoverflow.com/a/4590052 +def indent(elem, level=0): + i = ''.join(["\n", level*" "]) + if len(elem): + if not elem.text or not elem.text.strip(): + elem.text = ''.join([i, " "]) + if not elem.tail or not elem.tail.strip(): + elem.tail = i + for elem in elem: + indent(elem, level+1) + if not elem.tail or not elem.tail.strip(): + elem.tail = i + else: + if level and (not elem.tail or not elem.tail.strip()): + elem.tail = i + + +def create_manifest_project(url, directory, + remote=default_rem, + revision=default_rev): + project_exists = check_project_exists(url) + + if project_exists: + return None + + project = ES.Element("project", + attrib={ + "path": directory, + "name": url, + "remote": remote, + "revision": revision + }) + return project + + +def append_to_manifest(project): + try: + lm = ES.parse('/'.join([local_manifest_dir, "roomservice.xml"])) + lm = lm.getroot() + except IOError, ES.ParseError: + lm = ES.Element("manifest") + lm.append(project) + return lm + + +def write_to_manifest(manifest): + indent(manifest) + raw_xml = ES.tostring(manifest).decode() + raw_xml = ''.join(['\n' + '\n', + raw_xml]) + + with open('/'.join([local_manifest_dir, "roomservice.xml"]), 'w') as f: + f.write(raw_xml) + print("wrote the new roomservice manifest") + + +def parse_device_from_manifest(device): + for project in iterate_manifests(): + name = project.get('name') + if name.startswith("android_device_") and name.endswith(device): + return project.get('path') + return None + + +def parse_device_from_folder(device): + search = [] + for sub_folder in os.listdir("device"): + if os.path.isdir("device/%s/%s" % (sub_folder, device)): + search.append("device/%s/%s" % (sub_folder, device)) + if len(search) > 1: + print("multiple devices under the name %s. " + "defaulting to checking the manifest" % device) + location = parse_device_from_manifest(device) + elif len(search) == 1: + location = search[0] + else: + print("you device can't be found in device sources..") + location = parse_device_from_manifest(device) + return location + + +def parse_dependency_file(location): + dep_file = "omni.dependencies" + dep_location = '/'.join([location, dep_file]) + if not os.path.isfile(dep_location): + print("WARNING: %s file not found" % dep_location) + sys.exit() + try: + with open(dep_location, 'r') as f: + dependencies = json.loads(f.read()) + except ValueError: + raise Exception("ERROR: malformed dependency file") + return dependencies + + +def create_dependency_manifest(dependencies): + projects = [] + for dependency in dependencies: + repository = dependency.get("repository") + target_path = dependency.get("target_path") + revision = dependency.get("revision", default_rev) + remote = dependency.get("remote", default_rem) + + # not adding an organization should default to android_team + # only apply this to github + if remote == "github": + if not "/" in repository: + repository = '/'.join([android_team, repository]) + project = create_manifest_project(repository, + target_path, + remote=remote, + revision=revision) + if not project is None: + manifest = append_to_manifest(project) + write_to_manifest(manifest) + projects.append(target_path) + if len(projects) > 0: + os.system("repo sync %s" % " ".join(projects)) + + +def fetch_dependencies(device): + location = parse_device_from_folder(device) + if not os.path.isdir(location): + raise Exception("ERROR: could not find your device " + "folder location, bailing out") + dependencies = parse_dependency_file(location) + create_dependency_manifest(dependencies) + + +def fetch_device(device): + git_data = search_github_for_device(device) + device_url = get_device_url(git_data) + device_dir = parse_device_directory(device_url) + project = create_manifest_project(device_url, + device_dir, + remote=default_team_rem) + if not project is None: + manifest = append_to_manifest(project) + write_to_manifest(manifest) + print("syncing the device config") + os.system('repo sync %s' % device_dir) + fetch_dependencies(device) + + +if __name__ == '__main__': + if not os.path.isdir(local_manifest_dir): + os.mkdir(local_manifest_dir) + + product = sys.argv[1] + try: + device = product[product.index("_") + 1:] + except ValueError: + device = product + + if len(sys.argv) > 2: + deps_only = sys.argv[2] + else: + deps_only = False + + if deps_only: + fetch_dependencies(device) + else: + fetch_device(device) From 7948841cee48d819ddcf7b53a2bb612b08103b69 Mon Sep 17 00:00:00 2001 From: Tom Marshall Date: Wed, 23 Oct 2013 21:04:56 +0000 Subject: [PATCH 055/837] kernel.mk: Use standard toolchain paths Change-Id: I1225fd05dcedcff03a1cf1102841cbd010b609cf --- core/tasks/kernel.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index cad4fcca9ef..09903ec3247 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -138,9 +138,9 @@ ifeq ($(TARGET_ARCH),arm) endif ifneq ($(TARGET_KERNEL_CUSTOM_TOOLCHAIN),) ifeq ($(HOST_OS),darwin) - ARM_CROSS_COMPILE:=CROSS_COMPILE="$(ccache) $(ANDROID_BUILD_TOP)/prebuilt/darwin-x86/toolchain/$(TARGET_KERNEL_CUSTOM_TOOLCHAIN)/bin/arm-eabi-" + ARM_CROSS_COMPILE:=CROSS_COMPILE="$(ccache) $(ANDROID_BUILD_TOP)/prebuilts/gcc/darwin-x86/arm/$(TARGET_KERNEL_CUSTOM_TOOLCHAIN)/bin/arm-eabi-" else - ARM_CROSS_COMPILE:=CROSS_COMPILE="$(ccache) $(ANDROID_BUILD_TOP)/prebuilt/linux-x86/toolchain/$(TARGET_KERNEL_CUSTOM_TOOLCHAIN)/bin/arm-eabi-" + ARM_CROSS_COMPILE:=CROSS_COMPILE="$(ccache) $(ANDROID_BUILD_TOP)/prebuilts/gcc/linux-x86/arm/$(TARGET_KERNEL_CUSTOM_TOOLCHAIN)/bin/arm-eabi-" endif else ARM_CROSS_COMPILE:=CROSS_COMPILE="$(ccache) $(ARM_EABI_TOOLCHAIN)/arm-eabi-" From 0634dc70b6e5669f27fed5007aad1fd78bf37a6f Mon Sep 17 00:00:00 2001 From: Jens Andersen Date: Wed, 23 Oct 2013 21:46:02 +0000 Subject: [PATCH 056/837] Support fetching dependencies even if device tree fails. This is required when device tree depends on dependencies to lunch. Change-Id: If62cd9777caf768f8070570ca0835052645c6b20 --- tools/roomservice.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index 972cbba3703..3bd3c7fc327 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -251,7 +251,15 @@ def fetch_dependencies(device): create_dependency_manifest(dependencies) +def check_device_exists(device): + location = parse_device_from_folder(device) + return os.path.isdir(location) + + def fetch_device(device): + if check_device_exists(device): + print("WARNING: Trying to fetch a device that's already there") + return git_data = search_github_for_device(device) device_url = get_device_url(git_data) device_dir = parse_device_directory(device_url) @@ -263,7 +271,6 @@ def fetch_device(device): write_to_manifest(manifest) print("syncing the device config") os.system('repo sync %s' % device_dir) - fetch_dependencies(device) if __name__ == '__main__': @@ -281,7 +288,6 @@ def fetch_device(device): else: deps_only = False - if deps_only: - fetch_dependencies(device) - else: + if not deps_only: fetch_device(device) + fetch_dependencies(device) From c6b0592ec526a690ca7003664474ff1e8c96fc06 Mon Sep 17 00:00:00 2001 From: Konsta Date: Thu, 24 Oct 2013 12:05:31 +0300 Subject: [PATCH 057/837] build: recovery: don't remove init.*.rc Change-Id: Ic1e14e1e82cb28106da5b39f530e0b667377840d --- core/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 60e0da5f49f..78f6871840b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -771,7 +771,6 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ $(hide) -cp $(TARGET_ROOT_OUT)/init.recovery.*.rc $(TARGET_RECOVERY_ROOT_OUT)/ $(hide) cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/ - rm -f $(TARGET_RECOVERY_ROOT_OUT)/init.*.rc mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/bin $(hide) cp -rf $(recovery_resources_common) $(TARGET_RECOVERY_ROOT_OUT)/ $(hide) cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png From e6388b0e807a288a149d696ff9b5f8ceb980d779 Mon Sep 17 00:00:00 2001 From: Richard Bankole Date: Mon, 28 Oct 2013 00:49:40 -0500 Subject: [PATCH 058/837] core: Support GNU make 4.0 and any future releases http://lists.gnu.org/archive/html/make-w32/2013-10/msg00021.html Change-Id: Iaf6aa32e64269bf0368c20b0393e3fcfa540558d --- core/main.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/main.mk b/core/main.mk index d546dd53e71..cf36b45fc2e 100644 --- a/core/main.mk +++ b/core/main.mk @@ -40,17 +40,15 @@ endif # Check for broken versions of make. # (Allow any version under Cygwin since we don't actually build the platform there.) ifeq (,$(findstring CYGWIN,$(shell uname -sm))) -ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.81)) -ifeq (0,$(shell expr $$(echo $(MAKE_VERSION) | sed "s/[^0-9\.].*//") = 3.82)) +ifneq (1,$(strip $(shell expr $(MAKE_VERSION) \>= 3.81))) $(warning ********************************************************************************) $(warning * You are using version $(MAKE_VERSION) of make.) -$(warning * Android can only be built by versions 3.81 and 3.82.) +$(warning * Android can only be built by versions 3.81 and higher.) $(warning * see https://source.android.com/source/download.html) $(warning ********************************************************************************) $(error stopping) endif endif -endif # Absolute path of the present working direcotry. # This overrides the shell variable $PWD, which does not necessarily points to From 52c1d7c09639b5ddc88cbe495dd64667c6dd51aa Mon Sep 17 00:00:00 2001 From: Jerdog Date: Sat, 2 Nov 2013 19:37:07 -0500 Subject: [PATCH 059/837] updating roomservice.py to default on android-4.4 branch to be android-4.4 EDIT: removing useless comments while I thumb my nose at elitist friends EDIT: elitist extra line removed Change-Id: Iebf4dfc4237d6e251acb9e9d32ae1cee68e514ed --- tools/roomservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index 3bd3c7fc327..5fa7a3b26d0 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -36,7 +36,7 @@ # set this to the default remote to use in repo default_rem = "github" # set this to the default revision to use (branch/tag name) -default_rev = "android-4.3" +default_rev = "android-4.4" # set this to the remote that you use for projects from your team repos # example fetch="https://github.com/omnirom" default_team_rem = "omnirom" From 54928bcb691ca0fc2e81b99174160815f62a95fd Mon Sep 17 00:00:00 2001 From: Dominik Marszk Date: Sun, 3 Nov 2013 14:13:12 +0100 Subject: [PATCH 060/837] roomservice: Fix os.path.isdir calls Apparently on some Python installations it throws exception instead of returning False. Change-Id: I9d901e3260bab411cf3466346c421594f0922562 --- tools/roomservice.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index 5fa7a3b26d0..450a7b200d8 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -244,7 +244,7 @@ def create_dependency_manifest(dependencies): def fetch_dependencies(device): location = parse_device_from_folder(device) - if not os.path.isdir(location): + if location is None or not os.path.isdir(location): raise Exception("ERROR: could not find your device " "folder location, bailing out") dependencies = parse_dependency_file(location) @@ -253,6 +253,8 @@ def fetch_dependencies(device): def check_device_exists(device): location = parse_device_from_folder(device) + if location is None: + return False return os.path.isdir(location) From ac4f5517c5fb729804fa79780f963eb249d2084e Mon Sep 17 00:00:00 2001 From: Dominik Marszk Date: Sun, 3 Nov 2013 15:02:27 +0100 Subject: [PATCH 061/837] roomservice: Add -f and --no-clone-bundle flags to repo sync Suppress scary-looking common warnings during resolving. Change-Id: I4337ec95992ad68ff4471b0d0b7346e933269503 --- tools/roomservice.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index 450a7b200d8..8727f09d996 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -239,7 +239,7 @@ def create_dependency_manifest(dependencies): write_to_manifest(manifest) projects.append(target_path) if len(projects) > 0: - os.system("repo sync %s" % " ".join(projects)) + os.system("repo sync -f --no-clone-bundle %s" % " ".join(projects)) def fetch_dependencies(device): @@ -272,7 +272,7 @@ def fetch_device(device): manifest = append_to_manifest(project) write_to_manifest(manifest) print("syncing the device config") - os.system('repo sync %s' % device_dir) + os.system('repo sync -f --no-clone-bundle %s' % device_dir) if __name__ == '__main__': From 08ee89c58f8d6c47335da8c4c511aae6a12c9399 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Wed, 21 Apr 2010 11:39:48 -0400 Subject: [PATCH 062/837] Allow override of device asserts, including multi-device support Set in board file with TARGET_OTA_ASSERT_DEVICE. (cherry-picked from commit 0f452f21fc9323b9d1fe746161761cf40aaa5030) Change-Id: Icd10de924f2b88168912c9575174cebf6b0104ba --- tools/releasetools/edify_generator.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index ffc6e9c0780..d1612cfa019 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -92,11 +92,13 @@ def AssertOlderBuild(self, timestamp, timestamp_text): def AssertDevice(self, device): """Assert that the device identifier is the given string.""" - cmd = ('getprop("ro.product.device") == "%s" || ' - 'abort("This package is for \\"%s\\" devices; ' + cmd = ('(' + + ' || \0'.join(['getprop("ro.product.device") == "%s" || getprop("ro.build.product") == "%s"' + % (i, i) for i in device.split(",")]) + + ') || abort("This package is for \\"%s\\" devices\n' 'this is a \\"" + getprop("ro.product.device") + "\\".");' - ) % (device, device) - self.script.append(cmd) + ) % (device) + self.script.append(self._WordWrap(cmd)) def AssertSomeBootloader(self, *bootloaders): """Asert that the bootloader version is one of *bootloaders.""" From 1b8ca81a0cc738c5ddc27dfdb0c1dc468dc4196c Mon Sep 17 00:00:00 2001 From: Dees Troy Date: Tue, 8 Oct 2013 16:07:07 +0000 Subject: [PATCH 063/837] Fix building custom recovery with userdebug Credit Koushik Dutta Change-Id: I41f1a91849f3aab435a3398696149afce68d8708 --- core/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index 78f6871840b..4a9274abec0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -726,9 +726,7 @@ ifdef BOARD_KERNEL_PAGESIZE endif INTERNAL_RECOVERY_FILES := $(filter $(TARGET_RECOVERY_OUT)/%, \ - $(ALL_PREBUILT) \ - $(ALL_COPIED_HEADERS) \ - $(ALL_GENERATED_SOURCES) \ + $(foreach module, $(ALL_MODULES), $(ALL_MODULES.$(module).INSTALLED)) \ $(ALL_DEFAULT_INSTALLED_MODULES)) # Keys authorized to sign OTA packages this build will accept. The From fbc87ca4f1549e97c110c93e323a628b57f0b118 Mon Sep 17 00:00:00 2001 From: Giulio Cervera Date: Wed, 11 Sep 2013 23:34:26 +0200 Subject: [PATCH 064/837] inline kernel dtb build also add sony device filter Change-Id: Iffeda58c7086f49e76ecafd37941503611346983 --- core/tasks/kernel.mk | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index 09903ec3247..854889913f7 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -101,6 +101,40 @@ else endif endif +USE_SOMC_BOARD ?= $(shell perl -e '$$somc = "n"; while (<>) { if (/CONFIG_MACH_SONY_.+=y/) { $$somc = "y"; break } } print $$somc;' $(KERNEL_SRC)/arch/arm/configs/$(KERNEL_DEFCONFIG)) + +ifeq "$(USE_SOMC_BOARD)" "y" +DTS_NAMES ?= msm8974 apq8074 +SOMC_BOARD = $(shell echo $(KERNEL_DEFCONFIG) | sed -e "s/cm_//" | sed -e "s/_defconfig//") +endif +DTS_NAMES ?= $(shell perl -e 'while (<>) {$$a = $$1 if /CONFIG_ARCH_((?:MSM|QSD|MPQ)[a-zA-Z0-9]+)=y/; $$r = $$1 if /CONFIG_MSM_SOC_REV_(?!NONE)(\w+)=y/; $$arch = $$arch.lc("$$a$$r ") if /CONFIG_ARCH_((?:MSM|QSD|MPQ)[a-zA-Z0-9]+)=y/} print $$arch;' $(KERNEL_CONFIG)) +KERNEL_USE_OF ?= $(shell perl -e '$$of = "n"; while (<>) { if (/CONFIG_USE_OF=y/) { $$of = "y"; break; } } print $$of;' $(KERNEL_SRC)/arch/arm/configs/$(KERNEL_DEFCONFIG)) + +ifeq "$(KERNEL_USE_OF)" "y" +ifeq "$(USE_SOMC_BOARD)" "y" +DTS_FILES = $(wildcard $(TOP)/$(KERNEL_SRC)/arch/arm/boot/dts/$(DTS_NAME)*$(SOMC_BOARD).dts) +else +DTS_FILES = $(wildcard $(TOP)/$(KERNEL_SRC)/arch/arm/boot/dts/$(DTS_NAME)*.dts) +endif +DTS_FILE = $(lastword $(subst /, ,$(1))) +DTB_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%.dtb,$(call DTS_FILE,$(1)))) +ZIMG_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%-zImage,$(call DTS_FILE,$(1)))) +KERNEL_ZIMG = $(KERNEL_OUT)/arch/arm/boot/zImage +DTC = $(KERNEL_OUT)/scripts/dtc/dtc + +define append-dtb +mkdir -p $(KERNEL_OUT)/arch/arm/boot;\ +$(foreach DTS_NAME, $(DTS_NAMES), \ + $(foreach d, $(DTS_FILES), \ + $(DTC) -p 1024 -O dtb -o $(call DTB_FILE,$(d)) $(d); \ + cat $(KERNEL_ZIMG) $(call DTB_FILE,$(d)) > $(call ZIMG_FILE,$(d));)) +endef +else + +define append-dtb +endef +endif + ifeq ($(FULL_KERNEL_BUILD),true) KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr @@ -178,6 +212,7 @@ $(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES $(TARGET_PREBUILT_INT_KERNEL): $(TARGET_KERNEL_MODULES) $(mv-modules) $(clean-module-folder) + $(append-dtb) $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) headers_install From c669967787ea2b284f7fc08397dc0bd119f68975 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 5 Nov 2013 13:49:33 -0800 Subject: [PATCH 065/837] "KRT16N" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a87675419ec..0e6218c2a06 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16L +export BUILD_ID=KRT16N From 52fccd0ba5a1ff1c2823899aac4910b47917ba4e Mon Sep 17 00:00:00 2001 From: xplodwild Date: Wed, 6 Nov 2013 17:30:57 +0100 Subject: [PATCH 066/837] generic_no_telephony: Build Launcher3 instead of Launcher2 Change-Id: I8efbeb480f0f1c4314c106c4d791fd1ffe3dc1a5 --- target/product/generic_no_telephony.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index 665e1fe84e6..df1ec61abd6 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk @@ -33,7 +33,7 @@ PRODUCT_PACKAGES := \ InputDevices \ Keyguard \ LatinIME \ - Launcher2 \ + Launcher3 \ OneTimeInitializer \ PrintSpooler \ Provision \ From 9476553bfafb919354a5a46006fff0bda7bc4c9e Mon Sep 17 00:00:00 2001 From: Jiangyi Date: Mon, 4 Nov 2013 10:41:57 -0500 Subject: [PATCH 067/837] build: Don't copy APN list from emulator This list is severely incomplete and is overwriting the proper APN list in the vendor directory. Change-Id: I0e1b1d26e0cdf2df9a05462f0c9343bd3115635b --- target/product/full_base_telephony.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk index f98e9a2699d..f00f93d2b19 100644 --- a/target/product/full_base_telephony.mk +++ b/target/product/full_base_telephony.mk @@ -26,8 +26,5 @@ PRODUCT_PROPERTY_OVERRIDES := \ keyguard.no_require_sim=true \ ro.com.android.dataroaming=true -PRODUCT_COPY_FILES := \ - device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml - $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk) From 24b9c1bfe07d24f7e2a425d9d5aae52fd30f3819 Mon Sep 17 00:00:00 2001 From: Brandon Bennett Date: Thu, 13 Dec 2012 16:59:25 -0700 Subject: [PATCH 068/837] Add SED_INPLACE macro - based on squashed commits from Cyanogenmod Make sed in-place more portable In-place sed (sed -i) works differents for GNU vs BSD version like what is found on OS X. This adds a check and does a sed -i for GNU and a sed -i '' for Darwin only. This allows my OS X machine to fully compile CM without the need for any GNU specific packages. Author: Brandon Bennett Darwin: Use gsed for SED_INPLACE if found. Change-Id: I5922b31ff2d192d5c6cc0cd8cabfe64d8b4f2620 Author: Koushik Dutta --- core/config.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/core/config.mk b/core/config.mk index 96993c08e22..6eac178cce0 100644 --- a/core/config.mk +++ b/core/config.mk @@ -380,6 +380,18 @@ else MD5SUM:=md5sum endif +# In-place sed is done different in linux than OS X +ifeq ($(HOST_OS),darwin) +GSED:=$(shell which gsed) +ifeq ($(GSED),) +SED_INPLACE:=sed -i '' +else +SED_INPLACE:=gsed -i +endif +else +SED_INPLACE:=sed -i +endif + APICHECK_CLASSPATH := $(HOST_JDK_TOOLS_JAR) APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/doclava$(COMMON_JAVA_PACKAGE_SUFFIX) APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX) From ef168da40f0b9c4f12a020407728b3b7699a99d4 Mon Sep 17 00:00:00 2001 From: xplodwild Date: Thu, 7 Nov 2013 19:14:57 +0100 Subject: [PATCH 069/837] core_base: Remove "Home Sample" Change-Id: I690ab7d65fe02c0771c796d37d15f9ef857daaaf --- target/product/core_base.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/target/product/core_base.mk b/target/product/core_base.mk index cde2b8589c1..603acadafd7 100644 --- a/target/product/core_base.mk +++ b/target/product/core_base.mk @@ -23,7 +23,6 @@ PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_PACKAGES += \ ContactsProvider \ DefaultContainerService \ - Home \ TelephonyProvider \ UserDictionaryProvider \ atrace \ From 5180b8f2d6e30203ffe9411c0eb2ff860f92a535 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Nov 2013 18:23:18 -0800 Subject: [PATCH 070/837] KRT16O --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0e6218c2a06..8d65ec980ce 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16N +export BUILD_ID=KRT16O From 512e756f0b555d7ca35c05ead834539373a621f1 Mon Sep 17 00:00:00 2001 From: jumoog Date: Fri, 8 Nov 2013 02:58:44 +0000 Subject: [PATCH 071/837] Allow prebuild APK's in Vendor Change-Id: I361c32fac1e003ec985ffe2282bf8ef922b11ac0 --- core/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 4a9274abec0..8c4a42ed02a 100644 --- a/core/Makefile +++ b/core/Makefile @@ -70,7 +70,6 @@ unique_product_copy_files_destinations := $(foreach cf,$(unique_product_copy_files_pairs), \ $(eval _src := $(call word-colon,1,$(cf))) \ $(eval _dest := $(call word-colon,2,$(cf))) \ - $(call check-product-copy-files,$(cf)) \ $(if $(filter $(unique_product_copy_files_destinations),$(_dest)), \ $(info PRODUCT_COPY_FILES $(cf) ignored.), \ $(eval _fulldest := $(call append-path,$(PRODUCT_OUT),$(_dest))) \ From 3838ddd16dac754b32b2d2aa8268c50f62df3d15 Mon Sep 17 00:00:00 2001 From: Pawit Pornkitprasan Date: Mon, 25 Feb 2013 11:51:50 +0700 Subject: [PATCH 072/837] build: recovery: disable ro.adb.secure We have no way of authorizing adb in recovery and this locks the user/developer out of adb Change-Id: I6e9b6bfe01e7221295ed7b15936b3ebdf1c55316 --- core/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/core/Makefile b/core/Makefile index 4a9274abec0..bea7526abb7 100644 --- a/core/Makefile +++ b/core/Makefile @@ -779,6 +779,7 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ $(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys $(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \ > $(TARGET_RECOVERY_ROOT_OUT)/default.prop + $(SED_INPLACE) 's/ro.adb.secure=1/ro.adb.secure=0/g' $(TARGET_RECOVERY_ROOT_OUT)/default.prop @echo -e ${PRT_IMG}"----- Made recovery filesystem -------- $(TARGET_RECOVERY_ROOT_OUT)"${CL_RST} @touch $(TARGET_RECOVERY_ROOT_TIMESTAMP) From 28634b17dbf41d65f20d56b8fd9c8356718757ef Mon Sep 17 00:00:00 2001 From: myfluxi Date: Sat, 9 Nov 2013 20:48:06 +0100 Subject: [PATCH 073/837] Revert "inline kernel dtb build" This reverts commit fbc87ca4f1549e97c110c93e323a628b57f0b118. We have everything we need to build the kernel in it's source tree. Change-Id: I93459342a65150b1326d1d7061ed4cc51b5bf61b --- core/tasks/kernel.mk | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index 854889913f7..09903ec3247 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -101,40 +101,6 @@ else endif endif -USE_SOMC_BOARD ?= $(shell perl -e '$$somc = "n"; while (<>) { if (/CONFIG_MACH_SONY_.+=y/) { $$somc = "y"; break } } print $$somc;' $(KERNEL_SRC)/arch/arm/configs/$(KERNEL_DEFCONFIG)) - -ifeq "$(USE_SOMC_BOARD)" "y" -DTS_NAMES ?= msm8974 apq8074 -SOMC_BOARD = $(shell echo $(KERNEL_DEFCONFIG) | sed -e "s/cm_//" | sed -e "s/_defconfig//") -endif -DTS_NAMES ?= $(shell perl -e 'while (<>) {$$a = $$1 if /CONFIG_ARCH_((?:MSM|QSD|MPQ)[a-zA-Z0-9]+)=y/; $$r = $$1 if /CONFIG_MSM_SOC_REV_(?!NONE)(\w+)=y/; $$arch = $$arch.lc("$$a$$r ") if /CONFIG_ARCH_((?:MSM|QSD|MPQ)[a-zA-Z0-9]+)=y/} print $$arch;' $(KERNEL_CONFIG)) -KERNEL_USE_OF ?= $(shell perl -e '$$of = "n"; while (<>) { if (/CONFIG_USE_OF=y/) { $$of = "y"; break; } } print $$of;' $(KERNEL_SRC)/arch/arm/configs/$(KERNEL_DEFCONFIG)) - -ifeq "$(KERNEL_USE_OF)" "y" -ifeq "$(USE_SOMC_BOARD)" "y" -DTS_FILES = $(wildcard $(TOP)/$(KERNEL_SRC)/arch/arm/boot/dts/$(DTS_NAME)*$(SOMC_BOARD).dts) -else -DTS_FILES = $(wildcard $(TOP)/$(KERNEL_SRC)/arch/arm/boot/dts/$(DTS_NAME)*.dts) -endif -DTS_FILE = $(lastword $(subst /, ,$(1))) -DTB_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%.dtb,$(call DTS_FILE,$(1)))) -ZIMG_FILE = $(addprefix $(KERNEL_OUT)/arch/arm/boot/,$(patsubst %.dts,%-zImage,$(call DTS_FILE,$(1)))) -KERNEL_ZIMG = $(KERNEL_OUT)/arch/arm/boot/zImage -DTC = $(KERNEL_OUT)/scripts/dtc/dtc - -define append-dtb -mkdir -p $(KERNEL_OUT)/arch/arm/boot;\ -$(foreach DTS_NAME, $(DTS_NAMES), \ - $(foreach d, $(DTS_FILES), \ - $(DTC) -p 1024 -O dtb -o $(call DTB_FILE,$(d)) $(d); \ - cat $(KERNEL_ZIMG) $(call DTB_FILE,$(d)) > $(call ZIMG_FILE,$(d));)) -endef -else - -define append-dtb -endef -endif - ifeq ($(FULL_KERNEL_BUILD),true) KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr @@ -212,7 +178,6 @@ $(TARGET_KERNEL_MODULES): TARGET_KERNEL_BINARIES $(TARGET_PREBUILT_INT_KERNEL): $(TARGET_KERNEL_MODULES) $(mv-modules) $(clean-module-folder) - $(append-dtb) $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_CONFIG) $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) headers_install From eaac613c980c9331473bfea3276ba621e23d1cc7 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Thu, 7 Nov 2013 19:17:03 +0000 Subject: [PATCH 074/837] Make the kernel image format parametric instead of a chain of if/elses Change-Id: I54bfcdecb8647f7bcf744e72b2de19fcf4e4e7ac --- core/tasks/kernel.mk | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index 09903ec3247..d27b6ba3537 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -31,17 +31,24 @@ SELINUX_DEFCONFIG := $(TARGET_KERNEL_SELINUX_CONFIG) KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ KERNEL_CONFIG := $(KERNEL_OUT)/.config -ifeq ($(BOARD_USES_UBOOT),true) - TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/uImage - TARGET_PREBUILT_INT_KERNEL_TYPE := uImage -else ifeq ($(BOARD_USES_UNCOMPRESSED_BOOT),true) - TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/Image - TARGET_PREBUILT_INT_KERNEL_TYPE := Image +ifneq ($(BOARD_KERNEL_IMAGE_NAME),) + TARGET_PREBUILT_INT_KERNEL_TYPE := $(BOARD_KERNEL_IMAGE_NAME) + TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/$(TARGET_PREBUILT_INT_KERNEL_TYPE) else TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/zImage TARGET_PREBUILT_INT_KERNEL_TYPE := zImage endif +## Do be discontinued in a future version. Notify builder about target +## kernel format requirement +ifeq ($(BOARD_KERNEL_IMAGE_NAME),) +ifeq ($(BOARD_USES_UBOOT),true) + $(error "Please set BOARD_KERNEL_IMAGE_NAME to uImage") +else ifeq ($(BOARD_USES_UNCOMPRESSED_BOOT),true) + $(error "Please set BOARD_KERNEL_IMAGE_NAME to Image") +endif +endif + ifeq "$(wildcard $(KERNEL_SRC) )" "" ifneq ($(TARGET_PREBUILT_KERNEL),) HAS_PREBUILT_KERNEL := true From b38ec98ad2230c31ccc4ba7f8ff94eb7ae6768e1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Nov 2013 15:17:13 -0800 Subject: [PATCH 075/837] KRT16P --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8d65ec980ce..7febaeab251 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16O +export BUILD_ID=KRT16P From 9dd2622a651608ed04b05ffaa90a8062535a413a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Nov 2013 17:20:40 -0800 Subject: [PATCH 076/837] KRT16Q --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7febaeab251..732c1c48e6a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16P +export BUILD_ID=KRT16Q From 8dce9158c0311daadba4ca0c59421b895cdfa070 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 Nov 2013 20:40:14 -0800 Subject: [PATCH 077/837] "KOT44" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..8278b44d8d2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KOT44 From 0afef095b93bd66561d6f87737133c986ccdef15 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Nov 2013 17:57:09 -0800 Subject: [PATCH 078/837] "KOT45" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..161e0ceefb3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KOT45 From 703851d31cb777df3c80e6cd45334810ca549841 Mon Sep 17 00:00:00 2001 From: Jiangyi Date: Fri, 15 Nov 2013 05:47:38 -0500 Subject: [PATCH 079/837] Remove PinyinIME from build PinyinIME in AOSP is from the GB era and incredibly ugly/unpolished. No one actually uses it compared to Google's proprietary version and other alternatives. Change-Id: If43045d94cd9ab0f99e5f0ec58252cd20226d86a --- target/product/full_base.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 059697e0ebe..c7b05202048 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -22,7 +22,6 @@ PRODUCT_PACKAGES := \ libfwdlockengine \ OpenWnn \ - PinyinIME \ libWnnEngDic \ libWnnJpnDic \ libwnndict \ From 867d8950fe22bd53be88dcdf62aacb1edd925728 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 Nov 2013 06:00:58 -0800 Subject: [PATCH 080/837] "KOT46" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..c99b2fbb1c0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KOT46 From 461b8a6a331a21477433dac05cce3a4d757a5703 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 Nov 2013 15:03:00 -0800 Subject: [PATCH 081/837] "KOT46B" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..9c874e2a6af 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KOT46B From aa3ef95fe60fab3b82ff618d009818d1fb8e065d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 Nov 2013 16:01:27 -0800 Subject: [PATCH 082/837] "KRT16R" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 732c1c48e6a..ee3898264b4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16Q +export BUILD_ID=KRT16R From 18672f619662688f228b6f9e930768a75ec04a24 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 Nov 2013 17:28:11 -0800 Subject: [PATCH 083/837] "KRT16S" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 732c1c48e6a..73323a04df6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KRT16Q +export BUILD_ID=KRT16S From bfe727d29f5a0da65a33e79a7dce4f734eae7d1c Mon Sep 17 00:00:00 2001 From: mithun46 Date: Thu, 17 Oct 2013 09:29:50 -0700 Subject: [PATCH 084/837] Add more info while flashing Change-Id: I6ada4cb5b2962073037b28045ca8304d602155c4 --- tools/releasetools/ota_from_target_files | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 2a59fbbbe4e..d2805659a93 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -427,17 +427,32 @@ def WriteFullOTAPackage(input_zip, output_zip): script.ShowProgress(0.5, 0) if OPTIONS.wipe_user_data: + script.Print("Formatting /data") script.FormatPartition("/data") + script.Print("#######################################"); + script.Print("# _____ __ __ ______ #"); + script.Print("#/\ __`\ /'\_/`\/\ \/\ \/\__ _\ #"); + script.Print("#\ \ \/\ \/\ \ \ `\\ \/_/\ \/ #"); + script.Print("# \ \ \ \ \ \ \__\ \ \ , ` \ \ \ \ #"); + script.Print("# \ \ \_\ \ \ \_/\ \ \ \`\ \ \_\ \__ #"); + script.Print("# \ \_____\ \_\\ \_\ \_\ \_\/\_____\#"); + script.Print("# \/_____/\/_/ \/_/\/_/\/_/\/_____/#"); + script.Print("# #"); + script.Print("#######################################"); + if "selinux_fc" in OPTIONS.info_dict: WritePolicyConfig(OPTIONS.info_dict["selinux_fc"], output_zip) + script.Print("Formatting /system") script.FormatPartition("/system") script.Mount("/system") script.UnpackPackageDir("recovery", "/system") + script.Print("Extracting /system") script.UnpackPackageDir("system", "/system") symlinks = CopySystemFiles(input_zip, output_zip) + script.Print("Symlinking") script.MakeSymlinks(symlinks) boot_img = common.GetBootableImage("boot.img", "boot.img", @@ -458,9 +473,11 @@ def WriteFullOTAPackage(input_zip, output_zip): script.RunBackup("restore") script.ShowProgress(0.2, 10) + script.Print("Flashing boot.img") script.WriteRawImage("/boot", "boot.img") script.ShowProgress(0.1, 0) + script.Print("Enjoy OMNI ROM!"); device_specific.FullOTA_InstallEnd() if OPTIONS.extra_script is not None: From 7f9838089bfce8dbb84a48ab3c9894eac4943e1b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 18 Nov 2013 14:49:13 -0800 Subject: [PATCH 085/837] "KOT49" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..6d5f836352c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KOT49 From c593a3f1ff1c8f1d9dcdd6f31de733f6daf80c75 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 Nov 2013 17:36:23 -0800 Subject: [PATCH 086/837] "KOT49B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6d5f836352c..e7b44aadcc9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KOT49 +export BUILD_ID=KOT49B From f458e5d5dc227ba5252a974ea2ef7d78336a801c Mon Sep 17 00:00:00 2001 From: Jon Haus Date: Tue, 19 Nov 2013 23:06:44 -0500 Subject: [PATCH 087/837] releasetools: fix omni logo while flashing The double backslashes were being parsed out so they've been changed to use other characters Change-Id: I96e486e51bfd525bbfe83b93a2e3742677abf45c --- tools/releasetools/ota_from_target_files | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index d2805659a93..c2aba887c64 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -433,10 +433,10 @@ def WriteFullOTAPackage(input_zip, output_zip): script.Print("#######################################"); script.Print("# _____ __ __ ______ #"); script.Print("#/\ __`\ /'\_/`\/\ \/\ \/\__ _\ #"); - script.Print("#\ \ \/\ \/\ \ \ `\\ \/_/\ \/ #"); - script.Print("# \ \ \ \ \ \ \__\ \ \ , ` \ \ \ \ #"); + script.Print("#\ \ \/\ \/\ `` \ \ ` \ \/_/\ \/ #"); + script.Print("# \ \ \ \ \ \ \__\ \ \ . ` \ \ \ \ #"); script.Print("# \ \ \_\ \ \ \_/\ \ \ \`\ \ \_\ \__ #"); - script.Print("# \ \_____\ \_\\ \_\ \_\ \_\/\_____\#"); + script.Print("# \ \_____\ \_\, \_\ \_\ \_\/\_____\#"); script.Print("# \/_____/\/_/ \/_/\/_/\/_/\/_____/#"); script.Print("# #"); script.Print("#######################################"); From 16ddeef82e5a12b7a5aae587579e4bde715d9283 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Nov 2013 02:58:36 -0800 Subject: [PATCH 088/837] "KOT49C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e7b44aadcc9..2f898b32572 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KOT49B +export BUILD_ID=KOT49C From 01a5f91d7ebea57f2c6fea63e1826753062a3b90 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Nov 2013 03:33:03 -0800 Subject: [PATCH 089/837] "KOT49D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2f898b32572..305023a27b0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KOT49C +export BUILD_ID=KOT49D From f1b748475105ab8a232a4d47122fa6ccc5f981f5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Nov 2013 20:29:44 -0800 Subject: [PATCH 090/837] "KOT49E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 305023a27b0..8ad899f02fa 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KOT49D +export BUILD_ID=KOT49E From a7e544d7e79a109c02e1f07f15ac21e21b3b9de8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 Nov 2013 16:05:42 -0800 Subject: [PATCH 091/837] KOT49F --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8ad899f02fa..5167ac1d549 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KOT49E +export BUILD_ID=KOT49F From 08c61654feff40eeec04eef40f4970408de1e229 Mon Sep 17 00:00:00 2001 From: Timo Wendt Date: Sat, 23 Nov 2013 23:29:17 +0100 Subject: [PATCH 092/837] build: Fix zip creation on Mac OSX When checking if files are symbolic links, then ota_from_target_files expect the permissions of the file to be 0755 which is always the case on Linux, but not on Mac OSX. I adapted the function so that permissions are not included in the check anymore. Instead it uses only the type attributes of the zip external_attr flags. CM uses the same kind of check. Change-Id: I5d5d0567cb798b765cbc19a66661163f80e21f70 --- tools/releasetools/ota_from_target_files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index c2aba887c64..fe02e05672c 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -110,7 +110,7 @@ def MostPopularKey(d, default): def IsSymlink(info): """Return true if the zipfile.ZipInfo object passed in represents a symlink.""" - return (info.external_attr >> 16) == 0120777 + return (info.external_attr >> 16 & 0770000) == 0120000 def IsRegular(info): """Return true if the zipfile.ZipInfo object passed in represents a From d0cec60db9818d923856cfd4e7f3d363e3ff2518 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 27 Nov 2013 14:47:37 +0000 Subject: [PATCH 093/837] Fix utc date in recovery default.prop We had this in Omni 4.3 but apparently it got lost during the transition to 4.4 Change-Id: I09aed0e35eeeada3f3b998e69b3092741a745385 --- core/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/core/Makefile b/core/Makefile index f13a5971e3e..6ebc01a64c0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -778,6 +778,7 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ $(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys $(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \ > $(TARGET_RECOVERY_ROOT_OUT)/default.prop + $(SED_INPLACE) 's/ro.build.date.utc=.*/ro.build.date.utc=0/g' $(TARGET_RECOVERY_ROOT_OUT)/default.prop $(SED_INPLACE) 's/ro.adb.secure=1/ro.adb.secure=0/g' $(TARGET_RECOVERY_ROOT_OUT)/default.prop @echo -e ${PRT_IMG}"----- Made recovery filesystem -------- $(TARGET_RECOVERY_ROOT_OUT)"${CL_RST} @touch $(TARGET_RECOVERY_ROOT_TIMESTAMP) From fab866aeb8775ace616d22bc46cdb92efc18da31 Mon Sep 17 00:00:00 2001 From: flintman Date: Thu, 7 Nov 2013 19:50:06 -0500 Subject: [PATCH 094/837] build: Add SKIP_SET_METADATA flag On some of the older devices the recovery doesn't support metadata when setting permissions. This allows to use set_perm vs set_metadata. Enable this behavior by setting SKIP_SET_METADATA := true Change-Id: Ib6cf97b5ca28cee8a87975231f3a61b156e77d29 --- core/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/Makefile b/core/Makefile index 6ebc01a64c0..0c3199320cb 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1339,7 +1339,9 @@ 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 +ifneq ($(SKIP_SET_METADATA),true) $(hide) echo "use_set_metadata=1" >> $(zip_root)/META/misc_info.txt +endif $(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt) @# Zip everything up, preserving symlinks $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) From 49725c49b5f1672a81c03f290d9e020df1a39c73 Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Mon, 2 Dec 2013 23:15:30 -0500 Subject: [PATCH 095/837] ota: Disable downgrade check We want users to be able to downgrade their packages. Change-Id: I6bcbd4ee2a02640fe0855b0f1f197a02e914c927 --- tools/releasetools/ota_from_target_files | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index fe02e05672c..1452c97d250 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -410,10 +410,10 @@ def WriteFullOTAPackage(input_zip, output_zip): metadata=metadata, info_dict=OPTIONS.info_dict) - if not OPTIONS.omit_prereq: - ts = GetBuildProp("ro.build.date.utc", OPTIONS.info_dict) - ts_text = GetBuildProp("ro.build.date", OPTIONS.info_dict) - script.AssertOlderBuild(ts, ts_text) +# if not OPTIONS.omit_prereq: +# ts = GetBuildProp("ro.build.date.utc", OPTIONS.info_dict) +# ts_text = GetBuildProp("ro.build.date", OPTIONS.info_dict) +# script.AssertOlderBuild(ts, ts_text) AppendAssertions(script, OPTIONS.info_dict) device_specific.FullOTA_Assertions() From 5de4753a80935c4758bde3f6e846828c81d55c71 Mon Sep 17 00:00:00 2001 From: Dave Langemak Date: Tue, 3 Dec 2013 15:06:56 -0800 Subject: [PATCH 096/837] .1 becomes .2 Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df --- CleanSpec.mk | 3 +++ core/version_defaults.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index c91249738b9..c0525ad6f71 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -208,6 +208,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) # 4.4.1 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +# 4.4.2 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 9ed75c9e5dd..99283b05f30 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 4.4.1 + PLATFORM_VERSION := 4.4.2 endif ifeq "" "$(PLATFORM_SDK_VERSION)" From d470407c27e7dc2406377235ffa1e8e4d10f3c15 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 3 Dec 2013 15:55:29 -0800 Subject: [PATCH 097/837] "KOT49G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5167ac1d549..40900781925 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KOT49F +export BUILD_ID=KOT49G From cbb263e49d84399b972c5b85f4951013feca6a0c Mon Sep 17 00:00:00 2001 From: xplodwild Date: Wed, 4 Dec 2013 22:22:01 +0100 Subject: [PATCH 098/837] build: Add ro.omni.device Some devices, such as n7100, report under another product name in ro.product.name. As this is breaking delta updater, we introduce another variable to retrieve the actual device name as it was used to build. Change-Id: I96ecd189453ea9929884d094a7b846365506c397 --- core/Makefile | 1 + tools/buildinfo.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/core/Makefile b/core/Makefile index 0c3199320cb..aa564ad60ce 100644 --- a/core/Makefile +++ b/core/Makefile @@ -206,6 +206,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( @mkdir -p $(dir $@) $(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \ TARGET_DEVICE="$(TARGET_DEVICE)" \ + OMNI_DEVICE="$(TARGET_DEVICE)" \ PRODUCT_NAME="$(TARGET_PRODUCT)" \ PRODUCT_BRAND="$(PRODUCT_BRAND)" \ PRODUCT_DEFAULT_LANGUAGE="$(call default-locale-language,$(PRODUCT_LOCALES))" \ diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index e3fe99c1114..af8096c9b23 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -42,4 +42,7 @@ echo "ro.build.description=$PRIVATE_BUILD_DESC" echo "ro.build.fingerprint=$BUILD_FINGERPRINT" echo "ro.build.characteristics=$TARGET_AAPT_CHARACTERISTICS" +# Omni properties +echo "ro.omni.device=$OMNI_DEVICE" + echo "# end build properties" From 986567dc07e6053e3b9980419dca496fa8fd90af Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 4 Dec 2013 14:59:51 -0800 Subject: [PATCH 099/837] "KOT49H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40900781925..253a0ba4396 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KOT49G +export BUILD_ID=KOT49H From 9b10cdd6ef64684de44deb84d0dbcfcb50b14d45 Mon Sep 17 00:00:00 2001 From: cybojenix Date: Sat, 2 Nov 2013 17:18:36 +0400 Subject: [PATCH 100/837] core: main: remove all the spam about including make files to disable showing the makefile includes: export HIDE_MAKEFILE_INCLUDES=y Change-Id: Ifd2ef0e239d16b169c572472416c2c31df62a367 --- core/main.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/main.mk b/core/main.mk index cf36b45fc2e..2badea44309 100644 --- a/core/main.mk +++ b/core/main.mk @@ -489,7 +489,11 @@ ifneq ($(dont_bother),true) subdir_makefiles := \ $(shell build/tools/findleaves.py --prune=$(OUT_DIR) --prune=.repo --prune=.git $(subdirs) Android.mk) +ifneq ($(HIDE_MAKEFILE_INCLUDES),y) $(foreach mk, $(subdir_makefiles), $(info including $(mk) ...)$(eval include $(mk))) +else +$(foreach mk, $(subdir_makefiles), $(eval include $(mk))) +endif endif # dont_bother From 8cc2055c39a07bbb93db9595945a7c448ca2ebf1 Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Sat, 7 Dec 2013 10:57:07 -0500 Subject: [PATCH 101/837] roomservice: Change default remote to omnirom Using the default of github results in people unable to use gerrit to submit patches to repos brought in by roomservice Change-Id: Idccd6c35bf81a35135e893ed03f6c5745059ec82 --- tools/roomservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index 8727f09d996..ce38083cfeb 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -34,7 +34,7 @@ # Config # set this to the default remote to use in repo -default_rem = "github" +default_rem = "omnirom" # set this to the default revision to use (branch/tag name) default_rev = "android-4.4" # set this to the remote that you use for projects from your team repos From 67be9379fae2ef757767c40387ae2e29958c41cf Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Sat, 7 Dec 2013 11:05:37 -0500 Subject: [PATCH 102/837] roomservice: Fix handling of devices with _ in their name Currently, roomservice takes every _ in the device tree name and replaces it with / Instead, strip the device name (such as pollux_windy) from the repo name before replacing _ with / and then append it again when we're done Change-Id: Ieabe85ecd8829c959a7296e5cd73f577879c4ffc --- tools/roomservice.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index ce38083cfeb..c506c4db136 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -90,10 +90,12 @@ def get_device_url(git_data): "roomservice".format(device, android_team)) -def parse_device_directory(device_url): +def parse_device_directory(device_url,device): to_strip = "android_device" repo_name = device_url[device_url.index(to_strip) + len(to_strip):] + repo_name = repo_name[:repo_name.index(device)] repo_dir = repo_name.replace("_", "/") + repo_dir = repo_dir + device return "device{}".format(repo_dir) @@ -264,7 +266,7 @@ def fetch_device(device): return git_data = search_github_for_device(device) device_url = get_device_url(git_data) - device_dir = parse_device_directory(device_url) + device_dir = parse_device_directory(device_url,device) project = create_manifest_project(device_url, device_dir, remote=default_team_rem) From 8a767bdd6f08db7f2d4bedbf7796ac484b4c74f8 Mon Sep 17 00:00:00 2001 From: mithun46 Date: Thu, 12 Dec 2013 01:59:05 -0500 Subject: [PATCH 103/837] roomservice: urgent: add "+fork:true" Enable a device config to be found on github if it was forked thx @cybojenix Change-Id: Ic63f82b9ed754dcba17725f5aa75d0011896b09c --- tools/roomservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index c506c4db136..af27cdb08c0 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -55,7 +55,7 @@ def check_repo_exists(git_data): # Note that this can only be done 5 times per minute def search_github_for_device(device): git_search_url = "https://api.github.com/search/repositories" \ - "?q=%40{}+android_device+{}".format(android_team, device) + "?q=%40{}+android_device+{}+fork:true".format(android_team, device) git_req = urllib.request.Request(git_search_url) # this api is a preview at the moment. accept the custom media type git_req.add_header('Accept', 'application/vnd.github.preview') From 2cb71756564ba56c3895886a4c166bc8ed988cab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 13 Dec 2013 18:12:49 -0800 Subject: [PATCH 104/837] KVT49I --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8ad899f02fa..585c72129f4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KOT49E +export BUILD_ID=KVT49I From 884a2175bcc32d95f784f534805977452839591c Mon Sep 17 00:00:00 2001 From: Dave Langemak Date: Tue, 3 Dec 2013 15:06:56 -0800 Subject: [PATCH 105/837] .1 becomes .2 Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df --- CleanSpec.mk | 3 +++ core/version_defaults.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index c91249738b9..c0525ad6f71 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -208,6 +208,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) # 4.4.1 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +# 4.4.2 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 9ed75c9e5dd..99283b05f30 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 4.4.1 + PLATFORM_VERSION := 4.4.2 endif ifeq "" "$(PLATFORM_SDK_VERSION)" From c0abba408d6d65c85ce812f1a3a94fffda93b0a8 Mon Sep 17 00:00:00 2001 From: Dominik Marszk Date: Fri, 6 Dec 2013 16:26:58 +0100 Subject: [PATCH 106/837] repopick: Allow picking batch of commits with the same Change-Id Gerrit does allow assigning the same Change-Id for multiple commits. This patch allows picking them properly. Change-Id: Idedc64f58eebe41a0d212c72329d15acff24efb9 --- tools/repopick.py | 114 +++++++++++++++++++++++----------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/tools/repopick.py b/tools/repopick.py index 304373e5b5f..c3719a9d0aa 100755 --- a/tools/repopick.py +++ b/tools/repopick.py @@ -110,6 +110,7 @@ def execute_cmd(cmd, exit_on_fail=True): if not args.verbose: sys.stderr.write('\nERROR: Command that failed:\n%s' % cmd) sys.exit(1) + return ret # Verifies whether pathA is a subdirectory (or the same) as pathB def is_pathA_subdir_of_pathB(pathA, pathB): @@ -199,73 +200,72 @@ def is_pathA_subdir_of_pathB(pathA, pathB): if matchObj: sys.stderr.write('ERROR: Change number %s was not found on the server\n' % change) sys.exit(1) - d = re.sub(r'\[(.*)\]', r'\1', d) # Parse the JSON try: - data = json.loads(d) + data_array = json.loads(d) except ValueError: sys.stderr.write('ERROR: The response from the server could not be parsed properly\n') if args.verbose: sys.stderr.write('The malformed response was: %s\n' % d) sys.exit(1) + # Enumerate through JSON response + for (i, data) in enumerate(data_array): + date_fluff = '.000000000' + project_name = data['project'] + change_number = data['_number'] + current_revision = data['revisions'][data['current_revision']] + patch_number = current_revision['_number'] + fetch_url = current_revision['fetch']['http']['url'] + fetch_ref = current_revision['fetch']['http']['ref'] + author_name = current_revision['commit']['author']['name'] + author_email = current_revision['commit']['author']['email'] + author_date = current_revision['commit']['author']['date'].replace(date_fluff, '') + committer_name = current_revision['commit']['committer']['name'] + committer_email = current_revision['commit']['committer']['email'] + committer_date = current_revision['commit']['committer']['date'].replace(date_fluff, '') + subject = current_revision['commit']['subject'] - # Extract information from the JSON response - date_fluff = '.000000000' - project_name = data['project'] - change_number = data['_number'] - current_revision = data['revisions'][data['current_revision']] - patch_number = current_revision['_number'] - fetch_url = current_revision['fetch']['http']['url'] - fetch_ref = current_revision['fetch']['http']['ref'] - author_name = current_revision['commit']['author']['name'] - author_email = current_revision['commit']['author']['email'] - author_date = current_revision['commit']['author']['date'].replace(date_fluff, '') - committer_name = current_revision['commit']['committer']['name'] - committer_email = current_revision['commit']['committer']['email'] - committer_date = current_revision['commit']['committer']['date'].replace(date_fluff, '') - subject = current_revision['commit']['subject'] + # Convert the project name to a project path + # - check that the project path exists + if project_name in project_name_to_path: + project_path = project_name_to_path[project_name]; + elif args.ignore_missing: + print('WARNING: Skipping %d since there is no project directory for: %s\n' % (change_number, project_name)) + continue; + else: + sys.stderr.write('ERROR: For %d, could not determine the project path for project %s\n' % (change_number, project_name)) + continue; - # Convert the project name to a project path - # - check that the project path exists - if project_name in project_name_to_path: - project_path = project_name_to_path[project_name]; - elif args.ignore_missing: - print('WARNING: Skipping %d since there is no project directory for: %s\n' % (change_number, project_name)) - continue; - else: - sys.stderr.write('ERROR: For %d, could not determine the project path for project %s\n' % (change_number, project_name)) - sys.exit(1) - - # If --start-branch is given, create the branch (more than once per path is okay; repo ignores gracefully) - if args.start_branch: - cmd = '%s start %s %s' % (repo_bin, args.start_branch[0], project_path) - execute_cmd(cmd) + # If --start-branch is given, create the branch (more than once per path is okay; repo ignores gracefully) + if args.start_branch: + cmd = '%s start %s %s' % (repo_bin, args.start_branch[0], project_path) + execute_cmd(cmd) - # Print out some useful info - if not args.quiet: - print('--> Subject: "%s"' % subject) - print('--> Project path: %s' % project_path) - print('--> Change number: %d (Patch Set %d)' % (change_number, patch_number)) - print('--> Author: %s <%s> %s' % (author_name, author_email, author_date)) - print('--> Committer: %s <%s> %s' % (committer_name, committer_email, committer_date)) + # Print out some useful info + if not args.quiet: + print('--> Subject: "%s"' % subject) + print('--> Project path: %s' % project_path) + print('--> Change number: %d (Patch Set %d)' % (change_number, patch_number)) + print('--> Author: %s <%s> %s' % (author_name, author_email, author_date)) + print('--> Committer: %s <%s> %s' % (committer_name, committer_email, committer_date)) - if args.verbose: - print('Trying to fetch the change from Gerrit') - cmd = 'cd %s && git fetch %s %s' % (project_path, fetch_url, fetch_ref) - execute_cmd(cmd) - # Check if it worked - FETCH_HEAD = '%s/.git/FETCH_HEAD' % project_path - if os.stat(FETCH_HEAD).st_size == 0: - # That didn't work, print error and exit - sys.stderr.write('ERROR: Fetching change from Gerrit failed. Exiting...') - sys.exit(1); - # Perform the cherry-pick or checkout - if args.checkout: - cmd = 'cd %s && git checkout FETCH_HEAD' % (project_path) - else: - cmd = 'cd %s && git cherry-pick FETCH_HEAD' % (project_path) + if args.verbose: + print('Trying to fetch the change %d (Patch Set %d) from Gerrit') + cmd = 'cd %s && git fetch %s %s' % (project_path, fetch_url, fetch_ref) + execute_cmd(cmd) + # Check if it worked + FETCH_HEAD = '%s/.git/FETCH_HEAD' % project_path + if os.stat(FETCH_HEAD).st_size == 0: + # That didn't work, print error and exit + sys.stderr.write('ERROR: Fetching change from Gerrit failed. Exiting...') + continue; + # Perform the cherry-pick or checkout + if args.checkout: + cmd = 'cd %s && git checkout FETCH_HEAD' % (project_path) + else: + cmd = 'cd %s && git cherry-pick FETCH_HEAD' % (project_path) - execute_cmd(cmd) - if not args.quiet: - print('') + execute_cmd(cmd) + if not args.quiet: + print('Change #%d (Patch Set %d) %s into %s' % (change_number, patch_number, 'checked out' if args.checkout else 'cherry-picked', project_path)) From ff4515783ec38b290a81af409beaccd31f8f8166 Mon Sep 17 00:00:00 2001 From: Adam77Root Date: Sat, 21 Dec 2013 17:22:02 +0100 Subject: [PATCH 107/837] installclean: remove *.md5sum Change-Id: Iba47421324bd6bbeabaa80eb66daf6a25621d6a2 --- core/cleanbuild.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/cleanbuild.mk b/core/cleanbuild.mk index 841a219f10c..49585fcf10e 100644 --- a/core/cleanbuild.mk +++ b/core/cleanbuild.mk @@ -182,6 +182,7 @@ installclean_files := \ $(PRODUCT_OUT)/*.txt \ $(PRODUCT_OUT)/*.xlb \ $(PRODUCT_OUT)/*.zip \ + $(PRODUCT_OUT)/*.md5sum \ $(PRODUCT_OUT)/kernel \ $(PRODUCT_OUT)/data \ $(PRODUCT_OUT)/obj/APPS \ From 58b8505e39dea9fd59547ec332418d9163299706 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 8 Nov 2012 22:31:47 -0800 Subject: [PATCH 108/837] unpackbootimg: add a target specifically for unpackbootimg Change-Id: I8c71a56505d155f43d0776074c09404ce6f6d34b --- core/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/Makefile b/core/Makefile index 0ca82001d72..a749488829d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1196,6 +1196,12 @@ OTATOOLS := $(DISTTOOLS) \ .PHONY: otatools otatools: $(OTATOOLS) + +UNPACKBOOTIMG := $(HOST_OUT_EXECUTABLES)/unpackbootimg + +.PHONY: unpackbootimg +unpackbootimg: $(UNPACKBOOTIMG) + # ----------------------------------------------------------------- # A zip of the directories that map to the target filesystem. # This zip can be used to create an OTA package or filesystem image From 259f1cf87d46ede473c5275d40b12428c668e151 Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Fri, 27 Dec 2013 22:26:15 -0500 Subject: [PATCH 109/837] build: Add unpackbootimg to dist_tools Change-Id: I58622b8f0a85db18fabdc2cf96d11c5982a9c9d8 --- core/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/core/Makefile b/core/Makefile index a749488829d..c531c6f8c94 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1178,6 +1178,7 @@ endif DISTTOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_EXECUTABLES)/mkbootfs \ $(HOST_OUT_EXECUTABLES)/mkbootimg \ + $(HOST_OUT_EXECUTABLES)/unpackbootimg \ $(HOST_OUT_EXECUTABLES)/fs_config \ $(HOST_OUT_EXECUTABLES)/mkyaffs2image \ $(HOST_OUT_EXECUTABLES)/zipalign \ From 7d3e233820937f5e035937bf69bb3ebf01eca9a8 Mon Sep 17 00:00:00 2001 From: Zach Date: Sat, 4 Jan 2014 18:52:24 -0500 Subject: [PATCH 110/837] Add ifeq flag to MINIGZIP for devices like tf101 that can not use lzma to compress the kernel without causing problems but can not compile a recovery without a compression like lzma BOARD_NEEDS_LZMA_MINIGZIP := true Change-Id: I0cb8b126234fc5d20ceee83c2eb0266c37e4ff0f --- core/config.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/config.mk b/core/config.mk index 6eac178cce0..38f0c8faec7 100644 --- a/core/config.mk +++ b/core/config.mk @@ -310,7 +310,11 @@ AIDL := $(HOST_OUT_EXECUTABLES)/aidl$(HOST_EXECUTABLE_SUFFIX) PROTOC := $(HOST_OUT_EXECUTABLES)/aprotoc$(HOST_EXECUTABLE_SUFFIX) SIGNAPK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/signapk$(COMMON_JAVA_PACKAGE_SUFFIX) MKBOOTFS := $(HOST_OUT_EXECUTABLES)/mkbootfs$(HOST_EXECUTABLE_SUFFIX) +ifeq ($(BOARD_NEEDS_LZMA_MINIGZIP),true) +MINIGZIP := /usr/bin/lzma +else MINIGZIP := $(HOST_OUT_EXECUTABLES)/minigzip$(HOST_EXECUTABLE_SUFFIX) +endif MKBOOTIMG := $(HOST_OUT_EXECUTABLES)/mkbootimg$(HOST_EXECUTABLE_SUFFIX) MKYAFFS2 := $(HOST_OUT_EXECUTABLES)/mkyaffs2image$(HOST_EXECUTABLE_SUFFIX) APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX) From b4b3a62378ad549c42353d8ab9037b98266af650 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Jan 2014 14:10:11 -0800 Subject: [PATCH 111/837] KVT49K --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 585c72129f4..e926dbf6395 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KVT49I +export BUILD_ID=KVT49K From 54004d146e0532a5d2ded2bbca55d496e081c08b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Jan 2014 11:40:17 -0800 Subject: [PATCH 112/837] "KVT49L" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e926dbf6395..0cfbe7bf804 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KVT49K +export BUILD_ID=KVT49L From bdd4a680daab60052f39d69b107ad859f5bc4190 Mon Sep 17 00:00:00 2001 From: Humberto Borba Date: Sat, 11 Jan 2014 21:49:49 -0200 Subject: [PATCH 113/837] sepolicy: add omni common selinux policy inclusion It is required for https://gerrit.omnirom.org/#/c/4563 Change-Id: I22c47febefd986274b53d69f89df6bff589c8ea0 Signed-off-by: Humberto Borba --- core/config.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/config.mk b/core/config.mk index 38f0c8faec7..2a69462e2d2 100644 --- a/core/config.mk +++ b/core/config.mk @@ -492,4 +492,10 @@ RS_PREBUILT_CLCORE := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/libclcore.bc RS_PREBUILT_LIBPATH := -L prebuilts/ndk/8/platforms/android-9/arch-$(TARGET_ARCH)/usr/lib RS_PREBUILT_COMPILER_RT := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/libcompiler_rt.a +ifneq ($(CUSTOM_BUILD),) +## We need to be sure the global selinux policies are included +## last, to avoid accidental resetting by device configs +$(eval include vendor/omni/sepolicy/sepolicy.mk) +endif + include $(BUILD_SYSTEM)/dumpvar.mk From d24cb9f10b62d8aa4b84ec37cafa50fec86f5a97 Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Sun, 2 Feb 2014 22:32:32 -0500 Subject: [PATCH 114/837] qcom-utils: Add msm8226 to the QCOM board platforms list Change-Id: I953a7dc831f4faf7884efb1ea0567d2c204ee553 --- core/qcom_utils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/qcom_utils.mk b/core/qcom_utils.mk index 359f55c6537..eac5b7c2641 100755 --- a/core/qcom_utils.mk +++ b/core/qcom_utils.mk @@ -4,6 +4,7 @@ QCOM_BOARD_PLATFORMS := msm7x27 QCOM_BOARD_PLATFORMS += msm7x27a QCOM_BOARD_PLATFORMS += msm7x30 QCOM_BOARD_PLATFORMS += qsd8k +QCOM_BOARD_PLATFORMS += msm8226 QCOM_BOARD_PLATFORMS += msm8660 QCOM_BOARD_PLATFORMS += msm8960 QCOM_BOARD_PLATFORMS += msm8974 From 300ffcd78a91e3cb3d5abeadca40b2731b5a23a8 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Sun, 9 Feb 2014 12:22:17 -0600 Subject: [PATCH 115/837] Allow custom recovery init.rc Needed for HTC off-mode charging Change-Id: Icb46985936c01e9e9f864c8a9fd9880d22c83ab1 --- core/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index c531c6f8c94..e1294752e66 100644 --- a/core/Makefile +++ b/core/Makefile @@ -667,7 +667,11 @@ ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY))) INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img -recovery_initrc := $(call include-path-for, recovery)/etc/init.rc +ifneq ($(TARGET_RECOVERY_INITRC),) + recovery_initrc := $(TARGET_RECOVERY_INITRC) # Use target specific init.rc +else + recovery_initrc := $(call include-path-for, recovery)/etc/init.rc +endif ifneq ($(TARGET_PREBUILT_RECOVERY_KERNEL),) recovery_kernel := $(TARGET_PREBUILT_RECOVERY_KERNEL) # Use prebuilt recovery kernel else From e3bace887dc0a3c4eea43dda0f9527cdda2ab80e Mon Sep 17 00:00:00 2001 From: dhacker29 Date: Tue, 28 Jan 2014 15:51:51 -0600 Subject: [PATCH 116/837] Allow devices to specify certain ro. props via TARGET_UNIFIED_DEVICE This modifies buildinfo.sh to not set model, name, description, and fingerprint in build.prop. These can then be set via custom init lib. This also fixes ota_from_target_files to function without these props being preset. Change-Id: Ia7dfcdea5aab7ebf51d3ab29a0d9e5751fc96663 --- core/Makefile | 8 ++++ tools/buildinfo.sh | 15 ++++--- tools/releasetools/ota_from_target_files | 57 +++++++++++++++--------- 3 files changed, 51 insertions(+), 29 deletions(-) diff --git a/core/Makefile b/core/Makefile index e1294752e66..21ed8c527a6 100644 --- a/core/Makefile +++ b/core/Makefile @@ -228,6 +228,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \ TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \ TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \ + TARGET_UNIFIED_DEVICE="$(TARGET_UNIFIED_DEVICE)" \ $(PRODUCT_BUILD_PROP_OVERRIDES) \ bash $(BUILDINFO_SH) > $@ $(hide) $(foreach file,$(system_prop_file), \ @@ -1404,6 +1405,12 @@ else OTA_FROM_TARGET_SCRIPT := $(TARGET_RELEASETOOL_OTA_FROM_TARGET_SCRIPT) endif +ifeq ($(TARGET_UNIFIED_DEVICE),) + $(INTERNAL_OTA_PACKAGE_TARGET): override_prop := false +else + $(INTERNAL_OTA_PACKAGE_TARGET): override_prop := true +endif + $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) @echo -e ${PRT_HST}"Package OTA: $@"${CL_RST} MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \ @@ -1412,6 +1419,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) -k $(KEY_CERT_PAIR) \ --backup=$(backuptool) \ --override_device=$(override_device) \ + --override_prop=$(override_prop) \ $(BUILT_TARGET_FILES_PACKAGE) $@ CUSTOM_TARGET_PACKAGE := $(PRODUCT_OUT)/omni-$(ROM_VERSION).zip diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index af8096c9b23..14cbabdec10 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -15,10 +15,7 @@ echo "ro.build.type=$TARGET_BUILD_TYPE" echo "ro.build.user=$USER" echo "ro.build.host=`hostname`" echo "ro.build.tags=$BUILD_VERSION_TAGS" -echo "ro.product.model=$PRODUCT_MODEL" echo "ro.product.brand=$PRODUCT_BRAND" -echo "ro.product.name=$PRODUCT_NAME" -echo "ro.product.device=$TARGET_DEVICE" echo "ro.product.board=$TARGET_BOOTLOADER_BOARD_NAME" echo "ro.product.cpu.abi=$TARGET_CPU_ABI" if [ -n "$TARGET_CPU_ABI2" ] ; then @@ -36,10 +33,14 @@ echo "ro.board.platform=$TARGET_BOARD_PLATFORM" echo "# ro.build.product is obsolete; use ro.product.device" echo "ro.build.product=$TARGET_DEVICE" - -echo "# Do not try to parse ro.build.description or .fingerprint" -echo "ro.build.description=$PRIVATE_BUILD_DESC" -echo "ro.build.fingerprint=$BUILD_FINGERPRINT" +if [ "$TARGET_UNIFIED_DEVICE" == "" ] ; then + echo "ro.product.model=$PRODUCT_MODEL" + echo "ro.product.name=$PRODUCT_NAME" + echo "ro.product.device=$TARGET_DEVICE" + echo "# Do not try to parse ro.build.description or .fingerprint" + echo "ro.build.description=$PRIVATE_BUILD_DESC" + echo "ro.build.fingerprint=$BUILD_FINGERPRINT" +fi echo "ro.build.characteristics=$TARGET_AAPT_CHARACTERISTICS" # Omni properties diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index d631886088c..8e9f8544112 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -59,6 +59,10 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package --override_device Override device-specific asserts. Can be a comma-separated list. + --override_prop + Override build.prop items with custom vendor init. + Enabled when TARGET_UNIFIED_DEVICE is defined in BoardConfig + """ import sys @@ -97,6 +101,7 @@ OPTIONS.aslr_mode = True OPTIONS.worker_threads = 3 OPTIONS.backuptool = False OPTIONS.override_device = 'auto' +OPTIONS.override_prop = False def MostPopularKey(d, default): """Given a dict, return the key corresponding to the largest @@ -350,9 +355,12 @@ def SignOutput(temp_zip_name, output_zip_name): -def AppendAssertions(script, input_zip): +def AppendAssertions(script, info_dict): if OPTIONS.override_device == "auto": - device = GetBuildProp("ro.product.device", input_zip) + if OPTIONS.override_prop: + device = GetBuildProp("ro.build.product", info_dict) + else: + device = GetBuildProp("ro.product.device", info_dict) else: device = OPTIONS.override_device script.AssertDevice(device) @@ -418,13 +426,14 @@ def WriteFullOTAPackage(input_zip, output_zip): # change very often. script = edify_generator.EdifyGenerator(3, OPTIONS.info_dict) - metadata = {"post-build": GetBuildProp("ro.build.fingerprint", - OPTIONS.info_dict), - "pre-device": GetBuildProp("ro.product.device", - OPTIONS.info_dict), - "post-timestamp": GetBuildProp("ro.build.date.utc", - OPTIONS.info_dict), - } + metadata = {} + metadata["post-timestamp"] = GetBuildProp("ro.build.date.utc", + OPTIONS.info_dict) + if not OPTIONS.override_prop: + metadata["post-build"] = GetBuildProp("ro.build.fingerprint", + OPTIONS.info_dict) + metadata["pre-device"] = GetBuildProp("ro.product.device", + OPTIONS.info_dict) device_specific = common.DeviceSpecificParams( input_zip=input_zip, @@ -554,11 +563,12 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): script = edify_generator.EdifyGenerator(source_version, OPTIONS.target_info_dict) - metadata = {"pre-device": GetBuildProp("ro.product.device", - OPTIONS.source_info_dict), - "post-timestamp": GetBuildProp("ro.build.date.utc", - OPTIONS.target_info_dict), - } + metadata = {} + metadata["post-timestamp"] = GetBuildProp("ro.build.date.utc", + OPTIONS.info_dict) + if not OPTIONS.override_prop: + metadata["pre-device"] = GetBuildProp("ro.product.device", + OPTIONS.info_dict) device_specific = common.DeviceSpecificParams( source_zip=source_zip, @@ -627,13 +637,14 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): patch_list.append((sf.name, tf, sf, tf.size, common.sha1(d).hexdigest())) largest_source_size = max(largest_source_size, sf.size) - source_fp = GetBuildProp("ro.build.fingerprint", OPTIONS.source_info_dict) - target_fp = GetBuildProp("ro.build.fingerprint", OPTIONS.target_info_dict) - metadata["pre-build"] = source_fp - metadata["post-build"] = target_fp + if not OPTIONS.override_prop: + source_fp = GetBuildProp("ro.build.fingerprint", OPTIONS.source_info_dict) + target_fp = GetBuildProp("ro.build.fingerprint", OPTIONS.target_info_dict) + metadata["pre-build"] = source_fp + metadata["post-build"] = target_fp - script.Mount("/system") - script.AssertSomeFingerprint(source_fp, target_fp) + script.Mount("/system") + script.AssertSomeFingerprint(source_fp, target_fp) source_boot = common.GetBootableImage( "/tmp/boot.img", "boot.img", OPTIONS.source_tmp, "BOOT", @@ -865,6 +876,8 @@ def main(argv): OPTIONS.backuptool = bool(a.lower() == 'true') elif o in ("--override_device"): OPTIONS.override_device = a + elif o in ("--override_prop"): + OPTIONS.override_prop = bool(a.lower() == 'true') else: return False return True @@ -880,8 +893,8 @@ def main(argv): "worker_threads=", "aslr_mode=", "backup=", - "override_device=" - ], + "override_device=", + "override_prop="], extra_option_handler=option_handler) if len(args) != 2: From 14a70994154c8db9513c975cca5ac0bb47f6f64c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 27 Feb 2014 11:04:50 -0800 Subject: [PATCH 117/837] Bump version to KTU58 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..f348f4e918e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,6 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK +BUILD_ID := KTU58 DISPLAY_BUILD_NUMBER := true From 1b5dae08c6894ab5992730dd16d0206b143d25c3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 27 Feb 2014 11:06:11 -0800 Subject: [PATCH 118/837] "KTU58" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index f348f4e918e..688224cdde8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KTU58 - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU58 From 687c58871b730a098a1e3e6ec415ccf18ec9d014 Mon Sep 17 00:00:00 2001 From: Archi Date: Fri, 28 Feb 2014 19:18:54 +0100 Subject: [PATCH 119/837] Build: Add support for specifying build variant in brunch/breakfast This little modification allows specifying build variant in brunch/breakfast commands. For example we can use "brunch i9300 user" to build user variant instead of default userdebug. When no extra argument is given, userdebug is default. Change-Id: I2d438209f8a14949c64baa66485c811da384d20b --- envsetup.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/envsetup.sh b/envsetup.sh index d1227d28d4c..25cccb28b87 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -474,6 +474,7 @@ function brunch() function breakfast() { target=$1 + local variant=$2 CUSTOM_DEVICES_ONLY="true" unset LUNCH_MENU_CHOICES add_lunch_combo full-eng @@ -494,7 +495,10 @@ function breakfast() lunch $target else # This is probably just the omni model name - lunch omni_$target-userdebug + if [ -z "$variant" ]; then + variant="userdebug" + fi + lunch omni_$target-$variant fi fi return $? From 5395acf80422d2170381c8b5671be004260ecca9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 3 Mar 2014 10:38:31 -0800 Subject: [PATCH 120/837] Fix version file --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..fe4e2a5daca 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU62 From fe5ad53357858e0b6f039eaf192946a362efeeb7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Mar 2014 06:01:43 -0800 Subject: [PATCH 121/837] "KTU63" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..ba833a28e0b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU63 From 354ac03089399228fc3029be2714b88c9d1da1eb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 5 Mar 2014 07:53:51 -0800 Subject: [PATCH 122/837] "KTU64" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..5f432a2cbc0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU64 From bf59aaa21a55e5f6423c97d6359b4f9bb56833b9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Mar 2014 06:01:18 -0800 Subject: [PATCH 123/837] "KTU65" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..2413107a7b2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU65 From 3090146fc7a2beb60fe182442c655812cb9d76df Mon Sep 17 00:00:00 2001 From: kszaq Date: Wed, 18 Dec 2013 23:16:27 +0100 Subject: [PATCH 124/837] fix scorpion build Change-Id: If746970ce5b97fccfe52bd8603a1902f89d9389e --- libc/arch-arm/scorpion/scorpion.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 libc/arch-arm/scorpion/scorpion.mk diff --git a/libc/arch-arm/scorpion/scorpion.mk b/libc/arch-arm/scorpion/scorpion.mk new file mode 100644 index 00000000000..52bf78bfa0d --- /dev/null +++ b/libc/arch-arm/scorpion/scorpion.mk @@ -0,0 +1,12 @@ +$(call libc-add-cpu-variant-src,MEMCPY,arch-arm/cortex-a15/bionic/memcpy.S) +$(call libc-add-cpu-variant-src,MEMSET,arch-arm/krait/bionic/memset.S) +$(call libc-add-cpu-variant-src,STRCMP,arch-arm/krait/bionic/strcmp.S) +$(call libc-add-cpu-variant-src,MEMMOVE,arch-arm/krait/bionic/memmove.S) +# Use cortex-a15 versions of strcat/strcpy/strlen. +$(call libc-add-cpu-variant-src,STRCAT,arch-arm/cortex-a15/bionic/strcat.S) +$(call libc-add-cpu-variant-src,STRCPY,arch-arm/cortex-a15/bionic/strcpy.S) +$(call libc-add-cpu-variant-src,STRLEN,arch-arm/cortex-a15/bionic/strlen.S) +$(call libc-add-cpu-variant-src,__STRCAT_CHK,arch-arm/cortex-a15/bionic/__strcat_chk.S) +$(call libc-add-cpu-variant-src,__STRCPY_CHK,arch-arm/cortex-a15/bionic/__strcpy_chk.S) + +#include bionic/libc/arch-arm/generic/generic.mk From f566614affa5a885f7dfdb1ed9c1e37ef5139c9f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Mar 2014 06:01:58 -0700 Subject: [PATCH 125/837] "KTU69" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..4408ad14628 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU69 From 9f0c5b79ad4c5016ff754b5b21e06ea34ed3d698 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 11 Mar 2014 06:01:00 -0700 Subject: [PATCH 126/837] "KTU70" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..96d38e32cf5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU70 From 2c0295d8e1b22aa83f0731224ff4444d6a395845 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Mar 2014 06:01:20 -0700 Subject: [PATCH 127/837] "KTU71" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..51006a167f2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU71 From 093697bf49b15276aa2f85316a06b61309940b9b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 13 Mar 2014 06:01:18 -0700 Subject: [PATCH 128/837] "KTU72" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..6264e34442d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU72 From 2bd5b1750113023410fc9bb04f94daace65b6ed4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 13 Mar 2014 12:08:51 -0700 Subject: [PATCH 129/837] "KTU72B" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..437e2ba7343 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU72B From f6453d6f971d594cef36dfa2ee3b66bae1e6a81d Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 7 Mar 2014 16:59:15 -0500 Subject: [PATCH 130/837] build: allow mounting by partition name through edify With more devices migrating over to emulated storage there is a need for increased flexibility when mounting partitions. Edify scripts currently lack the ability to mount emmc partitions by their labels, so busybox is used as a reliable alternative. This allows partitions to be mounted by name while still maintaining compatibility with older recoveries. To use define TARGET_SETS_FSTAB in the device's make files Change-Id: I905740dd566f451b7ac48579a85e1b39a8cfd31a --- core/Makefile | 8 +++++++ tools/releasetools/edify_generator.py | 24 +++++++++++++------- tools/releasetools/ota_from_target_files | 29 ++++++++++++++++-------- 3 files changed, 44 insertions(+), 17 deletions(-) diff --git a/core/Makefile b/core/Makefile index 21ed8c527a6..6c5634249cc 100644 --- a/core/Makefile +++ b/core/Makefile @@ -229,6 +229,7 @@ $(INSTALLED_BUILD_PROP_TARGET): $(BUILDINFO_SH) $(INTERNAL_BUILD_ID_MAKEFILE) $( TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \ TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \ TARGET_UNIFIED_DEVICE="$(TARGET_UNIFIED_DEVICE)" \ + TARGET_SETS_FSTAB="$(TARGET_SETS_FSTAB)" \ $(PRODUCT_BUILD_PROP_OVERRIDES) \ bash $(BUILDINFO_SH) > $@ $(hide) $(foreach file,$(system_prop_file), \ @@ -1411,6 +1412,12 @@ else $(INTERNAL_OTA_PACKAGE_TARGET): override_prop := true endif +ifneq ($(TARGET_SETS_FSTAB),) + $(INTERNAL_OTA_PACKAGE_TARGET): mount_by_label := true +else + $(INTERNAL_OTA_PACKAGE_TARGET): mount_by_label := false +endif + $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) @echo -e ${PRT_HST}"Package OTA: $@"${CL_RST} MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \ @@ -1420,6 +1427,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) --backup=$(backuptool) \ --override_device=$(override_device) \ --override_prop=$(override_prop) \ + --mount_by_label=$(mount_by_label) \ $(BUILT_TARGET_FILES_PACKAGE) $@ CUSTOM_TARGET_PACKAGE := $(PRODUCT_OUT)/omni-$(ROM_VERSION).zip diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index c3b6cda1959..29c05838a89 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -152,14 +152,17 @@ def CacheFreeSpaceCheck(self, amount): self.script.append(('apply_patch_space(%d) || abort("Not enough free space ' 'on /system to apply patches.");') % (amount,)) - def Mount(self, mount_point): + def Mount(self, mount_point, mount_by_label = False): """Mount the partition with the given mount_point.""" fstab = self.info.get("fstab", None) if fstab: p = fstab[mount_point] - self.script.append('mount("%s", "%s", "%s", "%s");' % - (p.fs_type, common.PARTITION_TYPES[p.fs_type], - p.device, p.mount_point)) + if mount_by_label: + self.script.append('run_program("/sbin/mount", "%s");' % (mount_point,)) + else: + self.script.append('mount("%s", "%s", "%s", "%s");' % + (p.fs_type, common.PARTITION_TYPES[p.fs_type], + p.device, p.mount_point)) self.mounts.add(p.mount_point) def Unmount(self, mount_point): @@ -184,7 +187,7 @@ def Print(self, message): """Log a message to the screen (if the logs are visible).""" self.script.append('ui_print("%s");' % (message,)) - def FormatPartition(self, partition): + def FormatPartition(self, partition, mount_by_label = False): """Format the given partition, specified by its mount point (eg, "/system").""" @@ -192,9 +195,14 @@ def FormatPartition(self, partition): fstab = self.info.get("fstab", None) if fstab: p = fstab[partition] - self.script.append('format("%s", "%s", "%s", "%s", "%s");' % - (p.fs_type, common.PARTITION_TYPES[p.fs_type], - p.device, p.length, p.mount_point)) + if mount_by_label: + if not p.mount_point in self.mounts: + self.script.mount(p.mount_point) + self.script.append('run_program("/sbin/rm", "-rf", "%s");' % (p.mount_point,)) + else: + self.script.append('format("%s", "%s", "%s", "%s", "%s");' % + (p.fs_type, common.PARTITION_TYPES[p.fs_type], + p.device, p.length, p.mount_point)) def DeleteFiles(self, file_list): """Delete all files in file_list.""" diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 8e9f8544112..5bc540cd8b5 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -63,6 +63,10 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package Override build.prop items with custom vendor init. Enabled when TARGET_UNIFIED_DEVICE is defined in BoardConfig + --mount_by_label + Force the OTA package to mount and format System by label + Can be enabled by defining TARGET_SETS_FSTAB. Defaults to false. + """ import sys @@ -102,6 +106,7 @@ OPTIONS.worker_threads = 3 OPTIONS.backuptool = False OPTIONS.override_device = 'auto' OPTIONS.override_prop = False +OPTIONS.mount_by_label = False def MostPopularKey(d, default): """Given a dict, return the key corresponding to the largest @@ -454,15 +459,16 @@ def WriteFullOTAPackage(input_zip, output_zip): device_specific.FullOTA_InstallBegin() if OPTIONS.backuptool: - script.Mount("/system") + script.Mount("/system", OPTIONS.mount_by_label) script.RunBackup("backup") - script.Unmount("/system") + if not OPTIONS.mount_by_label: + script.Unmount("/system") script.ShowProgress(0.5, 0) if OPTIONS.wipe_user_data: script.Print("Formatting /data") - script.FormatPartition("/data") + script.FormatPartition("/data", OPTIONS.mount_by_label) script.Print("#######################################"); script.Print("# _____ __ __ ______ #"); @@ -479,9 +485,11 @@ def WriteFullOTAPackage(input_zip, output_zip): WritePolicyConfig(OPTIONS.info_dict["selinux_fc"], output_zip) script.Print("Formatting /system") - script.FormatPartition("/system") - script.Mount("/system") - script.UnpackPackageDir("recovery", "/system") + script.FormatPartition("/system", OPTIONS.mount_by_label) + if not OPTIONS.mount_by_label: + script.Mount("/system") + +# script.UnpackPackageDir("recovery", "/system") script.Print("Extracting /system") script.UnpackPackageDir("system", "/system") @@ -643,7 +651,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): metadata["pre-build"] = source_fp metadata["post-build"] = target_fp - script.Mount("/system") + script.Mount("/system", OPTIONS.mount_by_label) script.AssertSomeFingerprint(source_fp, target_fp) source_boot = common.GetBootableImage( @@ -712,7 +720,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): if OPTIONS.wipe_user_data: script.Print("Erasing user data...") - script.FormatPartition("/data") + script.FormatPartition("/data", OPTIONS.mount_by_label) script.Print("Removing unneeded files...") script.DeleteFiles(["/"+i[0] for i in verbatim_targets] + @@ -878,6 +886,8 @@ def main(argv): OPTIONS.override_device = a elif o in ("--override_prop"): OPTIONS.override_prop = bool(a.lower() == 'true') + elif o in ("--mount_by_label"): + OPTIONS.mount_by_label = bool(a.lower() == 'true') else: return False return True @@ -894,7 +904,8 @@ def main(argv): "aslr_mode=", "backup=", "override_device=", - "override_prop="], + "override_prop=", + "mount_by_label="], extra_option_handler=option_handler) if len(args) != 2: From cffdd0e90ec7a65bc4cbf31c01b3fa5f677c4841 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 17 Mar 2014 06:01:59 -0700 Subject: [PATCH 131/837] "KTU76" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..b6ed9e6e06d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU76 From 1434f5108001202b533702f3da98671370054873 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 18 Mar 2014 06:01:24 -0700 Subject: [PATCH 132/837] "KTU77" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..c219698319f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU77 From 7540a0b8a1b28a6b7112d8df2606613764c26847 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 19 Mar 2014 06:01:25 -0700 Subject: [PATCH 133/837] "KTU78" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..de8e2dd5080 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU78 From 82cb46eac09278673357d2b2fb1e2b13cd04ab37 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 19 Mar 2014 12:55:30 -0700 Subject: [PATCH 134/837] "KTU78B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index de8e2dd5080..c99759950cd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU78 +export BUILD_ID=KTU78B From e926906500b479c42c543bc9703bbbc612ec63e5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Mar 2014 06:01:49 -0700 Subject: [PATCH 135/837] "KTU79" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..e7aaa5755e1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU79 From c235aa17ed485a40147c7955adc56afa811f0cd7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 21 Mar 2014 07:27:58 -0700 Subject: [PATCH 136/837] "KTU79B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e7aaa5755e1..71a668ca74e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU79 +export BUILD_ID=KTU79B From 1e4a1c8c56539b019bbf5ad158bfec03f9c3f23f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 24 Mar 2014 06:02:24 -0700 Subject: [PATCH 137/837] "KTU83" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..10ff0399386 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU83 From b28458a7adc7ede5560af0ada6338d76c55fe48f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 25 Mar 2014 17:07:41 -0700 Subject: [PATCH 138/837] "KTU84" --- core/build_id.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 64ad1339329..1160156696f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,6 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID := KK - -DISPLAY_BUILD_NUMBER := true +export BUILD_ID=KTU84 From 675279e05eadc3f4ba006d0b949c69cd1d6916fc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 27 Mar 2014 13:41:30 -0700 Subject: [PATCH 139/837] "KTU84B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1160156696f..f050e7f5c80 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84 +export BUILD_ID=KTU84B From a2a34e6d3c70c00b3e3d3459bfe8493abb1addcf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 27 Mar 2014 19:59:11 -0700 Subject: [PATCH 140/837] "KTU84C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f050e7f5c80..32d40bf8e41 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84B +export BUILD_ID=KTU84C From a1c067454cd87fda0580ea1c53b31f23d7eda804 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 27 Mar 2014 21:57:18 -0700 Subject: [PATCH 141/837] "KTU84D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 32d40bf8e41..d201a33fc9f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84C +export BUILD_ID=KTU84D From dab5f73423ddb0eaf4d93af90666fa59440cb90f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 28 Mar 2014 09:01:42 -0700 Subject: [PATCH 142/837] "KTU84E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d201a33fc9f..67510d96df3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84D +export BUILD_ID=KTU84E From 914b4fa4547b01e1e001529f70851719c6ea7bec Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 1 Apr 2014 15:11:42 -0700 Subject: [PATCH 143/837] KTU84F --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 67510d96df3..f9014567e64 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84E +export BUILD_ID=KTU84F From 2328f6d660ffc688e19b552fa102fccd66953b54 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 8 Apr 2014 16:13:30 -0700 Subject: [PATCH 144/837] "KTU84G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f9014567e64..83e409f8159 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84F +export BUILD_ID=KTU84G From 7c5c49686583d4122acaaa372c75bff299e1adc5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 17 Apr 2014 13:56:37 -0700 Subject: [PATCH 145/837] "KTU84H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 83e409f8159..caf76e355c9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84G +export BUILD_ID=KTU84H From 8cf55490ab14d4017a337671595c850b683ea1f8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Apr 2014 15:04:49 -0700 Subject: [PATCH 146/837] "KTU84I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index caf76e355c9..ef21521072d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84H +export BUILD_ID=KTU84I From ae7232f88862ce9648d934735cfce56c9407c7fa Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 23 Apr 2014 11:18:11 -0700 Subject: [PATCH 147/837] KTU84J --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ef21521072d..ea310b03d4e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84I +export BUILD_ID=KTU84J From d341e814fa47ffa5963fd26ccc1b1860e8eb0ac9 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Tue, 29 Apr 2014 17:52:58 +0200 Subject: [PATCH 148/837] Revert "fix scorpion build" This commit should be in android_bionic This reverts commit 3090146fc7a2beb60fe182442c655812cb9d76df. Change-Id: Ib991217f86d689d55410bffa70ec8fea3116687d --- libc/arch-arm/scorpion/scorpion.mk | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 libc/arch-arm/scorpion/scorpion.mk diff --git a/libc/arch-arm/scorpion/scorpion.mk b/libc/arch-arm/scorpion/scorpion.mk deleted file mode 100644 index 52bf78bfa0d..00000000000 --- a/libc/arch-arm/scorpion/scorpion.mk +++ /dev/null @@ -1,12 +0,0 @@ -$(call libc-add-cpu-variant-src,MEMCPY,arch-arm/cortex-a15/bionic/memcpy.S) -$(call libc-add-cpu-variant-src,MEMSET,arch-arm/krait/bionic/memset.S) -$(call libc-add-cpu-variant-src,STRCMP,arch-arm/krait/bionic/strcmp.S) -$(call libc-add-cpu-variant-src,MEMMOVE,arch-arm/krait/bionic/memmove.S) -# Use cortex-a15 versions of strcat/strcpy/strlen. -$(call libc-add-cpu-variant-src,STRCAT,arch-arm/cortex-a15/bionic/strcat.S) -$(call libc-add-cpu-variant-src,STRCPY,arch-arm/cortex-a15/bionic/strcpy.S) -$(call libc-add-cpu-variant-src,STRLEN,arch-arm/cortex-a15/bionic/strlen.S) -$(call libc-add-cpu-variant-src,__STRCAT_CHK,arch-arm/cortex-a15/bionic/__strcat_chk.S) -$(call libc-add-cpu-variant-src,__STRCPY_CHK,arch-arm/cortex-a15/bionic/__strcpy_chk.S) - -#include bionic/libc/arch-arm/generic/generic.mk From 366c3794c35b99c200329954bc15bc6716d50997 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 30 Apr 2014 14:29:59 -0700 Subject: [PATCH 149/837] KTU84K --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ea310b03d4e..40e8f32d2ae 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84J +export BUILD_ID=KTU84K From c887789f84eb2dde8ff472ae65218d3c4fe0bad6 Mon Sep 17 00:00:00 2001 From: Vineeth Raj Date: Thu, 1 May 2014 21:03:43 +0530 Subject: [PATCH 150/837] full_base: Don't compile OpenWnn. This package is/was meant to be optional. Change-Id: I41f9b7c6dab50fbaf7ba4e90c22f731e7e8cbce2 --- target/product/full_base.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/product/full_base.mk b/target/product/full_base.mk index c7b05202048..48cc12dafdb 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -21,10 +21,6 @@ PRODUCT_PACKAGES := \ libfwdlockengine \ - OpenWnn \ - libWnnEngDic \ - libWnnJpnDic \ - libwnndict \ VideoEditor \ WAPPushManager From 8329a837279f55fc833ee1e63768c59e9ff693a9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 1 May 2014 13:18:54 -0700 Subject: [PATCH 151/837] "KTV31" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40e8f32d2ae..0115ec225d2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84K +export BUILD_ID=KTV31 From 92d4836264a61ce505ec9de200ff6bba915d4af7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 1 May 2014 13:19:30 -0700 Subject: [PATCH 152/837] "KTU84L" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0115ec225d2..cfa1b7f88e4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTV31 +export BUILD_ID=KTU84L From 1313d4720f8554b47b594812418a2a1247f1ac39 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 7 May 2014 11:43:55 -0700 Subject: [PATCH 153/837] "KTU84M" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cfa1b7f88e4..5b24ae19d5e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84L +export BUILD_ID=KTU84M From 3f48e404bb973c8e042a3b79f3fbe7ca6075bb45 Mon Sep 17 00:00:00 2001 From: nuclearmistake Date: Sun, 27 Apr 2014 21:59:42 -0400 Subject: [PATCH 154/837] Colorize javac errors You know those multi-line ones that are frequently interspersed with other buld output? The ones that don't even have the word "error" in them to search for? This makes them red. ps2: fix jar_check failures cause by leaving empty stderr files in intermediates dirs this is probably not the best place to store stderr before colorizing it if javac exits non-zero, but it seems much lighter than mkdiring a bunch of temp directories or using sed to mangle the paths to point to per-intermediates directory unique temporary file names Change-Id: I3b9b7d8a0c76958588ac1603b6742987d6dde54c Signed-off-by: nuclearmistake --- core/definitions.mk | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index a96b11255d4..298c8aaca4a 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1501,7 +1501,11 @@ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; the -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \ $(PRIVATE_JAVACFLAGS) \ \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \ - || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) \ + 2>$(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \ + && rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \ + || ( if [ -e $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ]; then \ + echo -e ${CL_RED}"`cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr`"${CL_RST} 1>&2; \ + fi; rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR); exit 41 ) \ fi $(if $(PRIVATE_JAVA_LAYERS_FILE), $(hide) build/tools/java-layers.py \ $(PRIVATE_JAVA_LAYERS_FILE) \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq,) @@ -1553,7 +1557,11 @@ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; the -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \ $(PRIVATE_JAVACFLAGS) \ \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \ - || ( exit 41 ) \ + 2>$(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \ + && rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr \ + || ( if [ -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr ]; then \ + echo -e ${CL_RED}"`cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stderr`"${CL_RST} 1>&2; \ + fi; exit 41 ) \ fi $(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list $(hide) rm -f $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq @@ -1866,8 +1874,9 @@ endif ########################################################### ## Commands to call Proguard ########################################################### +@echo -e ${CL_CYN}"Copying:"${CL_RST}" $@" +@echo -e ${CL_GRN}"Proguard:"${CL_RST}" $@" define transform-jar-to-proguard -@echo Proguard: $@ $(hide) $(PROGUARD) -injars $< -outjars $@ $(PRIVATE_PROGUARD_FLAGS) endef From d5685b6a017a0684bb792008734379257b8527bc Mon Sep 17 00:00:00 2001 From: Pulser Date: Wed, 4 Jun 2014 23:08:58 +0200 Subject: [PATCH 155/837] Don't force building recovery - fixing a 4.4.3 merge derp Some devices don't have a recovery.img - for example, Xperia Z etc. This patch comments this out, as it was before the automerge Change-Id: Ib9c123437cd616551818d3d70d3ff5957ae207fe --- tools/releasetools/ota_from_target_files | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 410e92b02d4..d57c4a0f848 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -482,8 +482,8 @@ def WriteFullOTAPackage(input_zip, output_zip): # set up system to update recovery partition on first boot # complete script normally (allow recovery to mark itself finished and reboot) - recovery_img = common.GetBootableImage("recovery.img", "recovery.img", - OPTIONS.input_tmp, "RECOVERY") +# recovery_img = common.GetBootableImage("recovery.img", "recovery.img", +# OPTIONS.input_tmp, "RECOVERY") if OPTIONS.two_step: if not OPTIONS.info_dict.get("multistage_support", None): assert False, "two-step packages not supported by this build" From 676fe87c969ff603fd036da04571ec14f248dab1 Mon Sep 17 00:00:00 2001 From: OmniBot Auto Verifier Date: Thu, 5 Jun 2014 13:36:12 +0200 Subject: [PATCH 156/837] repopick: Don't redirect stdout on --quiet For some reason, when --quiet is specified (example: repopick --quiet -c 7834), git ends up in /home instead of the actual repository. This is a quick workaround until a proper solution is found Change-Id: I60e0f684909a23b557ee3147b8954b71be995319 --- tools/repopick.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/repopick.py b/tools/repopick.py index c3719a9d0aa..423c1e146d6 100755 --- a/tools/repopick.py +++ b/tools/repopick.py @@ -102,9 +102,9 @@ def which(program): def execute_cmd(cmd, exit_on_fail=True): if args.verbose: print('Executing: %s' % cmd) - if args.quiet: - cmd = cmd.replace(' && ', ' &> /dev/null && ') - cmd = cmd + " &> /dev/null" + #if args.quiet: + # cmd = cmd.replace(' && ', ' &> /dev/null && ') + # cmd = cmd + " &> /dev/null" ret = os.system(cmd) if ret and exit_on_fail: if not args.verbose: From 6527127f2320a76ec60d41ee5d361306bcc84d57 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Sat, 28 Dec 2013 15:48:20 -0800 Subject: [PATCH 157/837] build: Add QCOM target-specific config * Needed to support global DirectTract config on legacy targets * Let's also eliminate some boilerplate Change-Id: I668a79e3900219faf2c0b220895700d51a50d813 --- core/config.mk | 3 +++ core/qcom_target.mk | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 core/qcom_target.mk diff --git a/core/config.mk b/core/config.mk index 2a69462e2d2..709b0e2cc8a 100644 --- a/core/config.mk +++ b/core/config.mk @@ -492,6 +492,9 @@ RS_PREBUILT_CLCORE := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/libclcore.bc RS_PREBUILT_LIBPATH := -L prebuilts/ndk/8/platforms/android-9/arch-$(TARGET_ARCH)/usr/lib RS_PREBUILT_COMPILER_RT := prebuilts/sdk/renderscript/lib/$(TARGET_ARCH)/libcompiler_rt.a +# Rules for QCOM targets +include $(BUILD_SYSTEM)/qcom_target.mk + ifneq ($(CUSTOM_BUILD),) ## We need to be sure the global selinux policies are included ## last, to avoid accidental resetting by device configs diff --git a/core/qcom_target.mk b/core/qcom_target.mk new file mode 100644 index 00000000000..24fd6b38606 --- /dev/null +++ b/core/qcom_target.mk @@ -0,0 +1,21 @@ +# Target-specific configuration + +# Enable DirectTrack on QCOM legacy boards +ifeq ($(BOARD_USES_QCOM_HARDWARE),true) + + TARGET_GLOBAL_CFLAGS += -DQCOM_HARDWARE + TARGET_GLOBAL_CPPFLAGS += -DQCOM_HARDWARE + + ifeq ($(TARGET_USES_QCOM_BSP),true) + TARGET_GLOBAL_CFLAGS += -DQCOM_BSP + TARGET_GLOBAL_CPPFLAGS += -DQCOM_BSP + endif + + # Enable DirectTrack for legacy targets + ifneq ($(filter caf caf-bfam,$(TARGET_QCOM_AUDIO_VARIANT)),) + ifeq ($(BOARD_USES_LEGACY_ALSA_AUDIO),true) + TARGET_GLOBAL_CFLAGS += -DQCOM_DIRECTTRACK + TARGET_GLOBAL_CPPFLAGS += -DQCOM_DIRECTTRACK + endif + endif +endif From 7f83b7c75b9e2a2602158065e2aeca91cc0864d4 Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Fri, 6 Jun 2014 13:34:42 -0700 Subject: [PATCH 158/837] MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE Make is so. Change-Id: I06b8c8c491e6e355124b6fea41893155ea4c07d0 --- CleanSpec.mk | 3 +++ core/version_defaults.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 2f1def0100d..dcf40949ead 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -214,6 +214,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) # 4.4.3 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +# 4.4.4 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 1e172edaa61..51a83829fbd 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 4.4.3 + PLATFORM_VERSION := 4.4.4 endif ifeq "" "$(PLATFORM_SDK_VERSION)" From 27aae429d6c3886c3e1acd082a318d73b50a4958 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 12 Jun 2014 23:17:10 -0700 Subject: [PATCH 159/837] "KTU84P" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5b24ae19d5e..70062c140dd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=KTU84M +export BUILD_ID=KTU84P From 4b5c983df4e64c0ac43c9b96002eccdf436ba672 Mon Sep 17 00:00:00 2001 From: eloimuns Date: Fri, 20 Jun 2014 16:38:04 +0200 Subject: [PATCH 160/837] Support legacy qcom audio variant Change-Id: I592c6b19f08826985139695df66673d46a685004 --- core/qcom_target.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/qcom_target.mk b/core/qcom_target.mk index 24fd6b38606..72140fda104 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -12,7 +12,7 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) endif # Enable DirectTrack for legacy targets - ifneq ($(filter caf caf-bfam,$(TARGET_QCOM_AUDIO_VARIANT)),) + ifneq ($(filter caf caf-bfam legacy,$(TARGET_QCOM_AUDIO_VARIANT)),) ifeq ($(BOARD_USES_LEGACY_ALSA_AUDIO),true) TARGET_GLOBAL_CFLAGS += -DQCOM_DIRECTTRACK TARGET_GLOBAL_CPPFLAGS += -DQCOM_DIRECTTRACK From 8e2431177108e78a3fbb75428397e22fc3998f37 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Wed, 11 Jun 2014 20:58:41 -0500 Subject: [PATCH 161/837] Set CPU-specific optimizations for all supported variants Change-Id: I401fecf5314e854a2a0b3bb2f9b6f6afb3a1b4b4 --- core/combo/arch/arm/armv7-a-neon.mk | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk index 6a8dc270398..fb3d701b3ed 100644 --- a/core/combo/arch/arm/armv7-a-neon.mk +++ b/core/combo/arch/arm/armv7-a-neon.mk @@ -7,19 +7,35 @@ ARCH_ARM_HAVE_VFP := true ARCH_ARM_HAVE_VFP_D32 := true ARCH_ARM_HAVE_NEON := true -ifeq ($(strip $(TARGET_CPU_VARIANT)), cortex-a15) +ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a15) arch_variant_cflags := -mcpu=cortex-a15 else +ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a9) + arch_variant_cflags := -mcpu=cortex-a9 +else ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a8) arch_variant_cflags := -mcpu=cortex-a8 else ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a7) arch_variant_cflags := -mcpu=cortex-a7 +else +ifeq ($(strip $(TARGET_CPU_VARIANT)),cortex-a5) + arch_variant_cflags := -mcpu=cortex-a5 +else +ifeq ($(strip $(TARGET_CPU_VARIANT)),krait) + arch_variant_cflags := -mcpu=cortex-a9 +else +ifeq ($(strip $(TARGET_CPU_VARIANT)),scorpion) + arch_variant_cflags := -mcpu=cortex-a8 else arch_variant_cflags := -march=armv7-a endif endif endif +endif +endif +endif +endif arch_variant_cflags += \ -mfloat-abi=softfp \ From 57c8cdd9c0f3da142c093ca1b1a2f509c51520e7 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Mon, 30 Jun 2014 14:36:09 +0300 Subject: [PATCH 162/837] build: Fix disabling PIE Commit 419b7227dd7ed2a23faaba0d393d6d6ee5c46925 was not cherry-picked properly and the correct cflags were never set Change-Id: I3bc6014fe791e2e8a4cca5106e70f23279c5e43c --- core/combo/TARGET_linux-arm.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index ece5b98b94b..34976627fba 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -93,6 +93,14 @@ ifeq ($(FORCE_ARM_DEBUGGING),true) TARGET_thumb_CFLAGS += -marm -fno-omit-frame-pointer endif +ifeq ($(TARGET_DISABLE_ARM_PIE),true) + PIE_GLOBAL_CFLAGS := + PIE_EXECUTABLE_TRANSFORM := +else + PIE_GLOBAL_CFLAGS := -fPIE + PIE_EXECUTABLE_TRANSFORM := -fPIE -pie +endif + android_config_h := $(call select-android-config-h,linux-arm) TARGET_GLOBAL_CFLAGS += \ From f377ff6c0ef30596d5458898f5f755bbb7e5717b Mon Sep 17 00:00:00 2001 From: Tom Marshall Date: Fri, 16 May 2014 13:46:24 -0700 Subject: [PATCH 163/837] build: Set ccache base to build top This enables ccache sharing between different build tree paths. Change-Id: I99636bdd2779a6ccf0649f027e35cf67df44b6ae --- core/combo/select.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/combo/select.mk b/core/combo/select.mk index e485d00e2a9..9481937ff22 100644 --- a/core/combo/select.mk +++ b/core/combo/select.mk @@ -75,7 +75,7 @@ ifneq ($(USE_CCACHE),) # We don't really use system headers much so the rootdir is # fine; ensures these paths are relative for all Android trees # on a workstation. - export CCACHE_BASEDIR := / + export CCACHE_BASEDIR := $(ANDROID_BUILD_TOP) CCACHE_HOST_TAG := $(HOST_PREBUILT_TAG) # If we are cross-compiling Windows binaries on Linux From 92123d59c314c75b907f7f1b32c6a4c9e2572b20 Mon Sep 17 00:00:00 2001 From: Mike Grissom Date: Mon, 26 Aug 2013 16:09:51 -0700 Subject: [PATCH 164/837] Don't set CCACHE_BASEDIR if its already set * enable use of shared ccache Change-Id: Ic708a5d5169291d674b167aa2c87bf2c8adaafae --- core/combo/select.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/combo/select.mk b/core/combo/select.mk index 9481937ff22..d5f7379d684 100644 --- a/core/combo/select.mk +++ b/core/combo/select.mk @@ -75,7 +75,9 @@ ifneq ($(USE_CCACHE),) # We don't really use system headers much so the rootdir is # fine; ensures these paths are relative for all Android trees # on a workstation. - export CCACHE_BASEDIR := $(ANDROID_BUILD_TOP) + ifeq ($(CCACHE_BASEDIR),) + export CCACHE_BASEDIR := $(ANDROID_BUILD_TOP) + endif CCACHE_HOST_TAG := $(HOST_PREBUILT_TAG) # If we are cross-compiling Windows binaries on Linux From 14d38ebeb58c3ab86e109bdf2f0147baeedec867 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 14 Jul 2014 06:00:34 -0700 Subject: [PATCH 165/837] "LRW14B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index dd020250292..e4ea2c4cfd4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LDW13B +export BUILD_ID=LRW14B From 60cbf9d76d4c5180d8900c4f1f83da35ec8ba098 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 14 Jul 2014 16:10:47 -0700 Subject: [PATCH 166/837] "LRW14C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e4ea2c4cfd4..dc53d0c87df 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW14B +export BUILD_ID=LRW14C From 44eee614b1fbb215fdbc11fc6557c2acae7b91a8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 15 Jul 2014 05:20:15 -0700 Subject: [PATCH 167/837] "LRW15" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..35753ab000f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW15 From ac34efde62840bb8ad0c915cb4fd69a8cb6d060e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 15 Jul 2014 10:31:49 -0700 Subject: [PATCH 168/837] "LRW15B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 35753ab000f..d905752701c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW15 +export BUILD_ID=LRW15B From cbecaee42e594265198a914c426038e9fc4e5f78 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 15 Jul 2014 12:02:59 -0700 Subject: [PATCH 169/837] LRW15C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d905752701c..ff9d4ff6a0f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW15B +export BUILD_ID=LRW15C From 5ea3b0bf3378868751c5f9e21995f91253bd2c5c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 15 Jul 2014 17:12:05 -0700 Subject: [PATCH 170/837] "LRW14D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ff9d4ff6a0f..136f75cf6cc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW15C +export BUILD_ID=LRW14D From 4cabdf1b5f73a08fd93ce6569ccbc44d129dd4fa Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 15 Jul 2014 19:01:18 -0700 Subject: [PATCH 171/837] LRW15D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 136f75cf6cc..3f2e2401ea1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW14D +export BUILD_ID=LRW15D From 7e228a40e05fbaddd06bf911857f5f075c3f1e49 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 16 Jul 2014 05:19:46 -0700 Subject: [PATCH 172/837] "LRW16" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..420a60b9807 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW16 From 8a3ebf5f0e409738348989fab809a0c9a291cf50 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 16 Jul 2014 15:11:34 -0700 Subject: [PATCH 173/837] "LRW16B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 420a60b9807..66eabaf66ef 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW16 +export BUILD_ID=LRW16B From b094cdb55310c8fe622a4dd142edd7b266e10398 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 17 Jul 2014 05:14:35 -0700 Subject: [PATCH 174/837] "LRW17" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..a2f9a2619b6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW17 From 36067d1d21cad33a4c229bab031c9fedb7441229 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 17 Jul 2014 11:36:25 -0700 Subject: [PATCH 175/837] "LRW17B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a2f9a2619b6..603f12234b6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW17 +export BUILD_ID=LRW17B From 4f946d9c759b109ec818466e194b4fa2daa0a04e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 17 Jul 2014 15:05:44 -0700 Subject: [PATCH 176/837] "LRW17C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 603f12234b6..e246d41b548 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW17B +export BUILD_ID=LRW17C From faec89558ea9b398c60f3082ca8efb6d8912509c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 17 Jul 2014 23:54:10 -0700 Subject: [PATCH 177/837] "LRW17D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e246d41b548..c632b6dd599 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW17C +export BUILD_ID=LRW17D From c201f001c63ae966f75e88f5f58894c415c83feb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 19 Jul 2014 03:11:57 -0700 Subject: [PATCH 178/837] "LRW19" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..96eba56499a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW19 From 940db26dc96c4dc646bbff13098c7fa88076e305 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 20 Jul 2014 06:10:32 -0700 Subject: [PATCH 179/837] "LRW20" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..9dd3c928d2a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW20 From 79342e4635927405533b674ba5de61992aeca3e6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Jul 2014 06:09:41 -0700 Subject: [PATCH 180/837] "LRW21" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..7c2dd94c886 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW21 From 21d5d0d5a4174795090deaa6fe3c9d3113934ec9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Jul 2014 14:53:35 -0700 Subject: [PATCH 181/837] "LRW21B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7c2dd94c886..124778e8c8c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW21 +export BUILD_ID=LRW21B From d22b381f437135fc55a5b84080cab7dff9c40f96 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Jul 2014 17:33:32 -0700 Subject: [PATCH 182/837] "LRW21C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 124778e8c8c..edd7a8d10e9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW21B +export BUILD_ID=LRW21C From b106db64e8d3c6807c06b65db474e073044f3002 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Jul 2014 19:00:07 -0700 Subject: [PATCH 183/837] LRW21D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index edd7a8d10e9..bf8a4b85af3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW21C +export BUILD_ID=LRW21D From 721b1fa38e46b6ec0507e1de290febc41aa2490c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Jul 2014 06:11:11 -0700 Subject: [PATCH 184/837] "LRW22" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..a81de9414aa 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW22 From f35d2710a9fa93376066cd6fa9a949dbd8034778 Mon Sep 17 00:00:00 2001 From: Jiangyi Date: Fri, 18 Jul 2014 15:53:13 -0400 Subject: [PATCH 185/837] build: Add chromium prebuilt support to envsetup.sh && The core Makefile This adds a chromium_prebuilt function to envsetup.sh that is invoked by lunch to check whether the chromium prebuilts are up-to-date or not. If not, it will be built from source and then the new source built version will be pulled during brunch/mka bacon to become the new prebuilts for future builds. This is all opt-in through the USE_PREBUILT_CHROMIUM flag. Without it being set to 1, none of this would be ran, and regular operations will go on. PS13: -use export TARGET_DEVICE -replace git -C with params compatible to old git versions Change-Id: I40f8c8dbd2a8a84a5c1b9f47ee04180a71ef4e07 --- core/Makefile | 6 ++++++ envsetup.sh | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/core/Makefile b/core/Makefile index e8b54322692..d27733bb80d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1439,6 +1439,12 @@ otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) bacon: otapackage $(hide) ln -f $(INTERNAL_OTA_PACKAGE_TARGET) $(CUSTOM_TARGET_PACKAGE) $(hide) $(MD5SUM) $(CUSTOM_TARGET_PACKAGE) > $(CUSTOM_TARGET_PACKAGE).md5sum +ifeq ($(USE_PREBUILT_CHROMIUM),1) +ifneq ($(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes) + @echo "Running Chromium prebuilt setup script..." + $(hide) . $(TOPDIR)vendor/omni/utils/chromium_prebuilt.sh $(TOP) +endif +endif @echo -e ${PRT_CPL}"Package complete: $(CUSTOM_TARGET_PACKAGE)"${CL_RST} # ----------------------------------------------------------------- diff --git a/envsetup.sh b/envsetup.sh index 25cccb28b87..1f1e349520b 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -589,10 +589,18 @@ function lunch() echo + if [[ $USE_PREBUILT_CHROMIUM -eq 1 ]]; then + chromium_prebuilt + else + # Unset flag in case user opts out later on + export PRODUCT_PREBUILT_WEBVIEWCHROMIUM="" + fi + fixup_common_out_dir set_stuff_for_environment printconfig + } # Tab completion for lunch. @@ -1446,6 +1454,20 @@ function pez { return $retval } +function chromium_prebuilt() { + T=$(gettop) + export TARGET_DEVICE=$(get_build_var TARGET_DEVICE) + hash=$T/prebuilts/chromium/$TARGET_DEVICE/hash.txt + + if [ -r $hash ] && [ $(git --git-dir=$T/external/chromium/.git --work-tree=$T/external/chromium rev-parse --verify HEAD) == $(cat $hash) ]; then + export PRODUCT_PREBUILT_WEBVIEWCHROMIUM=yes + echo "** Prebuilt Chromium is up-to-date; Will be used for build **" + else + export PRODUCT_PREBUILT_WEBVIEWCHROMIUM=no + echo "** Prebuilt Chromium out-of-date/not found; Will build from source **" + fi +} + if [ "x$SHELL" != "x/bin/bash" ]; then case `ps -o command -p $$` in *bash*) From e81afcb4e7daa40aa5937460bc5a14384ec3688e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Jul 2014 14:27:02 -0700 Subject: [PATCH 186/837] "LRW22B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a81de9414aa..5121d7433b2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW22 +export BUILD_ID=LRW22B From 9bdcfec5656fdfe04aa196639b7575ea29322acc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 23 Jul 2014 06:12:18 -0700 Subject: [PATCH 187/837] "LRW23" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..cadabaeeb78 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW23 From 237ee05499a4b8fa696e97b97778823984c4c3e9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 23 Jul 2014 14:47:56 -0700 Subject: [PATCH 188/837] "LRW23B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cadabaeeb78..26e5d629092 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW23 +export BUILD_ID=LRW23B From f846a4ea5d36889ccad94566d94bf2cdf5b02bde Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 23 Jul 2014 15:40:25 -0700 Subject: [PATCH 189/837] "LRW23C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 26e5d629092..595df28f808 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW23B +export BUILD_ID=LRW23C From b7db98f40063b846f1a7a4ea22f7434fd0c73294 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 24 Jul 2014 06:11:07 -0700 Subject: [PATCH 190/837] "LRW24" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..e13f1a23829 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW24 From c5a59ea24206204fcadcc9359b2b2c1f6bd716cb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 24 Jul 2014 12:08:46 -0700 Subject: [PATCH 191/837] "LRW24B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e13f1a23829..f3c8b9432be 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW24 +export BUILD_ID=LRW24B From f6e46dc1881694be365670e00568fdd8061302fc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 24 Jul 2014 14:28:12 -0700 Subject: [PATCH 192/837] "LRW24C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f3c8b9432be..a8890616143 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW24B +export BUILD_ID=LRW24C From 2ae182d8dea22cd6a0df59a5226805333e4bca4f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 24 Jul 2014 16:05:16 -0700 Subject: [PATCH 193/837] "LRW24D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a8890616143..dbc40306ee4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW24C +export BUILD_ID=LRW24D From 9118efb22b7573bbdefd3807c1aaf26051e7a52e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 24 Jul 2014 18:26:43 -0700 Subject: [PATCH 194/837] "LRW24E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index dbc40306ee4..4c5df4446ce 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW24D +export BUILD_ID=LRW24E From 44e0bc52ddcd9396202f25bd280a50f63392497e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 25 Jul 2014 00:27:32 -0700 Subject: [PATCH 195/837] "LRW24F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4c5df4446ce..4f9b7d01068 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW24E +export BUILD_ID=LRW24F From c0a149f6ff8e7f793f3285b31716c8c86e9934e2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 25 Jul 2014 12:37:39 -0700 Subject: [PATCH 196/837] "LRW24G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4f9b7d01068..f9ede45f47a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW24F +export BUILD_ID=LRW24G From 2231160c80e1c12146b2585bf1572f34c8109485 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 26 Jul 2014 06:12:11 -0700 Subject: [PATCH 197/837] "LRW26" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..75e9f5663a0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW26 From 31f185c87173493355ada6cb80d6ce47f5650d18 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 27 Jul 2014 06:09:28 -0700 Subject: [PATCH 198/837] "LRW27" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..a19e4846ab5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW27 From afa26ec8c8e0181df1eaeaaf2f99ae7dd2507197 Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Wed, 6 Nov 2013 11:01:46 +0100 Subject: [PATCH 199/837] Revert "FM Radio: Add support for FM Radio in Android" * fmradio folder is not currenly present in frameworks/base, so remove the inclusion of it to avoid warnings during build. This reverts commit ef83ac85d91285eeb7c567cd93a5c83d2fa7714d. Change-Id: I38af983ed74e0ee36172ad5e934ca48529760fb6 --- core/pathmap.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/core/pathmap.mk b/core/pathmap.mk index 754da2b6cf6..5dfc543756f 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -90,7 +90,6 @@ FRAMEWORKS_BASE_SUBDIRS := \ telephony \ wifi \ keystore \ - fmradio \ ) # From 97717dd8de742ce2dba45fb6604cb58c2d07eaee Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 28 Jul 2014 09:21:18 -0700 Subject: [PATCH 200/837] "LRW28" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..d4ae8010a70 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW28 From 7d2a12ad7174d7858f4096a19a6612f9526208e7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 28 Jul 2014 14:33:09 -0700 Subject: [PATCH 201/837] "LRW28B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d4ae8010a70..80d81551b10 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW28 +export BUILD_ID=LRW28B From 6e469d1e89536e9bf20e419d53cbcb9f156ef2a5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 29 Jul 2014 06:12:41 -0700 Subject: [PATCH 202/837] "LRW29" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..456fb6c001c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW29 From bf3ed1260dd87cae288563ae55ce3f15b45d13f1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 29 Jul 2014 14:53:07 -0700 Subject: [PATCH 203/837] "LRW29B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 456fb6c001c..88f8649c4da 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW29 +export BUILD_ID=LRW29B From 4cac87381c638cdfd3076bb149dc5789f71c39cc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 29 Jul 2014 18:22:49 -0700 Subject: [PATCH 204/837] "LRW29C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 88f8649c4da..636453eedbc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW29B +export BUILD_ID=LRW29C From ad2796974cc316fd717bc3d62ab98d9b11af1c36 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 30 Jul 2014 10:21:45 -0700 Subject: [PATCH 205/837] "LRW29D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 636453eedbc..563213b20ad 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW29C +export BUILD_ID=LRW29D From b74d135b010ac52fde556ab6142c59473d70b114 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 30 Jul 2014 15:59:21 -0700 Subject: [PATCH 206/837] "LRW29E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 563213b20ad..b1071580a7c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW29D +export BUILD_ID=LRW29E From 2f94575b861da36b83a2a6ef918dfd54c6541fe8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 30 Jul 2014 18:46:40 -0700 Subject: [PATCH 207/837] "LRW29F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b1071580a7c..62536b1e318 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW29E +export BUILD_ID=LRW29F From 58c109006b544b721e3559501c2838f769af0f31 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 30 Jul 2014 21:07:48 -0700 Subject: [PATCH 208/837] LRW29G --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 62536b1e318..12b147cf225 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW29F +export BUILD_ID=LRW29G From 28dac35b549abedf89fe77c6fe1fc171b16d617f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 1 Aug 2014 09:13:39 -0700 Subject: [PATCH 209/837] "LRW29H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 12b147cf225..b5132f2ed79 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW29G +export BUILD_ID=LRW29H From 280c02476e32652401264e9722147e798778c6e1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 2 Aug 2014 06:13:08 -0700 Subject: [PATCH 210/837] "LRW33" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..5df42ed6b8f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW33 From 185c0829c22cd1abb0ac16eb6c49f14175de229f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 3 Aug 2014 06:09:51 -0700 Subject: [PATCH 211/837] "LRW34" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..40fd94d3550 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW34 From 0a8ecb763093e216da8a9be1045d22d03575d648 Mon Sep 17 00:00:00 2001 From: Jens Andersen Date: Sun, 3 Aug 2014 20:04:31 +0000 Subject: [PATCH 212/837] Make repopick support gerrit 2.9 Change-Id: I5b5fcfdfb69fd8639a7170f68966817ba1bb98b7 --- tools/repopick.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/repopick.py b/tools/repopick.py index 423c1e146d6..8376744ca67 100755 --- a/tools/repopick.py +++ b/tools/repopick.py @@ -216,8 +216,13 @@ def is_pathA_subdir_of_pathB(pathA, pathB): change_number = data['_number'] current_revision = data['revisions'][data['current_revision']] patch_number = current_revision['_number'] - fetch_url = current_revision['fetch']['http']['url'] - fetch_ref = current_revision['fetch']['http']['ref'] + # Backwards compatibility + if 'http' in current_revision['fetch']: + fetch_url = current_revision['fetch']['http']['url'] + fetch_ref = current_revision['fetch']['http']['ref'] + else: + fetch_url = current_revision['fetch']['anonymous http']['url'] + fetch_ref = current_revision['fetch']['anonymous http']['ref'] author_name = current_revision['commit']['author']['name'] author_email = current_revision['commit']['author']['email'] author_date = current_revision['commit']['author']['date'].replace(date_fluff, '') From 3223c3e94230f4db310d3d24a14da4b0660335ff Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 4 Aug 2014 06:09:50 -0700 Subject: [PATCH 213/837] "LRW35" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..abc9ff73e6c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW35 From 6ba37faa40df852288302a03b04c3b3cca10d563 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 5 Aug 2014 06:11:18 -0700 Subject: [PATCH 214/837] "LRW36" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..c2338fb1314 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW36 From c28d2b42bad9bca85857b1b1d8ae2ebe93b5aa92 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 5 Aug 2014 15:18:36 -0700 Subject: [PATCH 215/837] "LRW36B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c2338fb1314..3c0851c6aef 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW36 +export BUILD_ID=LRW36B From af3aa4a4ae63d610de9f3f3c991a40164a7721a2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 6 Aug 2014 06:12:59 -0700 Subject: [PATCH 216/837] "LRW37" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..14ac16c5dec 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW37 From b83e597ed712b6026124f58b6b4e5b3c879d16c6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 6 Aug 2014 15:48:31 -0700 Subject: [PATCH 217/837] "LRW37B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 14ac16c5dec..91ea703bb30 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW37 +export BUILD_ID=LRW37B From 8141150eb43c27b747a0f7f544b7d8031f357237 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 6 Aug 2014 18:24:36 -0700 Subject: [PATCH 218/837] LRW37C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 91ea703bb30..6fa320c3de5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW37B +export BUILD_ID=LRW37C From 7692975bcea6dd056e668ed79822c5ad89913ec1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Aug 2014 06:13:09 -0700 Subject: [PATCH 219/837] "LRW38" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..4d8485aafcc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW38 From 16ff1e0da17a29d695f73ceda29d67506503e3df Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Aug 2014 11:46:51 -0700 Subject: [PATCH 220/837] LRW38B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4d8485aafcc..742c944f4da 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW38 +export BUILD_ID=LRW38B From 394f13eb17e522d5dce0cbe291dcc62268008f5c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Aug 2014 15:26:55 -0700 Subject: [PATCH 221/837] "LRW38C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 742c944f4da..1ae2e7a935c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW38B +export BUILD_ID=LRW38C From 82b8424983d6af4b13f92cb1b33fbcc1021cead5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Aug 2014 16:56:46 -0700 Subject: [PATCH 222/837] "LRW38D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1ae2e7a935c..4d43e17330b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW38C +export BUILD_ID=LRW38D From de5c1fd971e959ffc7d9fc903e6ea71c4c59d260 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 Aug 2014 07:44:30 -0700 Subject: [PATCH 223/837] "LRW38E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4d43e17330b..afe04b910a5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW38D +export BUILD_ID=LRW38E From 68030695dea3d500d440ae41609e96982094f175 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 Aug 2014 12:49:36 -0700 Subject: [PATCH 224/837] "LRW38F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index afe04b910a5..f5dc1680064 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW38E +export BUILD_ID=LRW38F From 85e6fad5e679f8caafa7b7b8800cdc3e3af579ac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 Aug 2014 15:40:00 -0700 Subject: [PATCH 225/837] LRW38G --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f5dc1680064..cc357a6684a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW38F +export BUILD_ID=LRW38G From 0595e152f950f7f1e5c0e755a20fdce259added9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 Aug 2014 17:12:16 -0700 Subject: [PATCH 226/837] LRW38H --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cc357a6684a..f47182c2c5a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW38G +export BUILD_ID=LRW38H From f309eb51f3dae289570064f8eb56b8f11f685d4d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 Aug 2014 19:05:49 -0700 Subject: [PATCH 227/837] "LRW38I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f47182c2c5a..4ca5e23df9c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW38H +export BUILD_ID=LRW38I From b68b319c984b5cea4256330433cff1903016f1f0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 9 Aug 2014 06:14:31 -0700 Subject: [PATCH 228/837] "LRW40" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..189aefc91ee 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW40 From 457bd7b6b1d4ccd5ee2a3a8029ef91e7b52547d9 Mon Sep 17 00:00:00 2001 From: maxwen Date: Fri, 8 Aug 2014 15:23:21 +0200 Subject: [PATCH 229/837] build: Set default sound properites to existing files this fixes the default values for those sounds in settings and other troubles coming from it e.g. alarm clock Change-Id: I824c974c2c14b6dac127dbaa1922ef2ae64721eb --- target/product/core_base.mk | 4 ++-- target/product/full_base.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/target/product/core_base.mk b/target/product/core_base.mk index 603acadafd7..79f20c8970c 100644 --- a/target/product/core_base.mk +++ b/target/product/core_base.mk @@ -17,8 +17,8 @@ # that should not be in PDK should be added in lower level like core.mk. PRODUCT_PROPERTY_OVERRIDES := \ - ro.config.notification_sound=OnTheHunt.ogg \ - ro.config.alarm_alert=Alarm_Classic.ogg + ro.config.alarm_alert=Argon.ogg \ + ro.config.notification_sound=pixiedust.ogg PRODUCT_PACKAGES += \ ContactsProvider \ diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 48cc12dafdb..4546ef72e87 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -38,7 +38,8 @@ PRODUCT_PACKAGES += \ # Additional settings used in all AOSP builds PRODUCT_PROPERTY_OVERRIDES := \ ro.com.android.dateformat=MM-dd-yyyy \ - ro.config.ringtone=Ring_Synth_04.ogg \ + ro.config.alarm_alert=Argon.ogg \ + ro.config.ringtone=Orion.ogg \ ro.config.notification_sound=pixiedust.ogg # Put en_US first in the list, so make it default. From 3f697e6ca2a9d2c0d04de99503e6a59d57398a90 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 10 Aug 2014 06:10:00 -0700 Subject: [PATCH 230/837] "LRW41" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..73e9ab7dd2e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW41 From c63ab6a91adbf177ec430ce409a180a1ce1462d6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 Aug 2014 06:22:05 +0000 Subject: [PATCH 231/837] "LRW42" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..3a9e98a14d3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW42 From 8eca3db518314ede77b6a3d0dcd5d7d6087e8ab9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 Aug 2014 13:33:23 -0700 Subject: [PATCH 232/837] "LRW42B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3a9e98a14d3..8e6f755f926 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW42 +export BUILD_ID=LRW42B From a73e8e2796b72f25d382e7777490f5b0621bd951 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 Aug 2014 14:02:54 -0700 Subject: [PATCH 233/837] "LRW42C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8e6f755f926..0f730a718ab 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW42B +export BUILD_ID=LRW42C From a98f11d4e12e4885bdc9b55a50bea43671817d24 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 Aug 2014 14:56:35 -0700 Subject: [PATCH 234/837] "LRW42D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0f730a718ab..50011c59552 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW42C +export BUILD_ID=LRW42D From 1a1375d8b83f58054b18823137c4d24a70a32abf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Aug 2014 06:15:59 -0700 Subject: [PATCH 235/837] "LRW43" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..16c69558a43 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW43 From a6dcaa15a2651eca9fba21c17ff9af0211faa346 Mon Sep 17 00:00:00 2001 From: android-merger Date: Tue, 12 Aug 2014 06:47:38 -0700 Subject: [PATCH 236/837] LRW43B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 16c69558a43..7fac071e6d0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW43 +export BUILD_ID=LRW43B From b454ca1cec0bfbd040303a29aca87c7daed84ec5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Aug 2014 10:25:03 -0700 Subject: [PATCH 237/837] "LRW43C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7fac071e6d0..c636990d541 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW43B +export BUILD_ID=LRW43C From 085ef34e4d761bfb3b1639be0a6aa1f14ddf3d5b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Aug 2014 13:18:57 -0700 Subject: [PATCH 238/837] "LRW43D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c636990d541..ce9d88e7b03 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW43C +export BUILD_ID=LRW43D From 744b5e1e26bc2880a9f4b3922e8d01cbded4a0bd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Aug 2014 17:23:18 -0700 Subject: [PATCH 239/837] "LRW43E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ce9d88e7b03..c0bb9a3d5a3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW43D +export BUILD_ID=LRW43E From 75a3e9c9a3feeb5ddd7c6b93c64a36067443e03f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Aug 2014 17:44:31 -0700 Subject: [PATCH 240/837] LRW43F --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c0bb9a3d5a3..41a2d239f55 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW43E +export BUILD_ID=LRW43F From b5367f4809a02b0daec843f20a68db88291bcd02 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 Aug 2014 06:20:03 -0700 Subject: [PATCH 241/837] "LRW44" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..17b0bc3279a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW44 From 72a239a06a4a32a334789957a033153de5c21adc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 Aug 2014 12:55:52 -0700 Subject: [PATCH 242/837] "LRW44B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 17b0bc3279a..a12e02aae0b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW44 +export BUILD_ID=LRW44B From e394dd66315e136b7e37f0a06c518669f9fae1aa Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 Aug 2014 16:01:31 -0700 Subject: [PATCH 243/837] "LRW44C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a12e02aae0b..03d725573d1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW44B +export BUILD_ID=LRW44C From 0d3049dbd7c6730e5f2d31713cd4be225a887cf2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 Aug 2014 20:36:12 -0700 Subject: [PATCH 244/837] LRW44E --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 03d725573d1..01459589f64 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW44C +export BUILD_ID=LRW44E From 12c28a39bd6f5fd5d113955bc09b85dc640803eb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Aug 2014 06:16:54 -0700 Subject: [PATCH 245/837] "LRW45" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..4b9b9db9cab 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW45 From 60433bb78d8033a84dd80570f3eba63312229637 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Aug 2014 09:15:23 -0700 Subject: [PATCH 246/837] "LRW45B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4b9b9db9cab..d8a7b9897f0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW45 +export BUILD_ID=LRW45B From 2347a3b7d9c8892c1556c08ba3e3bdf00e7f4509 Mon Sep 17 00:00:00 2001 From: Benoit Fradin Date: Mon, 14 Jul 2014 21:00:43 +0200 Subject: [PATCH 247/837] BuildBootImage: Add secondstage image support [DO NOT MERGE] The AOSP bootimage format allows the use of a second stage image however the BuildBootableImage function does not allows the "second" optional argument. This patch adds the support of this argument. Bug: 17035158 Change-Id: I8ed9d9e56449945c2d42fc908269921c394f68c0 Signed-off-by: Benoit Fradin Signed-off-by: Jeremy Compostella Signed-off-by: Patrick Tjin --- tools/releasetools/common.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 50ef4512148..947a9e42bf9 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -303,6 +303,11 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): cmd = [mkbootimg, "--kernel", os.path.join(sourcedir, "kernel")] + fn = os.path.join(sourcedir, "second") + if os.access(fn, os.F_OK): + cmd.append("--second") + cmd.append(fn) + fn = os.path.join(sourcedir, "cmdline") if os.access(fn, os.F_OK): cmd.append("--cmdline") From 92e88cd54c7912e408d12478fff432d6e0c21afb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Aug 2014 11:57:32 -0700 Subject: [PATCH 248/837] "LRW45C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d8a7b9897f0..fced3b1689a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW45B +export BUILD_ID=LRW45C From 4f9ff0caf98b5ca39c6c671becbdbcff9fb81407 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Aug 2014 15:28:53 -0700 Subject: [PATCH 249/837] "LRW45D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fced3b1689a..38d47f765ff 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW45C +export BUILD_ID=LRW45D From 801e72b9e56e43205fe79d4ee210baee95344298 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Aug 2014 18:30:12 -0700 Subject: [PATCH 250/837] "LRW45E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 38d47f765ff..5e4c8446d4e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW45D +export BUILD_ID=LRW45E From a6eaca2efb4e4f89ebcf95b4785691660bd17c86 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Aug 2014 22:40:34 -0700 Subject: [PATCH 251/837] LRW45F --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5e4c8446d4e..bc6c13e73b1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW45E +export BUILD_ID=LRW45F From d7a1f3e47cc72d78f11be67299c10e73bd5001db Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 Aug 2014 11:14:18 -0700 Subject: [PATCH 252/837] "LRW45G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index bc6c13e73b1..90db775932e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW45F +export BUILD_ID=LRW45G From 635d3de6eb8ccb97aca64ac95262db09bc4a14dd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 Aug 2014 14:20:47 -0700 Subject: [PATCH 253/837] "LRW45H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 90db775932e..aa0d175ce2b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW45G +export BUILD_ID=LRW45H From a879f48a9f543dce7abde2f90e56b79c2d484284 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 Aug 2014 15:51:36 -0700 Subject: [PATCH 254/837] "LRW45I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index aa0d175ce2b..00780a69031 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW45H +export BUILD_ID=LRW45I From 09bb0ce18c068c0e0f127185daa0a1e4473b382e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 Aug 2014 20:26:53 -0700 Subject: [PATCH 255/837] "LRW45J" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00780a69031..bcbbb790e6f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW45I +export BUILD_ID=LRW45J From a5c53cce099aa86e6de19081ab38497b89b5d9f5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 16 Aug 2014 17:40:33 -0700 Subject: [PATCH 256/837] "LRW45K" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index bcbbb790e6f..29828c21e83 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW45J +export BUILD_ID=LRW45K From d73e17478a722f883944cc66336e52a3e2ea82d7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 17 Aug 2014 07:49:03 -0700 Subject: [PATCH 257/837] "LRW48" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..4615891c111 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW48 From ec0108805ad0c2243e58ab893f92a1c9e4806cd8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 17 Aug 2014 13:46:08 -0700 Subject: [PATCH 258/837] "LRW48B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4615891c111..3658bb42f0c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW48 +export BUILD_ID=LRW48B From 63f171bb03dde548a5b1a26462a0caff7454099c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 17 Aug 2014 13:51:44 -0700 Subject: [PATCH 259/837] "LRW48C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3658bb42f0c..d6793a7607c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW48B +export BUILD_ID=LRW48C From 4602d358792e81372f876cc2560e4de88e993f64 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 18 Aug 2014 06:17:09 -0700 Subject: [PATCH 260/837] "LRW49" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..4ca4fe77756 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW49 From 8d1f967e83d629704e4f0edd0d06c6f3c59a9fc1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 18 Aug 2014 10:04:01 -0700 Subject: [PATCH 261/837] LRW49B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4ca4fe77756..2ae23d1aed2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW49 +export BUILD_ID=LRW49B From 1c3c89a1a5e2b85363a9acb1226b9cdbc028f97c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 18 Aug 2014 14:10:58 -0700 Subject: [PATCH 262/837] "LRW49C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2ae23d1aed2..eab0d2b6c62 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW49B +export BUILD_ID=LRW49C From 9ebfe6302918fff8797bd07f5449a59ef5a95c92 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 Aug 2014 06:15:52 -0700 Subject: [PATCH 263/837] "LRW50" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..97d0a38e54f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW50 From 3f9b7a7686909b31ca6362611cbab1ea42350e8d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 Aug 2014 08:14:05 -0700 Subject: [PATCH 264/837] "LRW50B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 97d0a38e54f..0b708deef57 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW50 +export BUILD_ID=LRW50B From f684e6e75683366fd839b9b1c58bff70c296984c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 Aug 2014 13:30:35 -0700 Subject: [PATCH 265/837] "LRW50C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0b708deef57..a7bf7dde7c0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW50B +export BUILD_ID=LRW50C From 1d256fcff24fad8cdcbd8e6c63f460270286438c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 Aug 2014 16:01:33 -0700 Subject: [PATCH 266/837] "LRW50D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a7bf7dde7c0..047f19c24a3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW50C +export BUILD_ID=LRW50D From cfb1701cf9bb6c59d678282855c69e17d0ef7384 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 Aug 2014 20:16:14 -0700 Subject: [PATCH 267/837] "LRW50E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 047f19c24a3..4d1200a5732 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW50D +export BUILD_ID=LRW50E From cb8203c2473281adff2b50e142f8b431400c409b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Aug 2014 06:18:26 -0700 Subject: [PATCH 268/837] "LRW51" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..c2e3838d764 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW51 From 00ed1637c22b1c4e9454606c69867f4bafdf9434 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Aug 2014 14:44:25 -0700 Subject: [PATCH 269/837] "LRW51B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c2e3838d764..4e2af4761c2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW51 +export BUILD_ID=LRW51B From 6f546575653c3b6a1c7d7ad87ee449f5245b9d8a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Aug 2014 16:58:46 -0700 Subject: [PATCH 270/837] "LRW51C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4e2af4761c2..a68604ee769 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW51B +export BUILD_ID=LRW51C From 2dee34c12cfb69eb8bf69e0efad974dc19e05a6e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Aug 2014 06:17:15 -0700 Subject: [PATCH 271/837] "LRW52" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..fed770b8867 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW52 From ddf097297f3d555f64d2858f403023acb397ac74 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Aug 2014 08:45:13 -0700 Subject: [PATCH 272/837] "LRW52B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fed770b8867..19fc47e661d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW52 +export BUILD_ID=LRW52B From 4dda144ab36945113c9dd9945d397441a1d13a4d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Aug 2014 14:52:17 -0700 Subject: [PATCH 273/837] "LRW52C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 19fc47e661d..45e5d95df4f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW52B +export BUILD_ID=LRW52C From df3d4eeb014da064c9a4d6e75dcff260177e1898 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Aug 2014 17:04:36 -0700 Subject: [PATCH 274/837] "LRW52D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 45e5d95df4f..e822ad0055e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW52C +export BUILD_ID=LRW52D From bd7605673706a3fb61f1258f937ac8b06249491c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Aug 2014 22:16:54 -0700 Subject: [PATCH 275/837] "LRW52E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e822ad0055e..a24dce29299 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW52D +export BUILD_ID=LRW52E From 29ba709e37e7d6fc765771a06cb42ca13a4c55ca Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 Aug 2014 10:31:30 -0700 Subject: [PATCH 276/837] "LRW52F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a24dce29299..ab495b8eb73 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW52E +export BUILD_ID=LRW52F From 74aa562a3707b0026213a9f7b277b6ddb2d4112f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 Aug 2014 14:36:31 -0700 Subject: [PATCH 277/837] "LRW52G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ab495b8eb73..770fbc3addb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW52F +export BUILD_ID=LRW52G From 8942946da5fe8d0e1dcc25934824d6f53b446846 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 23 Aug 2014 06:17:47 -0700 Subject: [PATCH 278/837] "LRW54" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..d93e9e1e373 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW54 From e344e296569cd30ea226af937f65b7578074c689 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 24 Aug 2014 06:13:05 -0700 Subject: [PATCH 279/837] "LRW55" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..cc62907e1ad 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW55 From 87ba559259a1a86873f39d5fdf376354fe74172d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 Aug 2014 06:16:51 -0700 Subject: [PATCH 280/837] "LRW56" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..b2735bfbee9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW56 From b98bfd03644c1f9ffa85d76afd8ab4a87cbde6f0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 Aug 2014 11:29:49 -0700 Subject: [PATCH 281/837] "LRW56B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b2735bfbee9..63baa4fb769 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW56 +export BUILD_ID=LRW56B From 36501d3035fb4b6b390963e923c285268e4f31b7 Mon Sep 17 00:00:00 2001 From: Qiwen Zhao Date: Mon, 25 Aug 2014 11:43:43 -0700 Subject: [PATCH 282/837] LRW56B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b2735bfbee9..63baa4fb769 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW56 +export BUILD_ID=LRW56B From fbd0b76918040541004bc084d2576d7567a20280 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 Aug 2014 15:25:50 -0700 Subject: [PATCH 283/837] "LRW56C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 63baa4fb769..59ed37664ee 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW56B +export BUILD_ID=LRW56C From 7346cdcd51a2573099cb7b7359c5f1a522b3f692 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 26 Aug 2014 06:20:07 -0700 Subject: [PATCH 284/837] "LRW57" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..a3764fabebd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW57 From c49d846b269318580aea4043bd17a00d32abc8ed Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 26 Aug 2014 11:17:11 -0700 Subject: [PATCH 285/837] "LRW57B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..8526f3e29fd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW57B From 82c3ea42c25847aeb8977fda07364fc0fa829a29 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 26 Aug 2014 14:55:02 -0700 Subject: [PATCH 286/837] "LRW57C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8526f3e29fd..e05cef60d43 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW57B +export BUILD_ID=LRW57C From d712c0c5610d03a88ff2116e030ba31033f8c3d1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 26 Aug 2014 17:16:02 -0700 Subject: [PATCH 287/837] "LRW57D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e05cef60d43..cd168ce9137 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW57C +export BUILD_ID=LRW57D From 753f88f4f9703c8c0271ee482dad57af3c4469ab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Aug 2014 06:19:25 -0700 Subject: [PATCH 288/837] "LRW58" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..5864a5fc464 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW58 From 49ffe219f862731508880a8c136da8a52a4904c3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Aug 2014 11:49:27 -0700 Subject: [PATCH 289/837] "LRW58B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5864a5fc464..18c1cc8bfa2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58 +export BUILD_ID=LRW58B From 9ec281500f01dad3baf1d392e3eaa224fb2fa728 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Aug 2014 14:47:48 -0700 Subject: [PATCH 290/837] "LRW58C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 18c1cc8bfa2..ac9a44c6195 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58B +export BUILD_ID=LRW58C From ba2b33018837ac3baa23224ebc996058b7044ef4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Aug 2014 16:12:23 -0700 Subject: [PATCH 291/837] "LRW58D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ac9a44c6195..a18ff626fd5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58C +export BUILD_ID=LRW58D From c75b506c136b9c3460bb53942f0731de8d9ebbbb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Aug 2014 20:49:18 -0700 Subject: [PATCH 292/837] "LRW58E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a18ff626fd5..eda0505c2b0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58D +export BUILD_ID=LRW58E From 88b7b8384ff4fdbdfce9f7088a3ff24ff455f460 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Aug 2014 07:54:04 -0700 Subject: [PATCH 293/837] "LRW58F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index eda0505c2b0..6b06f1496a5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58E +export BUILD_ID=LRW58F From 75c1524dce95f5c8ffd8ed5ff7271c8fa9566c07 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Aug 2014 10:51:02 -0700 Subject: [PATCH 294/837] "LRW58G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6b06f1496a5..ec298d0b328 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58F +export BUILD_ID=LRW58G From cc55084681b788c8fe0580d9c91ba9b03e88c8b0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Aug 2014 13:13:20 -0700 Subject: [PATCH 295/837] "LRW58H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ec298d0b328..bad0ecbb145 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58G +export BUILD_ID=LRW58H From c331791455dbf98c7ddd8dc25907a64a5dedfc36 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Aug 2014 16:33:33 -0700 Subject: [PATCH 296/837] "LRW58I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index bad0ecbb145..623ae4fcec7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58H +export BUILD_ID=LRW58I From 56be347b7363f1abd8ed471328e19aa5889af42b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Aug 2014 23:00:58 -0700 Subject: [PATCH 297/837] "LRW58J" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 623ae4fcec7..03bbfcb98b5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58I +export BUILD_ID=LRW58J From c18b0a87c33dd6f11ed623ddf624e7609c79cfcd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 29 Aug 2014 09:47:45 -0700 Subject: [PATCH 298/837] LRW58K --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 03bbfcb98b5..c0b54214424 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58J +export BUILD_ID=LRW58K From 536e273b09dab3c0177b9cf172abe23389efd5da Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 29 Aug 2014 10:48:40 -0700 Subject: [PATCH 299/837] "LRW58L" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c0b54214424..3577ff9d365 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58K +export BUILD_ID=LRW58L From 84032857c621a81cd9ba5e0e078b19453f05d94f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 29 Aug 2014 11:43:12 -0700 Subject: [PATCH 300/837] "LRW58M" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3577ff9d365..22fca3b6f18 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58L +export BUILD_ID=LRW58M From 9503518cd1d37fd0f29d9df3b60750f5fd02c910 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 29 Aug 2014 14:36:08 -0700 Subject: [PATCH 301/837] "LRW58N" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 22fca3b6f18..f08c392b5ff 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58M +export BUILD_ID=LRW58N From 7770ba8ca638347db721fc00baa4eddf1ae6c42e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 29 Aug 2014 17:01:59 -0700 Subject: [PATCH 302/837] "LRW58O" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f08c392b5ff..401654f1ad1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58N +export BUILD_ID=LRW58O From 0824d0d1de20eb0859e295647efd9b49f6fb5e72 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 31 Aug 2014 08:33:13 -0700 Subject: [PATCH 303/837] "LRW58P" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 401654f1ad1..87cc9645711 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW58O +export BUILD_ID=LRW58P From 551ba60213692e5dcf16719491be595a828cc3e0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 31 Aug 2014 09:37:55 -0700 Subject: [PATCH 304/837] "LRW62" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..afe31d3c386 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW62 From 0474fecf8300917aa0cf09e02e15a4c1ecca580f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 1 Sep 2014 07:59:47 -0700 Subject: [PATCH 305/837] "LRW63" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..394cae75aeb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW63 From fc035b4a06bacc84e64d620d1626ab5cd085bbe1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Sep 2014 06:17:27 -0700 Subject: [PATCH 306/837] "LRW64" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..8284bd88e3f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW64 From 297240da24df3b334bf59c556e45b102a654c842 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Sep 2014 11:06:40 -0700 Subject: [PATCH 307/837] "LRW64B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8284bd88e3f..effc2c968f2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW64 +export BUILD_ID=LRW64B From 3b8ec2997eb7586b358943be7fa8c211c459e448 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Sep 2014 15:53:47 -0700 Subject: [PATCH 308/837] "LRW64C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index effc2c968f2..13e64c7d478 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW64B +export BUILD_ID=LRW64C From a48bc259ca37643619f8d2e90d5ab017b018d7b3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Sep 2014 06:19:37 -0700 Subject: [PATCH 309/837] "LRW65" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..b9368579c49 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW65 From b757f7566b1c5c312ec1056ece7e605ac429aca4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Sep 2014 12:14:16 -0700 Subject: [PATCH 310/837] "LRW65B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b9368579c49..4fbabc0e03a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW65 +export BUILD_ID=LRW65B From 6b43136b4d22225b808832107a68acc8414076a2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Sep 2014 15:26:51 -0700 Subject: [PATCH 311/837] "LRW65C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4fbabc0e03a..7c2f5f0890e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW65B +export BUILD_ID=LRW65C From 8db102422421996b876d1c9af07c00b9d3d37f47 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Sep 2014 17:10:45 -0700 Subject: [PATCH 312/837] "LRW65D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7c2f5f0890e..1c07656127c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW65C +export BUILD_ID=LRW65D From fe6de872d2cb94c2118b56b1f9021be43de7199f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Sep 2014 06:20:59 -0700 Subject: [PATCH 313/837] "LRW66" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..2eb2cab324c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW66 From d5f4621a9a49489af254aec986af87356648ab51 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Sep 2014 07:02:41 -0700 Subject: [PATCH 314/837] LRW66B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2eb2cab324c..329b17e97c5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW66 +export BUILD_ID=LRW66B From c9556ce0b97c4925507182737676af5459f02efb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Sep 2014 11:18:28 -0700 Subject: [PATCH 315/837] "LRW66C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 329b17e97c5..4d5c29d7409 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW66B +export BUILD_ID=LRW66C From 8e864eb42d2d69d76167278980896b2700ee590c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Sep 2014 13:55:52 -0700 Subject: [PATCH 316/837] "LRW66D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4d5c29d7409..c54cc4aac9a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW66C +export BUILD_ID=LRW66D From bdecf4b92440dd2395bfc56c878e2232d116b81c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Sep 2014 15:27:18 -0700 Subject: [PATCH 317/837] "LRW66E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c54cc4aac9a..146a84a5166 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW66D +export BUILD_ID=LRW66E From 919a0f93402d4d93efd127f06de4af5e29307200 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Sep 2014 21:36:54 -0700 Subject: [PATCH 318/837] "LRW66F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 146a84a5166..bbc48ad498d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW66E +export BUILD_ID=LRW66F From 26e604199691ef2bd0d375f4b4b92a15ea4a7184 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Sep 2014 09:19:18 -0700 Subject: [PATCH 319/837] "LRW66G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index bbc48ad498d..508f4737b96 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW66F +export BUILD_ID=LRW66G From aa9529f505b24fe0e1024f7c410f90d884558a84 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Sep 2014 13:08:01 -0700 Subject: [PATCH 320/837] "LRW66H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 508f4737b96..a1422acf34b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW66G +export BUILD_ID=LRW66H From 6b43a3241723514642d4fae339f502c3394a1f0d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Sep 2014 16:19:00 -0700 Subject: [PATCH 321/837] "LRW66I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a1422acf34b..50e31fe9c61 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW66H +export BUILD_ID=LRW66I From 8deadecb01450851d2dd37cc21328bdf9e17668a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 6 Sep 2014 06:17:57 -0700 Subject: [PATCH 322/837] "LRW68" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..ac6734d3b8e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW68 From a1b3db0d211e55aca3987424e9f64366a1fc4750 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 6 Sep 2014 08:54:43 -0700 Subject: [PATCH 323/837] "LRW68B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 50e31fe9c61..302967630cd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW66I +export BUILD_ID=LRW68B From 4ff5429cb26d93d6dc763578478247bfe0350b4c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 6 Sep 2014 09:09:26 -0700 Subject: [PATCH 324/837] "LRW66J" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 302967630cd..436f566c8ea 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW68B +export BUILD_ID=LRW66J From 5814e878b5c3a42d255e3e4ff45b30e4b511f0da Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 7 Sep 2014 06:15:51 -0700 Subject: [PATCH 325/837] "LRW69" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..85e06951ce7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW69 From 0ce4a50061044098ef83cb6e3297527211776130 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Sep 2014 06:22:19 -0700 Subject: [PATCH 326/837] "LRW70" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..00f49fdd91a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW70 From 02e7fa781073d0e3d41b1f6ede212e26e8f4a563 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Sep 2014 08:55:03 -0700 Subject: [PATCH 327/837] LRW70B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00f49fdd91a..2774c535857 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW70 +export BUILD_ID=LRW70B From 9a043962ca8c62e47e1bc9d68d564213a006ba3a Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Mon, 8 Sep 2014 10:34:18 -0700 Subject: [PATCH 328/837] Add com.android.future.usb.accessory support library to all builds so we don't have to remember to add it to device.mk for all products. Bug: 17189905 Change-Id: Ia19c5e16bc7916996804a52eccd3ecca89099f09 --- target/product/core_minimal.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index e4eb56af987..4c08cb027b3 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -32,6 +32,7 @@ PRODUCT_PACKAGES += \ Shell \ bcc \ bu \ + com.android.future.usb.accessory \ com.android.location.provider \ com.android.location.provider.xml \ com.android.media.remotedisplay \ From f8c523e14b09c26653c35ff21c5643b522135fea Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Sep 2014 13:07:06 -0700 Subject: [PATCH 329/837] "LRW70C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2774c535857..cb084702285 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW70B +export BUILD_ID=LRW70C From 546b2b6d3e97bcff285416ae005457ba79d066b9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Sep 2014 15:42:32 -0700 Subject: [PATCH 330/837] "LRW70D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cb084702285..18ccc65c1f7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW70C +export BUILD_ID=LRW70D From 828f710056b82ae8c4fa2856813d3db0b224be60 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Sep 2014 16:30:50 -0700 Subject: [PATCH 331/837] "LRW70E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 18ccc65c1f7..0a47a5b576d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW70D +export BUILD_ID=LRW70E From ec536ff5356363e5c12b7838fcdca44dbff9a749 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Sep 2014 06:19:35 -0700 Subject: [PATCH 332/837] "LRW71" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..cacddfe1d24 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW71 From 637250aec0040e55a1217e60d6f6ec4b4545c5c8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Sep 2014 13:03:54 -0700 Subject: [PATCH 333/837] "LRW71B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cacddfe1d24..35197b323d7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW71 +export BUILD_ID=LRW71B From eb83af763c46f6df945fe7149740fb00c54bf664 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Tue, 9 Sep 2014 14:59:20 -0700 Subject: [PATCH 334/837] select default search_path by platform Bug: 17443175 Change-Id: I2b8b0a3b56e667b749ac167a6d09dc973ecf8419 --- core/Makefile | 2 +- tools/releasetools/common.py | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index 506488662bb..d39ac9c1737 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1416,7 +1416,7 @@ endif $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="BOOT/RAMDISK/" } /^BOOT\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -C -S $(SELINUX_FC) > $(zip_root)/META/boot_filesystem_config.txt $(hide) zipinfo -1 $@ | awk 'BEGIN { FS="RECOVERY/RAMDISK/" } /^RECOVERY\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -C -S $(SELINUX_FC) > $(zip_root)/META/recovery_filesystem_config.txt $(hide) (cd $(zip_root) && zip -q ../$(notdir $@) META/*filesystem_config.txt) - $(hide) ./build/tools/releasetools/add_img_to_target_files $@ + $(hide) ./build/tools/releasetools/add_img_to_target_files -p $(HOST_OUT) $@ .PHONY: target-files-package target-files-package: $(BUILT_TARGET_FILES_PACKAGE) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index bcadea26ea6..92d912bd6a3 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -42,7 +42,13 @@ class Options(object): pass OPTIONS = Options() -OPTIONS.search_path = "out/host/linux-x86" + +DEFAULT_SEARCH_PATH_BY_PLATFORM = { + "linux2": "out/host/linux-x86", + "darwin": "out/host/darwin-x86", + } +OPTIONS.search_path = DEFAULT_SEARCH_PATH_BY_PLATFORM.get(sys.platform, None) + OPTIONS.signapk_path = "framework/signapk.jar" # Relative to search_path OPTIONS.extra_signapk_args = [] OPTIONS.java_path = "java" # Use the one on the path by default. @@ -651,8 +657,9 @@ def ParseOptions(argv, if extra_option_handler is None or not extra_option_handler(o, a): assert False, "unknown option \"%s\"" % (o,) - os.environ["PATH"] = (os.path.join(OPTIONS.search_path, "bin") + - os.pathsep + os.environ["PATH"]) + if OPTIONS.search_path: + os.environ["PATH"] = (os.path.join(OPTIONS.search_path, "bin") + + os.pathsep + os.environ["PATH"]) return args From a6f38b306fc239ac38ed25171d0387a50f4c5d3e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Sep 2014 15:24:10 -0700 Subject: [PATCH 335/837] LRW71C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 35197b323d7..0b3aed735ab 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW71B +export BUILD_ID=LRW71C From e37c18cf21c8f787f1c8097921bad7ee9d8b0c4f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Sep 2014 06:20:14 -0700 Subject: [PATCH 336/837] "LRW72" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..a3144df29f0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW72 From 3fc1d7ab5d3232ae8e1deae9cb2a43ac65b636c4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Sep 2014 11:24:41 -0700 Subject: [PATCH 337/837] "LRW72B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a3144df29f0..c5b197b25d1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW72 +export BUILD_ID=LRW72B From 61329bf287bfd36c6cfe36014a8ef1b332ae96ef Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Sep 2014 15:28:59 -0700 Subject: [PATCH 338/837] "LRW72C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c5b197b25d1..3d3c69cbf37 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW72B +export BUILD_ID=LRW72C From e7a0452005a63276bd108e16124cc98b1e42c201 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Sep 2014 15:39:10 -0700 Subject: [PATCH 339/837] "LRW72D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3d3c69cbf37..a51e1c821af 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW72C +export BUILD_ID=LRW72D From ee6e6f0a3f71a244e3d4c3ba82862bca62724dd6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Sep 2014 16:58:13 -0700 Subject: [PATCH 340/837] "LRW72E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a51e1c821af..462db83d4c8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW72D +export BUILD_ID=LRW72E From 8f6708432c6c19c5e4e3f2d283d5e29cbb89700f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Sep 2014 06:18:38 -0700 Subject: [PATCH 341/837] "LRW73" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..cad7de1f8f2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW73 From 5a514a8c52e472cd48dd351774793d1e612b7733 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Sep 2014 10:36:27 -0700 Subject: [PATCH 342/837] "LRW73B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cad7de1f8f2..d98806001ee 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW73 +export BUILD_ID=LRW73B From 285d0353e917735167654f1e9daaf489620b6795 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Sep 2014 13:23:43 -0700 Subject: [PATCH 343/837] "LRW73C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d98806001ee..3750cc2ba05 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW73B +export BUILD_ID=LRW73C From 65f173c3e38a9a0bcd1f8b6e1935213d835758d1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Sep 2014 15:36:24 -0700 Subject: [PATCH 344/837] "LRW73D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3750cc2ba05..09a48648431 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW73C +export BUILD_ID=LRW73D From 6aedfc058ea2422a71fc1fcd8cce07fa7a1a3f19 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Sep 2014 17:40:45 -0700 Subject: [PATCH 345/837] "LRW73E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 09a48648431..f70dcbcb8bf 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW73D +export BUILD_ID=LRW73E From 6666d9ebc78bc8d5632e78ab60245a330792450d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Sep 2014 22:50:44 -0700 Subject: [PATCH 346/837] "LRW73F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f70dcbcb8bf..b31643aaa06 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW73E +export BUILD_ID=LRW73F From a2d5f2bb8e9bf06c211bc636fedb31db98675284 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Sep 2014 01:39:53 -0700 Subject: [PATCH 347/837] LRW73G --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b31643aaa06..b578e716bc8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW73F +export BUILD_ID=LRW73G From ecd61a082e114646f97d0498ad0b0b9017c2235d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Sep 2014 09:50:05 -0700 Subject: [PATCH 348/837] "LRW73H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b578e716bc8..22a04acf675 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW73G +export BUILD_ID=LRW73H From 5649cef966c4151175ad34fd0d80e5c6babd8107 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Sep 2014 12:51:15 -0700 Subject: [PATCH 349/837] "LRW73I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 22a04acf675..969afef7a3b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW73H +export BUILD_ID=LRW73I From 8dd9706106151e07e1b0ca4972feb3574d3f8d4d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Sep 2014 15:01:42 -0700 Subject: [PATCH 350/837] "LRW73J" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 969afef7a3b..cb72dfe62d6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW73I +export BUILD_ID=LRW73J From a421c713cc66fd01a84c8398631778b1a6894409 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Sep 2014 15:33:41 -0700 Subject: [PATCH 351/837] "LRW73K" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cb72dfe62d6..42514eaff07 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW73J +export BUILD_ID=LRW73K From 6b1f10f2554e7c0a15f8b4c1c05d7eb4b823e512 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Sep 2014 15:37:03 -0700 Subject: [PATCH 352/837] "LRW73L" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 42514eaff07..567573025de 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW73K +export BUILD_ID=LRW73L From dc85adb1c48d012cdb9185e558fcfc088417b0f7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 13 Sep 2014 06:21:04 -0700 Subject: [PATCH 353/837] "LRW75" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..e21d07c9559 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW75 From b8a7925b22173975518777d345a4bec1e1eeec35 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 13 Sep 2014 10:26:10 -0700 Subject: [PATCH 354/837] "LRW73M" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 567573025de..29fccb6e15a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW73L +export BUILD_ID=LRW73M From e0ad949140e6295d315660626b9814bd5b4e8945 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 14 Sep 2014 06:18:43 -0700 Subject: [PATCH 355/837] "LRW76" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..129e6c0c900 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW76 From 0a97d0dcaef1a58270e37733a2a88260e36aa843 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Sep 2014 06:21:42 -0700 Subject: [PATCH 356/837] "LRW77" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..5a120131ac3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW77 From 9941528d8348ef964ad5f91801a93b6e428fb0cd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Sep 2014 12:44:42 -0700 Subject: [PATCH 357/837] "LRW77B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5a120131ac3..c0635e37472 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW77 +export BUILD_ID=LRW77B From 29f8a5095b9d20c06e8f5a80cfac7e66a9e9b993 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Sep 2014 15:46:38 -0700 Subject: [PATCH 358/837] "LRW77C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c0635e37472..eb9dd355321 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW77B +export BUILD_ID=LRW77C From a3080bdd3a90060ccc2c125d057b618335ee35f1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Sep 2014 18:03:52 -0700 Subject: [PATCH 359/837] "LRW77D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index eb9dd355321..b0ff9d86e4b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW77C +export BUILD_ID=LRW77D From 2a72baf0838697a74706284e7f9436ee64296321 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Sep 2014 06:20:15 -0700 Subject: [PATCH 360/837] "LRW78" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..19d7430235d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW78 From cc57e9bda444d9c2f7f30bf2ba421c27cf5bfdc2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Sep 2014 12:54:16 -0700 Subject: [PATCH 361/837] "LRW78B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 19d7430235d..1d0310acb9e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW78 +export BUILD_ID=LRW78B From b114d04ca87807552ccbb1a1b6c8cf436fd2333d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Sep 2014 17:02:29 -0700 Subject: [PATCH 362/837] "LRW78C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1d0310acb9e..1b3912d7d9b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW78B +export BUILD_ID=LRW78C From 4da7f58888bfbaa7e3abf064759e83e1023449b3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Sep 2014 06:22:16 -0700 Subject: [PATCH 363/837] "LRW79" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..a3d23cda011 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW79 From eb3e84a766b517bd24571777178f33036a481ea8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Sep 2014 10:38:56 -0700 Subject: [PATCH 364/837] "LRW79B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a3d23cda011..21606035ef6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW79 +export BUILD_ID=LRW79B From 00bdb9aa953e1016dc07eab5fc2c5a8b175fee33 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Sep 2014 13:10:20 -0700 Subject: [PATCH 365/837] "LRW79C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 21606035ef6..491cb682523 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW79B +export BUILD_ID=LRW79C From 1c3707224295055b3305ea6c71510695c0874452 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Sep 2014 15:45:03 -0700 Subject: [PATCH 366/837] "LRW79D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 491cb682523..17c2813a8c2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW79C +export BUILD_ID=LRW79D From 0e128cda899bf8137349389eb0d603442edb6a32 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Sep 2014 16:49:05 -0700 Subject: [PATCH 367/837] "LRW79E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 17c2813a8c2..af93b72d2d5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW79D +export BUILD_ID=LRW79E From e01bee1b3c3e09239474309c61863a912846f812 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Sep 2014 22:04:40 -0700 Subject: [PATCH 368/837] "LRW79F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index af93b72d2d5..f4574d88809 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW79E +export BUILD_ID=LRW79F From e804d0ded5f210cdd582dd2aa0e5ceb02451c5d3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Sep 2014 06:20:17 -0700 Subject: [PATCH 369/837] "LRW80" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..cc0318f6a2d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW80 From c0f356f39160743d1d5d1ef48d13a6895ef19d71 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Sep 2014 11:53:37 -0700 Subject: [PATCH 370/837] "LRW80B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cc0318f6a2d..7138298d105 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW80 +export BUILD_ID=LRW80B From 2796538d3bda73ba34c6523790da8dc2d39b8f07 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Sep 2014 13:51:41 -0700 Subject: [PATCH 371/837] "LRW80C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7138298d105..8675db1a6d1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW80B +export BUILD_ID=LRW80C From 2050436ccc4eed8cbb19e5993a7435d1f44d62b9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Sep 2014 15:33:43 -0700 Subject: [PATCH 372/837] "LRW80D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8675db1a6d1..5bac9476d99 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW80C +export BUILD_ID=LRW80D From cd60497d59b529368c43a18de6d04392fc9836d1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Sep 2014 21:24:19 -0700 Subject: [PATCH 373/837] LRW80E --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5bac9476d99..00c3dc3b93e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW80D +export BUILD_ID=LRW80E From d0bc1a5304722c18ce94790cc9f76d6ce92fd769 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Sep 2014 21:31:04 -0700 Subject: [PATCH 374/837] LRW80F --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00c3dc3b93e..5e65cc152b8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW80E +export BUILD_ID=LRW80F From 4800d4c478c2866c6033636555f5b3c040f6ad79 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 19 Sep 2014 08:17:09 -0700 Subject: [PATCH 375/837] "LRW80G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5e65cc152b8..910a3e0cfe4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW80F +export BUILD_ID=LRW80G From 73f1b0f9e3d3ee58d99003e784d79fc95935abba Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 19 Sep 2014 11:57:19 -0700 Subject: [PATCH 376/837] "LRW80H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 910a3e0cfe4..8f1d445e1e4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW80G +export BUILD_ID=LRW80H From e76eae2fe94206404c57f1cf24e83b53358ac234 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 19 Sep 2014 14:10:48 -0700 Subject: [PATCH 377/837] "LRW80I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8f1d445e1e4..e1acce75fce 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW80H +export BUILD_ID=LRW80I From b5d359ee6a26ef8334ec228ee3e471137dd3ac2a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 20 Sep 2014 06:20:18 -0700 Subject: [PATCH 378/837] "LRW82" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..872d6c61466 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW82 From 4a266793f3c9af3afb7f2849b0ea67976f822813 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 20 Sep 2014 21:17:26 -0700 Subject: [PATCH 379/837] LRW80J --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e1acce75fce..040a52c90f4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW80I +export BUILD_ID=LRW80J From 64a94af1596efd5b05324a2937a249caffaeba26 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 21 Sep 2014 06:18:37 -0700 Subject: [PATCH 380/837] "LRW83" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..6ee8e9a2725 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW83 From 4ba5defaee7351d6e988cdbc9c50edc400ae6c1d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Sep 2014 06:22:37 -0700 Subject: [PATCH 381/837] "LRW84" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..c270daa7008 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW84 From a401da98c218a0db882c112a3b89c7303a37e2b5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Sep 2014 10:29:01 -0700 Subject: [PATCH 382/837] "LMW84" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..1881885a5ee 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMW84 From bf5cd355dcc45bc3737851e1ad6aba5e52cdaa76 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Sep 2014 11:15:50 -0700 Subject: [PATCH 383/837] "LMW84B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..60169d6448f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMW84B From 9b7472b06de2d5cd8bf25f0b337c166e8705c699 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Sep 2014 11:47:05 -0700 Subject: [PATCH 384/837] "LMW84C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..3bb098c9e4d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMW84C From 45239e3d0d6c83f90d29c303546982a330d96b62 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Sep 2014 14:57:13 -0700 Subject: [PATCH 385/837] "LRW84B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c270daa7008..6f25c246dc0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW84 +export BUILD_ID=LRW84B From 8bfd9b717018d327f45465e11092cbced0294906 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 23 Sep 2014 06:27:37 -0700 Subject: [PATCH 386/837] "LRW85" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..db1f4e9f1b3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW85 From 9675c8fc5f414d475277bbfc569e7bbf6aadc537 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 23 Sep 2014 10:27:46 -0700 Subject: [PATCH 387/837] "LRW85B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index db1f4e9f1b3..7bb6265097f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW85 +export BUILD_ID=LRW85B From e4d9ab44af15e4471ae8030c98aa6c62743d935c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 23 Sep 2014 14:56:59 -0700 Subject: [PATCH 388/837] "LRW85C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7bb6265097f..8fc78558f40 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW85B +export BUILD_ID=LRW85C From 6c330e641a24fb64a66a03e06f353f98882a22d2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 23 Sep 2014 15:20:23 -0700 Subject: [PATCH 389/837] "LMW85B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..4f66243b7a9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMW85B From 30a3d93055594c71956e57fa5655e592faa911bf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 23 Sep 2014 18:06:59 -0700 Subject: [PATCH 390/837] "LRW85D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8fc78558f40..3783d1356e5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW85C +export BUILD_ID=LRW85D From 3c613ef3be7e9cda8e008130ad569f30d7e32ed1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Sep 2014 06:22:37 -0700 Subject: [PATCH 391/837] "LMW86" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..81f13c96e59 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMW86 From 955fb24d12aab37d5f00fa0795bfeb4ef9ce1819 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Sep 2014 06:31:29 -0700 Subject: [PATCH 392/837] "LRW86" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..a99b69568c2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW86 From 5b2d26162889db140718ecabc383b2f81e2aab9e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Sep 2014 11:52:57 -0700 Subject: [PATCH 393/837] "LRW86B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a99b69568c2..e8e92aea354 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW86 +export BUILD_ID=LRW86B From e2b66bb4bed4a1148449908dd072b685e764c114 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Sep 2014 15:15:51 -0700 Subject: [PATCH 394/837] "LRW86C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e8e92aea354..64bdb1d5e4d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW86B +export BUILD_ID=LRW86C From e6ef6fc171618185cbe0799e0904e94618c2fe8d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Sep 2014 06:26:39 -0700 Subject: [PATCH 395/837] "LMW87" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..843e90aa59f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMW87 From f083d0a339d2118ba39bf66a78f0248c5235d834 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Sep 2014 06:33:00 -0700 Subject: [PATCH 396/837] "LRW87" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..9badd514483 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW87 From a0b8364d5ad7329896c341adcf7bfefdc5a3fbae Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Sep 2014 10:28:32 -0700 Subject: [PATCH 397/837] "LRW87B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9badd514483..b5895ed4f23 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW87 +export BUILD_ID=LRW87B From c0500a030d46f026eebbc8247649421f88208ba5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Sep 2014 13:45:59 -0700 Subject: [PATCH 398/837] "LRW87C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b5895ed4f23..10e9f952612 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW87B +export BUILD_ID=LRW87C From 3855ed79b676b14ff3a51d498bcdc44b2532225e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Sep 2014 15:23:48 -0700 Subject: [PATCH 399/837] "LRW87D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 10e9f952612..8b68c8a6934 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW87C +export BUILD_ID=LRW87D From 6c562fda3e073326e354b5209a13dcf3daea4e75 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Sep 2014 19:28:42 -0700 Subject: [PATCH 400/837] "LRW87E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8b68c8a6934..7452ae58b99 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW87D +export BUILD_ID=LRW87E From 9d7c13f245f707b47502e4ecaa4064f2f96e5c84 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Sep 2014 09:36:53 -0700 Subject: [PATCH 401/837] "LRW87F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7452ae58b99..98c3abb27fb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW87E +export BUILD_ID=LRW87F From 8c12703181c13be6fff5ac6450e700869d4c9bb9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Sep 2014 11:21:10 -0700 Subject: [PATCH 402/837] "LRW87G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 98c3abb27fb..2be1e450bc6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW87F +export BUILD_ID=LRW87G From a4193e544161d687208bd95c2c6af9baca2dbae5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Sep 2014 14:12:32 -0700 Subject: [PATCH 403/837] "LRW87H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2be1e450bc6..48fd0ea9337 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW87G +export BUILD_ID=LRW87H From 1f77a849dd6641a38998aa21e3a359f1cbdef615 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Sep 2014 15:26:51 -0700 Subject: [PATCH 404/837] "LRW87I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 48fd0ea9337..2e73f971e89 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW87H +export BUILD_ID=LRW87I From 64103157ac2a97d22c2e668ef089994a2238551c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Sep 2014 17:42:46 -0700 Subject: [PATCH 405/837] "LRW87J" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2e73f971e89..9fe9f17241c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW87I +export BUILD_ID=LRW87J From 9c1ddb9230307de1a5093eae2f001751f17ee6b4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Sep 2014 19:13:24 -0700 Subject: [PATCH 406/837] "LRW87K" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9fe9f17241c..2e895f831c7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW87J +export BUILD_ID=LRW87K From 0cda5b0f87dabfc26ff22f26ea7920fff8c8a975 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 27 Sep 2014 06:19:12 -0700 Subject: [PATCH 407/837] "LMW89" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..061b26c91da 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMW89 From 25541207f2c6fc2fa311350f41222bb3460df8a0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 28 Sep 2014 06:15:30 -0700 Subject: [PATCH 408/837] "LMW90" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..7bfa8f9f31a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMW90 From 77ef4e1aed249bcd1fcdcdbd62a3abc00d733552 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 28 Sep 2014 06:25:38 -0700 Subject: [PATCH 409/837] "LRW90" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..6bb0ef43ada 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW90 From 34db3778ced08150a9a310500fc8fc02498f5516 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 28 Sep 2014 06:48:53 -0700 Subject: [PATCH 410/837] "LMW90" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..7bfa8f9f31a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMW90 From dc2c42d60484ade4d5ffb0e561939209f3bf3178 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Sep 2014 06:24:29 -0700 Subject: [PATCH 411/837] "LMW91" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..2b033eca2fa 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMW91 From c216751c2dddf0de8c5d841ef051c9d2772dfdde Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Sep 2014 06:30:39 -0700 Subject: [PATCH 412/837] "LRW91" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..9c6a382c904 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW91 From aaf2905207932d15b9e7ae7ae84575a70d795a8c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Sep 2014 15:07:52 -0700 Subject: [PATCH 413/837] "LRW91B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9c6a382c904..73eac562fcb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW91 +export BUILD_ID=LRW91B From f955dd66e1e7914c5281656f39b7798c7695744a Mon Sep 17 00:00:00 2001 From: Alex Cruz Date: Mon, 29 Sep 2014 17:28:41 -0400 Subject: [PATCH 414/837] [2/2] build: Remove Voice Dialer - From my experience, this does not work on the majority of the devices and I don't know of one person that uses this. This was a useful app prior to apps like Google NOW and also for cdma uses to access their APNs but that's no longer the case. Change-Id: Ib74f8987d0fe68d8798c7ba64bcddcdae574876c --- target/product/full_base_telephony.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk index f00f93d2b19..813348b248e 100644 --- a/target/product/full_base_telephony.mk +++ b/target/product/full_base_telephony.mk @@ -19,9 +19,6 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. -PRODUCT_PACKAGES := \ - VoiceDialer - PRODUCT_PROPERTY_OVERRIDES := \ keyguard.no_require_sim=true \ ro.com.android.dataroaming=true From f4197eed9d783e94dfc9de6a30b8776384b2286b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Sep 2014 06:26:31 -0700 Subject: [PATCH 415/837] "LMW92" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..71cd944adab 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMW92 From a6014a80a6d1768b839c6ae57fdad681346bcb6a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Sep 2014 06:32:57 -0700 Subject: [PATCH 416/837] "LRW92" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..e99590bf5b0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRW92 From b5a29b6b6f04ff3d78f3ab69e704a711645a8074 Mon Sep 17 00:00:00 2001 From: Chad Jones Date: Tue, 30 Sep 2014 09:08:11 -0700 Subject: [PATCH 417/837] empty commit From 2c11a59ffef06b98a8749e7c8986190c75e80c48 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Sep 2014 12:13:21 -0700 Subject: [PATCH 418/837] LRW92B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e99590bf5b0..a10dc6120c0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW92 +export BUILD_ID=LRW92B From b4bf8b1ff2b9c009c1f1f9f2cc99a01d7cb28c5b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Sep 2014 15:19:47 -0700 Subject: [PATCH 419/837] "LRW92C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a10dc6120c0..8bdaed30f51 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRW92B +export BUILD_ID=LRW92C From a1d1e5dfe4dc067c09ff178fd4eb18f70ad26112 Mon Sep 17 00:00:00 2001 From: Jens Andersen Date: Tue, 30 Sep 2014 23:39:46 +0000 Subject: [PATCH 420/837] Roomservice: Search gerrit instead of github * Search for devices using gerrit api instead of github * Minor cleanups & fixes Change-Id: I54fc898f3c773f79936568818996ae5fab11e491 --- tools/roomservice.py | 95 ++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index af27cdb08c0..746d0f125dd 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -20,6 +20,8 @@ import json import sys import os +import os.path +import re from xml.etree import ElementTree as ES # Use the urllib importer from the Cyanogenmod roomservice try: @@ -44,59 +46,50 @@ local_manifest_dir = ".repo/local_manifests" # change this to your name on github (or equivalent hosting) android_team = "omnirom" +# url to gerrit repository +gerrit_url = "gerrit.omnirom.org" -def check_repo_exists(git_data): - if not int(git_data.get('total_count', 0)): - raise Exception("{} not found in {} Github, exiting " - "roomservice".format(device, android_team)) +def check_repo_exists(git_data, device): + re_match = "^android_device_.*_{device}$".format(device=device) + matches = filter(lambda x: re.match(re_match, x), git_data) + if len(matches) != 1: + raise Exception("{device} not found," + "exiting roomservice".format(device=device)) + return git_data[matches[0]] -# Note that this can only be done 5 times per minute -def search_github_for_device(device): - git_search_url = "https://api.github.com/search/repositories" \ - "?q=%40{}+android_device+{}+fork:true".format(android_team, device) + +def search_gerrit_for_device(device): + # TODO: In next gerrit release regex search with r= should be supported! + git_search_url = "https://{gerrit_url}/projects/?m={device}".format( + gerrit_url=gerrit_url, + device=device + ) git_req = urllib.request.Request(git_search_url) - # this api is a preview at the moment. accept the custom media type - git_req.add_header('Accept', 'application/vnd.github.preview') try: response = urllib.request.urlopen(git_req) except urllib.request.HTTPError: - raise Exception("There was an issue connecting to github." + raise Exception("There was an issue connecting to gerrit." " Please try again in a minute") + # Skip silly gerrit "header" + response.readline() git_data = json.load(response) - check_repo_exists(git_data) + device_data = check_repo_exists(git_data, device) print("found the {} device repo".format(device)) - return git_data - - -def get_device_url(git_data): - device_url = "" - for item in git_data['items']: - temp_url = item.get('html_url') - if "{}/android_device".format(android_team) in temp_url: - try: - temp_url = temp_url[temp_url.index("android_device"):] - except ValueError: - pass - else: - if temp_url.endswith(device): - device_url = temp_url - break - - if device_url: - return device_url - raise Exception("{} not found in {} Github, exiting " - "roomservice".format(device, android_team)) - - -def parse_device_directory(device_url,device): - to_strip = "android_device" - repo_name = device_url[device_url.index(to_strip) + len(to_strip):] - repo_name = repo_name[:repo_name.index(device)] - repo_dir = repo_name.replace("_", "/") - repo_dir = repo_dir + device - return "device{}".format(repo_dir) + return device_data + + +def parse_device_directory(device_url, device): + pattern = "^android_device_(?P.+)_{}$".format(device) + match = re.match(pattern, device_url) + + if match is None: + raise Exception("Invalid project name {}".format(device_url)) + return "device/{vendor}/{device}".format( + vendor=match.group('vendor'), + device=device, + ) # Thank you RaYmAn @@ -123,6 +116,10 @@ def check_project_exists(url): return False +def check_target_exists(directory): + return os.path.isdir(directory) + + # Use the indent function from http://stackoverflow.com/a/4590052 def indent(elem, level=0): i = ''.join(["\n", level*" "]) @@ -230,13 +227,13 @@ def create_dependency_manifest(dependencies): # not adding an organization should default to android_team # only apply this to github if remote == "github": - if not "/" in repository: + if "/" not in repository: repository = '/'.join([android_team, repository]) project = create_manifest_project(repository, target_path, remote=remote, revision=revision) - if not project is None: + if project is not None: manifest = append_to_manifest(project) write_to_manifest(manifest) projects.append(target_path) @@ -264,15 +261,17 @@ def fetch_device(device): if check_device_exists(device): print("WARNING: Trying to fetch a device that's already there") return - git_data = search_github_for_device(device) - device_url = get_device_url(git_data) - device_dir = parse_device_directory(device_url,device) + git_data = search_gerrit_for_device(device) + device_url = git_data['id'] + device_dir = parse_device_directory(device_url, device) project = create_manifest_project(device_url, device_dir, remote=default_team_rem) - if not project is None: + if project is not None: manifest = append_to_manifest(project) write_to_manifest(manifest) + # In case a project was written to manifest, but never synced + if project is not None or not check_target_exists(device_dir): print("syncing the device config") os.system('repo sync -f --no-clone-bundle %s' % device_dir) From c3a766ae6268d541d63b79f450713047bc94214a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Oct 2014 06:25:58 -0700 Subject: [PATCH 421/837] "LMX01" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..8d6d894d570 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX01 From 4b9e7b291813d5713a542746177e94a9e6a1f9ee Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Oct 2014 06:34:28 -0700 Subject: [PATCH 422/837] "LRX01" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..40cb073d830 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX01 From 8ef2b7921fd6c176a1259dadc6ad653966d50f12 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Oct 2014 11:38:46 -0700 Subject: [PATCH 423/837] LRX01B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40cb073d830..b56593e4d60 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX01 +export BUILD_ID=LRX01B From b1acf1a1972444f01cfdd4712c569da24d52862f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Oct 2014 15:22:26 -0700 Subject: [PATCH 424/837] "LRX01C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b56593e4d60..b0e02e085e0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX01B +export BUILD_ID=LRX01C From bc3772e224b1514a854991ac581542ec5e1d936d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Oct 2014 17:31:11 -0700 Subject: [PATCH 425/837] LRX01D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b0e02e085e0..d24d63ae406 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX01C +export BUILD_ID=LRX01D From dd133fcef3a51a3e0b86a19c8e200b598503db3f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Oct 2014 05:38:39 -0700 Subject: [PATCH 426/837] "LRX02" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..657e0a311b0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX02 From 024d7ede11bf9ae8623c324d573f954c2883586b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Oct 2014 06:27:49 -0700 Subject: [PATCH 427/837] "LMX02" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..f3f67763662 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX02 From 01bd267d391f3f0bdbba80035dcd35b39ad42dea Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Oct 2014 11:40:23 -0700 Subject: [PATCH 428/837] "LRX02B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 657e0a311b0..fcf28d88b62 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX02 +export BUILD_ID=LRX02B From 2b327db6a5a5e573ae4ff6be653052cd3cefa03d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Oct 2014 14:42:56 -0700 Subject: [PATCH 429/837] "LRX02C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fcf28d88b62..73e8cbcd96a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX02B +export BUILD_ID=LRX02C From 3e206e5cefc4e3176715752bf9e7ac6a196d4c46 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Oct 2014 17:01:07 -0700 Subject: [PATCH 430/837] "LRX02D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 73e8cbcd96a..0b443d5877e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX02C +export BUILD_ID=LRX02D From 10e5c824495162cf774f55e019a990dc52cc1048 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Oct 2014 22:38:36 -0700 Subject: [PATCH 431/837] "LRX02E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0b443d5877e..4801d0a77bb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX02D +export BUILD_ID=LRX02E From 7e48c86cf6e5940b4fca14ef0cdc072e56d19f57 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 Oct 2014 09:20:47 -0700 Subject: [PATCH 432/837] "LRX02F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4801d0a77bb..eda85f1b65f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX02E +export BUILD_ID=LRX02F From 91f69b19f45b32d50ef21ecf54df81edaf586734 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 Oct 2014 12:39:48 -0700 Subject: [PATCH 433/837] "LRX02G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index eda85f1b65f..c1c46d57543 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX02F +export BUILD_ID=LRX02G From a0224a0b0b5d5434d265394abab169f82873df87 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 Oct 2014 15:05:19 -0700 Subject: [PATCH 434/837] LRX02H --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c1c46d57543..783019ae8e2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX02G +export BUILD_ID=LRX02H From 51ea6799c89445f87f68a6429e5382ab642b76a1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 4 Oct 2014 06:22:16 -0700 Subject: [PATCH 435/837] "LMX04" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..6b15f039710 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX04 From c90ed2f9c8afc752ea27013d2bb58566943816b1 Mon Sep 17 00:00:00 2001 From: Max Weninger Date: Sun, 5 Oct 2014 01:00:23 +0200 Subject: [PATCH 436/837] Revert "[2/2] build: Remove Voice Dialer" This reverts commit f955dd66e1e7914c5281656f39b7798c7695744a. PS2: -added libsrec_jni Change-Id: Ifc3c38c0c4a4c408c3c08d03638d579adcaf5d28 --- target/product/full_base_telephony.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk index 813348b248e..1fc86d0101c 100644 --- a/target/product/full_base_telephony.mk +++ b/target/product/full_base_telephony.mk @@ -19,6 +19,10 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. +PRODUCT_PACKAGES := \ + VoiceDialer \ + libsrec_jni + PRODUCT_PROPERTY_OVERRIDES := \ keyguard.no_require_sim=true \ ro.com.android.dataroaming=true From 4430e0046d3402de7f47489f0cf9383182a57e38 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 5 Oct 2014 06:15:55 -0700 Subject: [PATCH 437/837] "LMX05" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..76c3a689611 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX05 From 6846bd3bb2587f38e80e9e93c8dbf0f206360e92 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 5 Oct 2014 06:24:28 -0700 Subject: [PATCH 438/837] "LRX05" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..47370cf1833 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX05 From 825633f976a47a6e5661b8f2c1a6d31bc1467c79 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Oct 2014 06:16:35 -0700 Subject: [PATCH 439/837] "LMX06" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..7a36cc1a2cb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX06 From c8b7299cd5c6178e62152afd8d9962c81adc144e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Oct 2014 06:19:30 -0700 Subject: [PATCH 440/837] "LRX06" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..95844ef3e5e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX06 From fd1e7f34b1efb1da9bc0a4f550fb6bfc02a61486 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Oct 2014 12:58:58 -0700 Subject: [PATCH 441/837] "LRX06B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 95844ef3e5e..79be8a21bed 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX06 +export BUILD_ID=LRX06B From 688ede158a68706e991fc3e91662960be2647965 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Oct 2014 15:23:23 -0700 Subject: [PATCH 442/837] "LRX06C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 79be8a21bed..19b0330477e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX06B +export BUILD_ID=LRX06C From 6085ea66fff20541b2631dd7974962eca6becdab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Oct 2014 17:51:27 -0700 Subject: [PATCH 443/837] "LRX06D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 19b0330477e..a65096420a5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX06C +export BUILD_ID=LRX06D From b99339c595f03d77d3f9b8119c15e6dee7bcd59a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Oct 2014 06:20:30 -0700 Subject: [PATCH 444/837] "LMX07" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..8e0869800f6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX07 From abc00a21e31d5a27a9af4e06334d15f1dbd5f588 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Oct 2014 06:24:00 -0700 Subject: [PATCH 445/837] "LRX07" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..52e014a2af8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX07 From 9c61c3934349bc7645c31227ee3dd6d766d744a5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Oct 2014 13:51:58 -0700 Subject: [PATCH 446/837] "LRX07B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 52e014a2af8..433072f124b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX07 +export BUILD_ID=LRX07B From 491ce097e91ba0bc1e5da67a0661c4715be03097 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Oct 2014 16:50:26 -0700 Subject: [PATCH 447/837] "LRX07C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 433072f124b..d7a1a76e4fc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX07B +export BUILD_ID=LRX07C From 386e0b8df70f67a131ba2ea1784012e86d77def1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Oct 2014 03:10:43 -0700 Subject: [PATCH 448/837] LRX07D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d7a1a76e4fc..57c200c753d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX07C +export BUILD_ID=LRX07D From 82db6d7d01d3ab5afad0fe52a1c57c3e85ccd0da Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Oct 2014 06:23:08 -0700 Subject: [PATCH 449/837] "LMX08" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..1553b54c6a6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX08 From d0277f2cfad48c47a83ee821640d69a635182552 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Oct 2014 06:27:00 -0700 Subject: [PATCH 450/837] "LRX08" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..40b8fc37a4e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX08 From 7c7f7ba2f00e92ee896a696d4940ef9944626e5d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Oct 2014 13:30:36 -0700 Subject: [PATCH 451/837] "LRX08B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40b8fc37a4e..87e7d5b5814 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX08 +export BUILD_ID=LRX08B From 820afb65ec63d1f3ef004e009ff922de48a08d93 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Oct 2014 13:42:55 -0700 Subject: [PATCH 452/837] LRX08C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 87e7d5b5814..b1cbe70ef34 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX08B +export BUILD_ID=LRX08C From 1e321567fced560c310f55b5ad62f4d39da01afc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Oct 2014 19:26:59 -0700 Subject: [PATCH 453/837] LRX08D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b1cbe70ef34..11e6413c350 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX08C +export BUILD_ID=LRX08D From 68aef74ea3174b30748d284bb00caefe05c2a1ec Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Oct 2014 06:17:07 -0700 Subject: [PATCH 454/837] "LMX09" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..94b1bcb2496 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX09 From 90381372180847d82a3bbb69d47ea7b0a644b6a6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Oct 2014 06:20:38 -0700 Subject: [PATCH 455/837] "LRX09" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..52e628dab9e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX09 From d3a50e8e53ab4fc3eefe5eaec140a5f8f25be49c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Oct 2014 12:25:08 -0700 Subject: [PATCH 456/837] "LRX09B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 52e628dab9e..ee975fbe7ba 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX09 +export BUILD_ID=LRX09B From 1e0dce6a9f9f18f5b6d01299372d962b23dd7473 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Oct 2014 15:22:48 -0700 Subject: [PATCH 457/837] "LRX09C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ee975fbe7ba..738a2134e1d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX09B +export BUILD_ID=LRX09C From b33b4d5db410125409225987c098f6111604f62a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Oct 2014 17:21:03 -0700 Subject: [PATCH 458/837] "LRX09D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 738a2134e1d..b79bd9fdbf6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX09C +export BUILD_ID=LRX09D From f053fd870604ea3ffb8468aadcc46ac630d69619 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 10 Oct 2014 09:19:23 -0700 Subject: [PATCH 459/837] "LRX09E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b79bd9fdbf6..71776081594 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX09D +export BUILD_ID=LRX09E From 53c0e9f20c4a9d6a0734fd3ef6b29f859d3ae007 Mon Sep 17 00:00:00 2001 From: Raphael Moll Date: Thu, 9 Oct 2014 17:48:12 -0700 Subject: [PATCH 460/837] SDK Addon multi-sys-img support. Fix an issue where the add-on system images have 2 extra inner folders. The sole root folder in the zip file should be the ABI one. Change-Id: Ie12b913438e2b1113d34222e467ff280daa23c7f --- core/tasks/sdk-addon.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index b32536cef25..5ac9b7d47b0 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -80,7 +80,7 @@ $(foreach cf,$(files_to_copy), \ ) # The system-image source.properties is a template that we directly expand in-place -addon_img_source_prop := $(call append-path,$(staging),$(addon_dir_img))/images/source.properties +addon_img_source_prop := $(call append-path,$(staging),$(addon_dir_img))/images/$(TARGET_CPU_ABI)/source.properties sdk_addon_deps += $(addon_img_source_prop) $(addon_img_source_prop): $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP) @@ -113,7 +113,7 @@ $(full_target): $(sdk_addon_deps) | $(ACP) $(hide) mkdir -p $(dir $@) $(hide) ( F=$$(pwd)/$@ ; cd $(PRIVATE_STAGING_DIR)/.. && zip -rq $$F $(notdir $(PRIVATE_STAGING_DIR)) ) -$(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_img)) +$(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_img))/images/$(TARGET_CPU_ABI) $(full_target_img): $(full_target) $(addon_img_source_prop) @echo Packaging SDK Addon System-Image: $@ $(hide) mkdir -p $(dir $@) From cc215216a62a2a0fd326668374ab3aee90f09705 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 10 Oct 2014 12:01:37 -0700 Subject: [PATCH 461/837] "LRX09F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 71776081594..b248948bff2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX09E +export BUILD_ID=LRX09F From 6faf33406eedad8fb0f2f10c53a2dd32ab916ee6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 10 Oct 2014 15:03:37 -0700 Subject: [PATCH 462/837] "LRX09G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b248948bff2..ea66622ce31 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX09F +export BUILD_ID=LRX09G From cd28c8c90d3b1edd4167c97ad187e2f5836747d9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 10 Oct 2014 15:42:19 -0700 Subject: [PATCH 463/837] LMX09B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 94b1bcb2496..298db867a60 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX09 +export BUILD_ID=LMX09B From 2c2160ce3ad3b42d37fe66a826cf44039d49087b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 11 Oct 2014 06:17:37 -0700 Subject: [PATCH 464/837] "LMX11" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..e42bf799c24 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX11 From 2d617c11d71c4852cb4c1fb4d717346509df3fe8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 12 Oct 2014 06:14:09 -0700 Subject: [PATCH 465/837] "LMX12" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..c88e97986f4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX12 From 33bf9cff5f2a463a4bf4a41f3c7a16f6e97b07f4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 12 Oct 2014 06:20:21 -0700 Subject: [PATCH 466/837] "LRX12" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..f4dd1c806ae 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX12 From 758bc2d0a4ea14261f92c1259cd226a4701ca771 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 12 Oct 2014 15:08:29 -0700 Subject: [PATCH 467/837] "LRX12B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f4dd1c806ae..1d5e0706b5c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX12 +export BUILD_ID=LRX12B From 6582df88fa1aa7ccba67e269ccd6425b635f2912 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Oct 2014 06:15:20 -0700 Subject: [PATCH 468/837] "LMX13" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..f78a5bc0fef 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX13 From 7f1d30b4c94795870a5adf484d2c148b64d857e2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Oct 2014 06:17:08 -0700 Subject: [PATCH 469/837] "LRX13" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..438c9da64c9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX13 From 52c402baead5830a5f8c0978ad58b748e38c52ac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Oct 2014 14:11:31 -0700 Subject: [PATCH 470/837] "LMX13B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f78a5bc0fef..a99fa93cb65 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX13 +export BUILD_ID=LMX13B From 1dde2c524c5d4e706dbd0b788a22686a97c5cb40 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Oct 2014 15:13:33 -0700 Subject: [PATCH 471/837] "LRX13B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 438c9da64c9..535478dca39 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX13 +export BUILD_ID=LRX13B From d350b1377f5c60971e2a4fed396689d87629e88b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Oct 2014 17:35:14 -0700 Subject: [PATCH 472/837] "LRX13C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 535478dca39..fb2bb09a6b0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX13B +export BUILD_ID=LRX13C From f89fe4affaefaf5d0636cd114fcb15621d56237d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Oct 2014 06:17:37 -0700 Subject: [PATCH 473/837] "LMX14" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..111e02ec5bf 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX14 From 4b167c4c2a3646409f6bec682c9a3d10410e2eb9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Oct 2014 06:19:01 -0700 Subject: [PATCH 474/837] "LRX14" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..eb0fe478588 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX14 From eb575c2fff6e5dd45a11c33850adc25d1eac83cd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Oct 2014 15:15:08 -0700 Subject: [PATCH 475/837] "LRX14B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index eb0fe478588..fbf16e88aa8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX14 +export BUILD_ID=LRX14B From 354640ef5d09dd35cbead064de68b49ffdca2692 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Oct 2014 16:53:11 -0700 Subject: [PATCH 476/837] "LRX14C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fbf16e88aa8..ce71724b7ca 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX14B +export BUILD_ID=LRX14C From 406b1b298ad8ac7f938f7368a7dfeb457139118f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 Oct 2014 06:18:46 -0700 Subject: [PATCH 477/837] "LMX15" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..b78a154ab40 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX15 From 67685a19859ba3cf7203c4b4f9fa5a52f7256b79 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 Oct 2014 06:22:38 -0700 Subject: [PATCH 478/837] "LRX15" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..e5f66106277 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX15 From aaae61f27316abd5165be3110ffcf57fb621ef2d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 Oct 2014 15:03:03 -0700 Subject: [PATCH 479/837] "LRX15B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e5f66106277..4d60fd35687 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX15 +export BUILD_ID=LRX15B From 0c02d1c570606ae6f1a59d2ccc83560ef3d819cb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Oct 2014 06:19:52 -0700 Subject: [PATCH 480/837] "LMX16" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..d46d7a0ca59 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX16 From 710658bb7b34865df4c2fc9fe997cc57b99d8539 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Oct 2014 06:22:18 -0700 Subject: [PATCH 481/837] "LRX16" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..9ec31fc987e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX16 From 1d72186027275e443a3429e3e49dad18ec304424 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Oct 2014 12:40:49 -0700 Subject: [PATCH 482/837] "LRX16B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9ec31fc987e..551ab4eb9d3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX16 +export BUILD_ID=LRX16B From 7224491e316a958c2f9c2d8a791b58d648ee6497 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Oct 2014 15:35:33 -0700 Subject: [PATCH 483/837] "LRX16C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 551ab4eb9d3..adb24db7f7f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX16B +export BUILD_ID=LRX16C From 071cc5063d230f4fa3669e386925a90254c13271 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Oct 2014 17:07:05 -0700 Subject: [PATCH 484/837] "LRX16D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index adb24db7f7f..e9a301f68d7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX16C +export BUILD_ID=LRX16D From b63ca6cf9f9b6a847ac272bbfbf652fed87917e0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Oct 2014 21:11:01 -0700 Subject: [PATCH 485/837] "LRX16E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e9a301f68d7..ee06213a868 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX16D +export BUILD_ID=LRX16E From 00356f0a2670f04c7fa585f1358ccc47e0420b3a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Oct 2014 12:10:54 -0700 Subject: [PATCH 486/837] "LRX16F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ee06213a868..09551a9f686 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX16E +export BUILD_ID=LRX16F From e8f34b1281be0312ee6a460f5f593103fb3cc257 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Oct 2014 16:18:40 -0700 Subject: [PATCH 487/837] "LRX16G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 09551a9f686..ffec702b5e7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX16F +export BUILD_ID=LRX16G From 3d9bdcb1c5c6d77da6b99281f329827ee56087ec Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 18 Oct 2014 06:17:40 -0700 Subject: [PATCH 488/837] "LMX18" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..867de878df0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX18 From 035493abfe4bc898e735b3f6c992146f39945fed Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 19 Oct 2014 06:13:03 -0700 Subject: [PATCH 489/837] "LMX19" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..49771406d97 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX19 From ddec2f0d78a76243569228bfebd90f294e74d2e1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 19 Oct 2014 17:23:06 -0700 Subject: [PATCH 490/837] "LRX19" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..a232659266b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX19 From 23ac22b7503b3ef633564daae562412e121714a6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 19 Oct 2014 23:16:46 -0700 Subject: [PATCH 491/837] LRX19B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a232659266b..7b3476be3d7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX19 +export BUILD_ID=LRX19B From 84ec89b1a165ed8705a90a39e17819d8265c550f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 20 Oct 2014 06:14:36 -0700 Subject: [PATCH 492/837] "LMX20" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..c92a7ab12a3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX20 From abea941acebd0120aaa44231d53a84e8d3e9e5ff Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 20 Oct 2014 07:28:38 -0700 Subject: [PATCH 493/837] LRX19C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7b3476be3d7..22ec60b1ff4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX19B +export BUILD_ID=LRX19C From 37b0f69e6633b73a4b08f3fd177c5272e24eaa0e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 20 Oct 2014 14:20:58 -0700 Subject: [PATCH 494/837] "LMX20B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c92a7ab12a3..054daa7d944 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX20 +export BUILD_ID=LMX20B From 12f25bcfba218bb720cc5fe7de7230cbbeaa57a8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Oct 2014 06:19:20 -0700 Subject: [PATCH 495/837] "LMX21" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..94c9a13add6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX21 From 7e75a56e5f48f92c9a676aad427c7837ee614d02 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Oct 2014 06:20:39 -0700 Subject: [PATCH 496/837] "LRX21" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..f15bd6b2eb1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX21 From 905b5dd42f895e823d990a3d53ed222fa9f0249d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Oct 2014 10:03:23 -0700 Subject: [PATCH 497/837] "LRX21B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f15bd6b2eb1..66cd76f1756 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21 +export BUILD_ID=LRX21B From b3bec88d22f67802a757a2549c95f9374c21afec Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Oct 2014 14:49:35 -0700 Subject: [PATCH 498/837] "LMX21B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 94c9a13add6..fe9abd08620 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX21 +export BUILD_ID=LMX21B From f579b3acbb8b9ecc2dc869da3ce6c5670abb5a5b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Oct 2014 17:50:44 -0700 Subject: [PATCH 499/837] "LRX21C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..6a35db7320d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LRX21C From cd08a5df48af50739520955111ce2c6171753d86 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Oct 2014 06:15:25 -0700 Subject: [PATCH 500/837] "LMX22" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..89a7492352d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX22 From a28925b917166c2c3d1bfbaf874117915412d5e3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Oct 2014 11:33:33 -0700 Subject: [PATCH 501/837] "LRX21D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6a35db7320d..9e519f34dd0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21C +export BUILD_ID=LRX21D From e0984085868fb36e61fc400d839632a453ecd7ea Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Oct 2014 15:10:59 -0700 Subject: [PATCH 502/837] "LMX22B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 89a7492352d..c6d2cacc947 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX22 +export BUILD_ID=LMX22B From d462146cb60db849fb3c4c75cc9c857976dbf33d Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 21 Oct 2014 21:20:41 -0700 Subject: [PATCH 503/837] Use the lowest common denominator 32-bit abi for arm64 cts build. So the 32-bit code can be run any supported 32-bit arm devices. Bug: 18038310 Change-Id: Ie8864cfdb87a4759d1a775d43cb5316b1f022e2b --- target/board/generic_arm64/BoardConfig.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index c57447d1436..818f857089d 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -25,13 +25,13 @@ TARGET_2ND_ARCH := arm TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi -ifdef TARGET_BUILD_APPS +ifneq ($(TARGET_BUILD_APPS)$(filter cts,$(MAKECMDGOALS)),) # DO NOT USE # DO NOT USE # # This architecture / CPU variant must NOT be used for any 64 bit # platform builds. It is the lowest common denominator required -# to build an unbundled application for all supported 32 and 64 bit +# to build an unbundled application or cts for all supported 32 and 64 bit # platforms. # # If you're building a 64 bit platform (and not an application) the @@ -82,4 +82,3 @@ BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 512 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true - From 6c7965f240841c2fcc7f6155d2540356de464573 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Oct 2014 17:44:48 -0700 Subject: [PATCH 504/837] "LRX21E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9e519f34dd0..117845d9b73 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21D +export BUILD_ID=LRX21E From 6b306303903a408520853248fabd649e6b81026b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Oct 2014 06:18:25 -0700 Subject: [PATCH 505/837] "LMX23" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..f3914d8343e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX23 From 7dbaace43cb9a39e720784deb1638ec23927be06 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Oct 2014 16:17:49 -0700 Subject: [PATCH 506/837] "LMX23B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f3914d8343e..079bef86df6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX23 +export BUILD_ID=LMX23B From 65f3282099a16e266bc61e0ed3016e15f6bd8959 Mon Sep 17 00:00:00 2001 From: Michael Runge Date: Wed, 22 Oct 2014 17:21:48 -0700 Subject: [PATCH 507/837] Allow info_dict from target_files to specify mount options This will allow safer mount options to be added per mount FS type, to better ensure data is written during an OTA. Bug: 18079773, 18092222 Change-Id: I1e3e4fd4639c6fd263e550b770cc3c858ef1e03b --- tools/releasetools/edify_generator.py | 19 +++++++++++++++---- tools/releasetools/ota_from_target_files | 19 ++++++++++++------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index 2bd071d4b21..e4b925299cf 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -164,14 +164,25 @@ def CacheFreeSpaceCheck(self, amount): self.script.append(('apply_patch_space(%d) || abort("Not enough free space ' 'on /system to apply patches.");') % (amount,)) - def Mount(self, mount_point): - """Mount the partition with the given mount_point.""" + def Mount(self, mount_point, mount_options_by_format=""): + """Mount the partition with the given mount_point. + mount_options_by_format: + [fs_type=option[,option]...[|fs_type=option[,option]...]...] + where option is optname[=optvalue] + E.g. ext4=barrier=1,nodelalloc,errors=panic|f2fs=errors=recover + """ fstab = self.info.get("fstab", None) if fstab: p = fstab[mount_point] - self.script.append('mount("%s", "%s", "%s", "%s");' % + mount_dict = {} + if mount_options_by_format is not None: + for option in mount_options_by_format.split("|"): + if "=" in option: + key, value = option.split("=", 1) + mount_dict[key] = value + self.script.append('mount("%s", "%s", "%s", "%s", "%s");' % (p.fs_type, common.PARTITION_TYPES[p.fs_type], - p.device, p.mount_point)) + p.device, p.mount_point, mount_dict.get(p.fs_type, ""))) self.mounts.add(p.mount_point) def UnpackPackageDir(self, src, dst): diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index e8dff5af91a..2a3ab89fd24 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -462,11 +462,12 @@ def WriteFullOTAPackage(input_zip, output_zip): script = edify_generator.EdifyGenerator(3, OPTIONS.info_dict) oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties") + recovery_mount_options = OPTIONS.info_dict.get("recovery_mount_options") oem_dict = None if oem_props is not None and len(oem_props) > 0: if OPTIONS.oem_source is None: raise common.ExternalError("OEM source required for this build") - script.Mount("/oem") + script.Mount("/oem", recovery_mount_options) oem_dict = common.LoadDictionaryFromLines(open(OPTIONS.oem_source).readlines()) metadata = {"post-build": CalculateFingerprint( @@ -548,6 +549,8 @@ else if get_stage("%(bcb_dev)s", "stage") == "3/3" then if "selinux_fc" in OPTIONS.info_dict: WritePolicyConfig(OPTIONS.info_dict["selinux_fc"], output_zip) + recovery_mount_options = OPTIONS.info_dict.get("recovery_mount_options") + system_items = ItemSet("system", "META/filesystem_config.txt") script.ShowProgress(system_progress, 0) if block_based: @@ -561,7 +564,7 @@ else if get_stage("%(bcb_dev)s", "stage") == "3/3" then system_diff.WriteScript(script, output_zip) else: script.FormatPartition("/system") - script.Mount("/system") + script.Mount("/system", recovery_mount_options) if not has_recovery_patch: script.UnpackPackageDir("recovery", "/system") script.UnpackPackageDir("system", "/system") @@ -594,7 +597,7 @@ else if get_stage("%(bcb_dev)s", "stage") == "3/3" then vendor_diff.WriteScript(script, output_zip) else: script.FormatPartition("/vendor") - script.Mount("/vendor") + script.Mount("/vendor", recovery_mount_options) script.UnpackPackageDir("vendor", "/vendor") symlinks = CopyPartitionFiles(vendor_items, input_zip, output_zip) @@ -745,11 +748,12 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip): vendor_diff = None oem_props = OPTIONS.target_info_dict.get("oem_fingerprint_properties") + recovery_mount_options = OPTIONS.target_info_dict.get("recovery_mount_options") oem_dict = None if oem_props is not None and len(oem_props) > 0: if OPTIONS.oem_source is None: raise common.ExternalError("OEM source required for this build") - script.Mount("/oem") + script.Mount("/oem", recovery_mount_options) oem_dict = common.LoadDictionaryFromLines(open(OPTIONS.oem_source).readlines()) AppendAssertions(script, OPTIONS.target_info_dict, oem_dict) @@ -1035,11 +1039,12 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): OPTIONS.target_info_dict) oem_props = OPTIONS.info_dict.get("oem_fingerprint_properties") + recovery_mount_options = OPTIONS.info_dict.get("recovery_mount_options") oem_dict = None if oem_props is not None and len(oem_props) > 0: if OPTIONS.oem_source is None: raise common.ExternalError("OEM source required for this build") - script.Mount("/oem") + script.Mount("/oem", recovery_mount_options) oem_dict = common.LoadDictionaryFromLines(open(OPTIONS.oem_source).readlines()) metadata = {"pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict, @@ -1059,10 +1064,10 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): info_dict=OPTIONS.info_dict) system_diff = FileDifference("system", source_zip, target_zip, output_zip) - script.Mount("/system") + script.Mount("/system", recovery_mount_options) if HasVendorPartition(target_zip): vendor_diff = FileDifference("vendor", source_zip, target_zip, output_zip) - script.Mount("/vendor") + script.Mount("/vendor", recovery_mount_options) else: vendor_diff = None From f9d181979097af3f4a62dad9fff318a916759597 Mon Sep 17 00:00:00 2001 From: Michael Runge Date: Thu, 23 Oct 2014 13:51:04 -0700 Subject: [PATCH 508/837] get_stage in updater takes one param, not two. Change-Id: I09a77eda5a1691080b1ae074d2e94d233eca7150 --- tools/releasetools/ota_from_target_files | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 2a3ab89fd24..5cf9873e8e5 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -528,13 +528,13 @@ def WriteFullOTAPackage(input_zip, output_zip): bcb_dev = {"bcb_dev": fs.device} common.ZipWriteStr(output_zip, "recovery.img", recovery_img.data) script.AppendExtra(""" -if get_stage("%(bcb_dev)s", "stage") == "2/3" then +if get_stage("%(bcb_dev)s") == "2/3" then """ % bcb_dev) script.WriteRawImage("/recovery", "recovery.img") script.AppendExtra(""" set_stage("%(bcb_dev)s", "3/3"); reboot_now("%(bcb_dev)s", "recovery"); -else if get_stage("%(bcb_dev)s", "stage") == "3/3" then +else if get_stage("%(bcb_dev)s") == "3/3" then """ % bcb_dev) device_specific.FullOTA_InstallBegin() @@ -789,14 +789,14 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip): bcb_dev = {"bcb_dev": fs.device} common.ZipWriteStr(output_zip, "recovery.img", target_recovery.data) script.AppendExtra(""" -if get_stage("%(bcb_dev)s", "stage") == "2/3" then +if get_stage("%(bcb_dev)s") == "2/3" then """ % bcb_dev) script.AppendExtra("sleep(20);\n"); script.WriteRawImage("/recovery", "recovery.img") script.AppendExtra(""" set_stage("%(bcb_dev)s", "3/3"); reboot_now("%(bcb_dev)s", "recovery"); -else if get_stage("%(bcb_dev)s", "stage") != "3/3" then +else if get_stage("%(bcb_dev)s") != "3/3" then """ % bcb_dev) script.Print("Verifying current system...") @@ -1138,14 +1138,14 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): bcb_dev = {"bcb_dev": fs.device} common.ZipWriteStr(output_zip, "recovery.img", target_recovery.data) script.AppendExtra(""" -if get_stage("%(bcb_dev)s", "stage") == "2/3" then +if get_stage("%(bcb_dev)s") == "2/3" then """ % bcb_dev) script.AppendExtra("sleep(20);\n"); script.WriteRawImage("/recovery", "recovery.img") script.AppendExtra(""" set_stage("%(bcb_dev)s", "3/3"); reboot_now("%(bcb_dev)s", "recovery"); -else if get_stage("%(bcb_dev)s", "stage") != "3/3" then +else if get_stage("%(bcb_dev)s") != "3/3" then """ % bcb_dev) script.Print("Verifying current system...") From 5ac4f7ab58ab514bc140be67a19dfa1bc9e94d05 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Oct 2014 17:38:40 -0700 Subject: [PATCH 509/837] "LRX21F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 117845d9b73..c11a1bc4310 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21E +export BUILD_ID=LRX21F From e38716a5adee1720806c55e1d49262e4741b29ce Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Oct 2014 11:00:42 -0700 Subject: [PATCH 510/837] "LMX23C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 079bef86df6..a09dafb8f35 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX23B +export BUILD_ID=LMX23C From 0d82e8106aeffa47599c34eac752f6457249f973 Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Wed, 22 Oct 2014 20:01:22 -0700 Subject: [PATCH 511/837] core: Let the build specify mount options for recovery Currently recovery install/patch will mount /system++ with only default options. The default options are not very suitable for dealing with crashes. We now use TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS that can specify which mount options to use for a given fs-type. # =[|]... # fstype_opts := [,]... # opt := [=] If only defaults are to be used, then the BoardConfig.mk can just have an empty (must have ""): TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := "" The default is "ext4=match_batch_time=0,commit=1,data=journal,barrier=1,errors=panic,nodelalloc" The release tools will pick them up with https://googleplex-android-review.git.corp.google.com/#/c/573628 Bug: 18092222 Change-Id: Iaa59099b0edf5af8835d1862fada089cff58882c --- core/Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/core/Makefile b/core/Makefile index 72ca56cbd66..f411e066b57 100644 --- a/core/Makefile +++ b/core/Makefile @@ -674,6 +674,12 @@ endif endif endif +# These options tell the recovery updater/installer how to mount the partitions writebale. +# =[|]... +# fstype_opts := [,]... +# opt := [=] +DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ext4=match_batch_time=0,commit=1,data=journal,barrier=1,errors=panic,nodelalloc + ifneq (true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED)) INTERNAL_USERIMAGES_SPARSE_EXT_FLAG := -s endif @@ -1395,6 +1401,12 @@ ifdef BOARD_BOOTIMAGE_PARTITION_SIZE endif ifdef BOARD_RECOVERYIMAGE_PARTITION_SIZE $(hide) echo "recovery_size=$(BOARD_RECOVERYIMAGE_PARTITION_SIZE)" >> $(zip_root)/META/misc_info.txt +endif +ifdef TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS + @# TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS can be empty to indicate that nothing but defaults should be used. + $(hide) echo "recovery_mount_options=$(TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $(zip_root)/META/misc_info.txt +else + $(hide) echo "recovery_mount_options=$(DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS)" >> $(zip_root)/META/misc_info.txt endif $(hide) echo "tool_extensions=$(tool_extensions)" >> $(zip_root)/META/misc_info.txt $(hide) echo "default_system_dev_certificate=$(DEFAULT_SYSTEM_DEV_CERTIFICATE)" >> $(zip_root)/META/misc_info.txt From 3638ea98ba14c5a8ef53ee7efca8560dc77123c0 Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Thu, 23 Oct 2014 16:27:03 -0700 Subject: [PATCH 512/837] core: Fixup bad ext4 mount options for recovery (pick common denominator) Some ext4 options were not suitable for all kernel versions. The current option were checked against kernels 3.0 3.4 3.10. Bug: 18092222 Change-Id: I30883706e5c8ac7a318f4b448d4becde50de808f --- core/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index f411e066b57..2177a182da2 100644 --- a/core/Makefile +++ b/core/Makefile @@ -678,7 +678,8 @@ endif # =[|]... # fstype_opts := [,]... # opt := [=] -DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ext4=match_batch_time=0,commit=1,data=journal,barrier=1,errors=panic,nodelalloc +# The following worked on Nexus devices with Kernel 3.1, 3.4, 3.10 +DEFAULT_TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ext4=max_batch_time=0,commit=1,data=ordered,barrier=1,errors=panic,nodelalloc ifneq (true,$(TARGET_USERIMAGES_SPARSE_EXT_DISABLED)) INTERNAL_USERIMAGES_SPARSE_EXT_FLAG := -s From 6c52aa39414b9b8de1e212a1967634ea3669eab9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Oct 2014 16:05:46 -0700 Subject: [PATCH 513/837] "LRX21G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c11a1bc4310..2c4cfc0b809 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21F +export BUILD_ID=LRX21G From f041a59bd590340989d40a14c6a30fb122f5f063 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Oct 2014 18:30:35 -0700 Subject: [PATCH 514/837] "LRX21H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2c4cfc0b809..83b417be08e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21G +export BUILD_ID=LRX21H From c828adf4d7c9e5dab77ca6c527f9c5b08de2ce6e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 25 Oct 2014 06:15:54 -0700 Subject: [PATCH 515/837] "LMX25" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..511da32ed08 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX25 From 4d5baee92c0e06e1fe44f4db3a0eb258de357d28 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 26 Oct 2014 06:13:34 -0700 Subject: [PATCH 516/837] "LMX26" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..6bbe4682517 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX26 From 83b77d52ca01db77a49e8893d586efd8b78e7f28 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 26 Oct 2014 08:20:58 -0700 Subject: [PATCH 517/837] LRX21I --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 83b417be08e..5f1ee05311c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21H +export BUILD_ID=LRX21I From 105c38977f7be049cec2c7121b72ccffb6387094 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 26 Oct 2014 12:41:22 -0700 Subject: [PATCH 518/837] LRX21J --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5f1ee05311c..c2d2c5468f8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21I +export BUILD_ID=LRX21J From a75d4d715ab820339dd0d0d5345d081668b31791 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Oct 2014 06:13:55 -0700 Subject: [PATCH 519/837] "LMX27" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..fd31f30170e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX27 From c60a9e658505d65de25ee34f29f937e2217dbde3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Oct 2014 14:12:32 -0700 Subject: [PATCH 520/837] "LRX21K" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c2d2c5468f8..a9e6385043c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21J +export BUILD_ID=LRX21K From 4a9dff64eedca6108a35d68dcf5daab1749604be Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Oct 2014 20:30:26 -0700 Subject: [PATCH 521/837] "LRX21L" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a9e6385043c..a3a258c53c9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21K +export BUILD_ID=LRX21L From 2b75a73909a2d21f84ad03395b434cc6a11d29e3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Oct 2014 06:20:48 -0700 Subject: [PATCH 522/837] "LMX28" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..775774f6901 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX28 From 01d264bc727f67eac4a6bc2b2ac18703fc1d0992 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Oct 2014 06:14:51 -0700 Subject: [PATCH 523/837] "LMX29" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..b893a5d6b10 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX29 From 7859c8c4a89793fa31206d90ec699edef947b376 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 24 Oct 2014 11:36:59 -0700 Subject: [PATCH 524/837] Store symbols.zip in apps_only build. Bug: 18103055 Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c --- core/Makefile | 6 +++++- core/main.mk | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 2177a182da2..b08ad1bcc56 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1510,10 +1510,14 @@ endif name := $(name)-symbols-$(FILE_NAME_TAG) SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip +# For apps_only build we'll establish the dependency later in build/core/main.mk. +ifndef TARGET_BUILD_APPS $(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE) $(INSTALLED_BOOTIMAGE_TARGET) +endif +$(SYMBOLS_ZIP): @echo "Package symbols: $@" $(hide) rm -rf $@ - $(hide) mkdir -p $(dir $@) + $(hide) mkdir -p $(dir $@) $(TARGET_OUT_UNSTRIPPED) $(hide) zip -qr $@ $(TARGET_OUT_UNSTRIPPED) # ----------------------------------------------------------------- diff --git a/core/main.mk b/core/main.mk index 749929a5f30..9d6e233d4c0 100644 --- a/core/main.mk +++ b/core/main.mk @@ -936,6 +936,9 @@ ifneq ($(TARGET_BUILD_APPS),) $(PROGUARD_DICT_ZIP) : $(apps_only_installed_files) $(call dist-for-goals,apps_only, $(PROGUARD_DICT_ZIP)) + $(SYMBOLS_ZIP) : $(apps_only_installed_files) + $(call dist-for-goals,apps_only, $(SYMBOLS_ZIP)) + .PHONY: apps_only apps_only: $(unbundled_build_modules) From e8269481084df086a04c6bdcd3477d4209d4a7cb Mon Sep 17 00:00:00 2001 From: Michael Runge Date: Tue, 28 Oct 2014 19:24:19 -0700 Subject: [PATCH 525/837] Add post-install verification phase Verify the SHA sum of all patched and extracted files after a file system remount. Bug: 18145574 Change-Id: I2f053d085543e10e39153a774542d37ee0a238bd --- tools/releasetools/edify_generator.py | 4 +++ tools/releasetools/ota_from_target_files | 31 ++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index e4b925299cf..7d318a31e17 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -323,6 +323,10 @@ def AppendExtra(self, extra): """Append text verbatim to the output script.""" self.script.append(extra) + def Unmount(self, mount_point): + self.script.append('unmount("%s");' % (mount_point,)) + self.mounts.remove(mount_point); + def UnmountAll(self): for p in sorted(self.mounts): self.script.append('unmount("%s");' % (p,)) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 5cf9873e8e5..755e5c2d2a4 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -37,6 +37,10 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package Generate an incremental OTA using the given target-files zip as the starting build. + -v (--verify) + Remount and verify the checksums of the files written to the + system and vendor (if used) partitions. Incremental builds only. + -o (--oem_settings) Use the file to specify the expected OEM-specific properties on the OEM partition of the intended device. @@ -104,6 +108,7 @@ import sparse_img OPTIONS = common.OPTIONS OPTIONS.package_key = None OPTIONS.incremental_source = None +OPTIONS.verify = False OPTIONS.require_verbatim = set() OPTIONS.prohibit_verbatim = set(("system/build.prop",)) OPTIONS.patch_threshold = 0.95 @@ -939,7 +944,7 @@ class FileDifference: raise common.ExternalError("\"%s\" must be sent verbatim" % (fn,)) print "send", fn, "verbatim" tf.AddToZip(output_zip) - verbatim_targets.append((fn, tf.size)) + verbatim_targets.append((fn, tf.size, tf.sha1)) if fn in target_data.keys(): AddToKnownPaths(fn, known_paths) elif tf.sha1 != sf.sha1: @@ -960,7 +965,7 @@ class FileDifference: # or a patch + rename cannot take place due to the target # directory not existing tf.AddToZip(output_zip) - verbatim_targets.append((tf.name, tf.size)) + verbatim_targets.append((tf.name, tf.size, tf.sha1)) if sf.name in renames: del renames[sf.name] AddToKnownPaths(tf.name, known_paths) @@ -980,6 +985,13 @@ class FileDifference: so_far += sf.size return so_far + def EmitExplicitTargetVerification(self, script): + for fn, size, sha1 in self.verbatim_targets: + if (fn[-1] != "/"): + script.FileCheck("/"+fn, sha1) + for tf, _, _, _ in self.patch_list: + script.FileCheck(tf.name, tf.sha1) + def RemoveUnneededFiles(self, script, extras=()): script.DeleteFiles(["/"+i[0] for i in self.verbatim_targets] + ["/"+i for i in sorted(self.source_data) @@ -1351,7 +1363,19 @@ endif; endif; """ % bcb_dev) + if OPTIONS.verify and system_diff: + script.Print("Remounting and verifying system partition files...") + script.Unmount("/system") + script.Mount("/system") + system_diff.EmitExplicitTargetVerification(script) + + if OPTIONS.verify and vendor_diff: + script.Print("Remounting and verifying vendor partition files...") + script.Unmount("/vendor") + script.Mount("/vendor") + vendor_diff.EmitExplicitTargetVerification(script) script.AddToZip(target_zip, output_zip, input_path=OPTIONS.updater_binary) + WriteMetadata(metadata, output_zip) @@ -1387,6 +1411,8 @@ def main(argv): OPTIONS.two_step = True elif o == "--no_signing": OPTIONS.no_signing = True + elif o in ("--verify"): + OPTIONS.verify = True elif o == "--block": OPTIONS.block_based = True elif o in ("-b", "--binary"): @@ -1412,6 +1438,7 @@ def main(argv): "block", "binary=", "oem_settings=", + "verify", "no_fallback_to_full", ], extra_option_handler=option_handler) From bf7954631b2abaced19ab298798595e334108b04 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Oct 2014 13:29:52 -0700 Subject: [PATCH 526/837] "LRX21M" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a3a258c53c9..78bb1053cdd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21L +export BUILD_ID=LRX21M From 6eac00bebef44489ab878119615ed9144f9fdd0b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Oct 2014 06:18:12 -0700 Subject: [PATCH 527/837] "LMX30" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..b9efec5478a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX30 From a7eedcf65289b8cf2e9b5dfb5d90dd9b02e75ea2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Oct 2014 10:41:22 -0700 Subject: [PATCH 528/837] LMX30B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b9efec5478a..fde2f7d1105 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX30 +export BUILD_ID=LMX30B From 2305f3f7e0d4d98d6c7aba6fec2c24f27b54d5bc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Oct 2014 14:35:12 -0700 Subject: [PATCH 529/837] LMX30C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fde2f7d1105..4a662535b6a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX30B +export BUILD_ID=LMX30C From 50c53ed6d342e359ab860bf3b1046adbd88b19a2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 31 Oct 2014 13:04:23 -0700 Subject: [PATCH 530/837] LMX30D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4a662535b6a..c6e13f7e250 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX30C +export BUILD_ID=LMX30D From 69a070b016ed2c49b42e1226f020e78b3c71331c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 31 Oct 2014 18:07:31 -0700 Subject: [PATCH 531/837] LRX21N --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 78bb1053cdd..4f7b45861d4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21M +export BUILD_ID=LRX21N From ed4fa87870dcf01b3fbf4bb3c8314ac68e13bbc8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 1 Nov 2014 06:16:48 -0700 Subject: [PATCH 532/837] "LMX32" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..d65f224250f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX32 From 2001fe1bc9bf6d4fc897ba5ae7c43db4ed6a3d3b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 2 Nov 2014 06:15:11 -0800 Subject: [PATCH 533/837] "LMX33" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..21f4e2f36ca 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX33 From 87c6f8dee7bad7155d172667ca92af0c58af3a81 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 3 Nov 2014 06:16:56 -0800 Subject: [PATCH 534/837] "LMX34" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..a6268d366c2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX34 From afcec322777bc476ab74e90d051a9cd4717a1857 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Nov 2014 06:18:55 -0800 Subject: [PATCH 535/837] "LMX35" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..9d97b0dd7f2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX35 From c064379b8d75c7c086d7d7cc4202d07953aef84d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Nov 2014 14:08:11 -0800 Subject: [PATCH 536/837] "LMX35B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9d97b0dd7f2..522767e1a10 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX35 +export BUILD_ID=LMX35B From 9febf8944f73f0fd8ea3316935808d9ef073ed08 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Nov 2014 15:29:00 -0800 Subject: [PATCH 537/837] "LMX35C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 522767e1a10..a5105fd03b2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX35B +export BUILD_ID=LMX35C From 2d06a98ee0b175c874282e4ba062f4c36231c92a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 5 Nov 2014 06:18:11 -0800 Subject: [PATCH 538/837] "LMX36" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..648dfcffb2c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX36 From ae8b3bbc761d1bdb93750df4f085e96adb6af69a Mon Sep 17 00:00:00 2001 From: XpLoDWilD Date: Wed, 5 Nov 2014 16:37:48 +0000 Subject: [PATCH 539/837] armv7-a-neon: Remove extraneous endif Change-Id: Ie6afe5033313a976fe9ad538eac1f5c460e09e25 --- core/combo/arch/arm/armv7-a-neon.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk index f48c68700c6..a4196338174 100644 --- a/core/combo/arch/arm/armv7-a-neon.mk +++ b/core/combo/arch/arm/armv7-a-neon.mk @@ -32,7 +32,6 @@ endif endif endif endif -endif arch_variant_cflags += \ -mfloat-abi=softfp \ From 412efc55ff1ef1330f9b146304a8bc97e0c4aeb0 Mon Sep 17 00:00:00 2001 From: XpLoDWilD Date: Wed, 5 Nov 2014 17:28:40 +0000 Subject: [PATCH 540/837] definitions: Fix merge mismatch Change-Id: Ia46d0f68bba102e76661ab079b5bd18d6efdf152 --- core/definitions.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/definitions.mk b/core/definitions.mk index 24cc56db4f7..17e8b30bd80 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1202,7 +1202,7 @@ define transform-o-to-static-lib @rm -f $@ $(extract-and-include-target-whole-static-libs) @echo -e ${PRT_TGT}"target StaticLib:"${CL_RST}" $(PRIVATE_MODULE) ($@)" -$(call split-long-arguments,$(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^)) +$(call split-long-arguments,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \ $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^)) endef From dda0ff05d7d406e4e7ac0a8a83c1d46b07850b98 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 5 Nov 2014 14:57:28 -0800 Subject: [PATCH 541/837] "LMX36B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 648dfcffb2c..bd19d40e162 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX36 +export BUILD_ID=LMX36B From 23186968db9f4c29dd5a90bf7f209b2b3e976027 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Nov 2014 06:22:38 -0800 Subject: [PATCH 542/837] "LMX37" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..fc83cbcbbe7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX37 From 66a8e317a4639dcd34715a493aa1e75412e90bcb Mon Sep 17 00:00:00 2001 From: Jiangyi Date: Thu, 6 Nov 2014 12:32:19 -0500 Subject: [PATCH 543/837] releasetools: Kill stray ] with fire Change-Id: I9396af24533396ce0576774843de4886938cac94 --- tools/releasetools/ota_from_target_files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 7662cfb662c..c94a2172104 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -1519,7 +1519,7 @@ def main(argv): "override_device=", "override_prop=", "two_step", - "mount_by_label="], + "mount_by_label=", "no_signing", "block", "binary=", From ae3535ffa5a33ce448cacb40c9d07582d73682a5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Nov 2014 14:14:51 -0800 Subject: [PATCH 544/837] "LMX37B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fc83cbcbbe7..f9fcc82b442 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX37 +export BUILD_ID=LMX37B From 51cd4a199f8f394817bd9e47ef46c9ef6803a045 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Nov 2014 15:30:21 -0800 Subject: [PATCH 545/837] "LRX37" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 78bb1053cdd..0318260f9e2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21M +export BUILD_ID=LRX37 From 3583942d9871bb0fc108279b28d0a9c6854aeee4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Nov 2014 15:46:33 -0800 Subject: [PATCH 546/837] LRX21O --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0318260f9e2..25d91f0c9a5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX37 +export BUILD_ID=LRX21O From 2fbeb6e63af8fba7a932004c885587f51901ab18 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Nov 2014 16:08:06 -0800 Subject: [PATCH 547/837] "LMX37C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f9fcc82b442..ee1ffaed191 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX37B +export BUILD_ID=LMX37C From ebbdf8eaddc689ab7e6abb15b61dfaea1c349e11 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Nov 2014 17:50:45 -0800 Subject: [PATCH 548/837] LRX21P --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4f7b45861d4..1571e645bc1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21N +export BUILD_ID=LRX21P From b4ad2f3b7cbfb8cec1123ad8756079d5223b0fc7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 7 Nov 2014 13:38:20 -0800 Subject: [PATCH 549/837] "LRX21Q" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1571e645bc1..f404c81d577 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21P +export BUILD_ID=LRX21Q From 4b41e8db14b9049faa9ce189b73b7a5eeb3b6f4b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 7 Nov 2014 13:56:45 -0800 Subject: [PATCH 550/837] "LRX21R" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f404c81d577..43630d1d3ed 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21Q +export BUILD_ID=LRX21R From 3676c2f1de679e753bb7e5fe28e359c6782df880 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 7 Nov 2014 17:40:50 -0800 Subject: [PATCH 551/837] "LRX21S" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 43630d1d3ed..59a495ec485 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21R +export BUILD_ID=LRX21S From b0a3a2830e81ecbb17df9e4903a002726412fb20 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 8 Nov 2014 06:20:04 -0800 Subject: [PATCH 552/837] "LMX39" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..db65b6382ca 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX39 From af0e30c249481684f793b51435483aa75014bec3 Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Fri, 7 Nov 2014 22:35:51 -0500 Subject: [PATCH 553/837] releasetools: Remove recovery build remnants This breaks "classic" (not blockmode) OTA ZIP generation Generating recovery patches was originally removed in 84a770ad 5.0 added some additional related stuff - remove those remnants. Change-Id: Idfb5540bd0c77b0cf69ac4290753fffc0c17f733 --- tools/releasetools/ota_from_target_files | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index c94a2172104..a0c753f3e49 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -644,8 +644,8 @@ else if get_stage("%(bcb_dev)s") == "3/3" then common.ZipWriteStr(output_zip, "recovery/" + fn, data) system_items.Get("system/" + fn, dir=False) - common.MakeRecoveryPatch(OPTIONS.input_tmp, output_sink, - recovery_img, boot_img) +# common.MakeRecoveryPatch(OPTIONS.input_tmp, output_sink, +# recovery_img, boot_img) system_items.GetMetadata(input_zip) system_items.Get("system").SetPermissions(script) From f2dcab92a00f5f70d470f9b52b007ed085af5a17 Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Sat, 8 Nov 2014 17:19:26 -0500 Subject: [PATCH 554/837] roomservice: Change default rev to 5.0 Change-Id: I24722df0f1bcac88619677707eb5b3240d4bd6e6 --- tools/roomservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index 746d0f125dd..b37bb1f63dc 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -38,7 +38,7 @@ # set this to the default remote to use in repo default_rem = "omnirom" # set this to the default revision to use (branch/tag name) -default_rev = "android-4.4" +default_rev = "android-5.0" # set this to the remote that you use for projects from your team repos # example fetch="https://github.com/omnirom" default_team_rem = "omnirom" From 57f11d02732fb6ab88ebf58bc6737a3b420afe72 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 9 Nov 2014 03:18:16 -0800 Subject: [PATCH 555/837] LMX39B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index db65b6382ca..2371f7bbde2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX39 +export BUILD_ID=LMX39B From f79a03bdd2f812034f8fbeb077bcb5d35ff7d8da Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 9 Nov 2014 08:07:57 -0800 Subject: [PATCH 556/837] "LMX40" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ee1ffaed191..bc3f6ffbe9f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX37C +export BUILD_ID=LMX40 From a056eb67880e4efabb820f2391c5a4d3919fd147 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 9 Nov 2014 08:16:41 -0800 Subject: [PATCH 557/837] LMX37D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index bc3f6ffbe9f..79e6a95814e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX40 +export BUILD_ID=LMX37D From 55e51de895547a8aa1959525a2a0401c89f54bd0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 9 Nov 2014 17:12:52 -0800 Subject: [PATCH 558/837] LMX37E --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 79e6a95814e..238a91b1eac 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX37D +export BUILD_ID=LMX37E From 264a8f94dc907807d5169b1a6cdb8e226779a6e3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Nov 2014 06:15:37 -0800 Subject: [PATCH 559/837] "LMX41" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..6a9228ae950 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX41 From 14bb1521d72eb543c81aa65d55b0504070959c4d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Nov 2014 11:06:55 -0800 Subject: [PATCH 560/837] "LRX21T" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 59a495ec485..73a331326ea 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21S +export BUILD_ID=LRX21T From 01878e9cf5f145a2f2d55c4d26085ee359d99a28 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Nov 2014 17:06:48 -0800 Subject: [PATCH 561/837] "LMX41B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6a9228ae950..ad41411bb88 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX41 +export BUILD_ID=LMX41B From c79379d5b35f3386997f5a70fc5093fb5d391b7b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 11 Nov 2014 06:15:52 -0800 Subject: [PATCH 562/837] "LMX42" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..a44cfbf4f0c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX42 From 576330ceb660f72d801fb659655d3924e6e28ab7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 11 Nov 2014 14:06:56 -0800 Subject: [PATCH 563/837] "LMX42B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a44cfbf4f0c..8bfcd8defef 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX42 +export BUILD_ID=LMX42B From 7a85190b5cea1f6ec86cbc2987b29433372969ac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Nov 2014 06:17:10 -0800 Subject: [PATCH 564/837] "LMX43" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..9e7aca119a4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX43 From efe29c4c068101bcdc86b590cbeceff7815d7eff Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Nov 2014 09:27:06 -0800 Subject: [PATCH 565/837] "LMX43B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9e7aca119a4..b4df522018c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX43 +export BUILD_ID=LMX43B From 483a16323a546c7f4247b7ed0788d08666f4d8d9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Nov 2014 11:08:12 -0800 Subject: [PATCH 566/837] "LMX43C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b4df522018c..e7100400cbb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX43B +export BUILD_ID=LMX43C From 28b7b1befbcb03015dd965eba63d2d87d98e5deb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Nov 2014 14:28:02 -0800 Subject: [PATCH 567/837] "LRX21U" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 73a331326ea..2d6431919aa 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21T +export BUILD_ID=LRX21U From 593a88c5c702948651fd63fafc749cb6ef9e9f1c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Nov 2014 15:09:59 -0800 Subject: [PATCH 568/837] "LMX43D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e7100400cbb..91e478aedcf 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX43C +export BUILD_ID=LMX43D From a41a44bc19b99f38eaf5afa0a5d30690746815d0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Nov 2014 16:14:40 -0800 Subject: [PATCH 569/837] "LMX43E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 91e478aedcf..708b28b4634 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX43D +export BUILD_ID=LMX43E From 8f6ac1b1c957778c81239568cd9e0d9711f13a55 Mon Sep 17 00:00:00 2001 From: XpLoDWilD Date: Thu, 13 Nov 2014 08:33:18 +0000 Subject: [PATCH 570/837] Makefile: Remove unpackbootimg Change-Id: I1b215e8d032225c513e341095b6fea689314c91a --- core/Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/Makefile b/core/Makefile index 3f36e1f2ae6..1416e50f188 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1327,7 +1327,6 @@ endif # BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE DISTTOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ $(HOST_OUT_EXECUTABLES)/mkbootfs \ $(HOST_OUT_EXECUTABLES)/mkbootimg \ - $(HOST_OUT_EXECUTABLES)/unpackbootimg \ $(HOST_OUT_EXECUTABLES)/fs_config \ $(HOST_OUT_EXECUTABLES)/mkyaffs2image \ $(HOST_OUT_EXECUTABLES)/zipalign \ @@ -1351,11 +1350,6 @@ OTATOOLS := $(DISTTOOLS) \ otatools: $(OTATOOLS) -UNPACKBOOTIMG := $(HOST_OUT_EXECUTABLES)/unpackbootimg - -.PHONY: unpackbootimg -unpackbootimg: $(UNPACKBOOTIMG) - # ----------------------------------------------------------------- # A zip of the directories that map to the target filesystem. # This zip can be used to create an OTA package or filesystem image From 40ea40bc9601fc3ddf89762a64c9573927172fdd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 13 Nov 2014 06:24:25 -0800 Subject: [PATCH 571/837] "LMX44" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..40b2447864b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX44 From 8d3f613f9800628fead7e61a58fcfce2d5008464 Mon Sep 17 00:00:00 2001 From: XpLoDWilD Date: Thu, 13 Nov 2014 17:31:05 +0000 Subject: [PATCH 572/837] edify: Remove backuptools for now Change-Id: Ibf28dcc20c8dd5f0e8b6e175588ac3094a7d9aee --- tools/releasetools/edify_generator.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index 326c9c4041f..2fe4675de65 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -133,14 +133,15 @@ def AssertSomeBootloader(self, *bootloaders): self.script.append(self._WordWrap(cmd)) def RunBackup(self, command): - self.script.append('package_extract_file("system/bin/backuptool.sh", "/tmp/backuptool.sh");') - self.script.append('package_extract_file("system/bin/backuptool.functions", "/tmp/backuptool.functions");') - self.script.append('set_perm(0, 0, 0777, "/tmp/backuptool.sh");') - self.script.append('set_perm(0, 0, 0644, "/tmp/backuptool.functions");') - self.script.append(('run_program("/tmp/backuptool.sh", "%s");' % command)) - if command == "restore": - self.script.append('delete("/system/bin/backuptool.sh");') - self.script.append('delete("/system/bin/backuptool.functions");') + self.script.append('') +# self.script.append('package_extract_file("system/bin/backuptool.sh", "/tmp/backuptool.sh");') +# self.script.append('package_extract_file("system/bin/backuptool.functions", "/tmp/backuptool.functions");') +# self.script.append('set_perm(0, 0, 0777, "/tmp/backuptool.sh");') +# self.script.append('set_perm(0, 0, 0644, "/tmp/backuptool.functions");') +# self.script.append(('run_program("/tmp/backuptool.sh", "%s");' % command)) +# if command == "restore": +# self.script.append('delete("/system/bin/backuptool.sh");') +# self.script.append('delete("/system/bin/backuptool.functions");') def ShowProgress(self, frac, dur): """Update the progress bar, advancing it over 'frac' over the next From 17759d4f3f4fb10921e0407c66ce977e11a588b3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 13 Nov 2014 11:51:23 -0800 Subject: [PATCH 573/837] "LMX44B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40b2447864b..873f787809f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX44 +export BUILD_ID=LMX44B From fd84336c3fcd306a7d1fca6f7d23a85310a33d82 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 13 Nov 2014 11:51:39 -0800 Subject: [PATCH 574/837] "LRX21V" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2d6431919aa..cf00cee06a9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21U +export BUILD_ID=LRX21V From 7f99917ecc11259ecea483a93321707281d458a2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 13 Nov 2014 17:55:25 -0800 Subject: [PATCH 575/837] "LMX44C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 873f787809f..b958b9c8486 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX44B +export BUILD_ID=LMX44C From 89720eab6d88cee0d0573f27713252048e2d22af Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 14 Nov 2014 09:14:42 -0800 Subject: [PATCH 576/837] "LMX44D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b958b9c8486..cda1eda01ab 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX44C +export BUILD_ID=LMX44D From 988ef2c5759b2d52e1cac3b7430e78cbcc872eda Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 14 Nov 2014 15:45:03 -0800 Subject: [PATCH 577/837] "LRX21W" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cf00cee06a9..35e2b1f836a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21V +export BUILD_ID=LRX21W From eb78416d031fd8f1c87e77d8d87af488d2fdadb2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 14 Nov 2014 18:03:28 -0800 Subject: [PATCH 578/837] "LMX44E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cda1eda01ab..47896543f55 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX44D +export BUILD_ID=LMX44E From ed13028290f660b3faf1a7f59811c2e6bb1178c8 Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Sun, 9 Nov 2014 18:06:04 -0500 Subject: [PATCH 579/837] build: Don't create recovery patch Change-Id: I00a9ca268ed3f326a0fa5a913bc112ec8b290550 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 1416e50f188..7bddbd4357c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1511,7 +1511,7 @@ ifneq ($(OEM_THUMBPRINT_PROPERTIES),) $(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt endif $(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt) - $(hide) ./build/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root) +# $(hide) ./build/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root) @# Zip everything up, preserving symlinks $(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .) @# Run fs_config on all the system, vendor, boot ramdisk, From 2af97996f4ce77c5dc3b899f675dc6b8aaf66f5f Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Sun, 16 Nov 2014 13:09:16 -0500 Subject: [PATCH 580/837] Revert "edify: Remove backuptools for now" Somehow this got merged despite an abandon in gerrit??? This reverts commit 8d3f613f9800628fead7e61a58fcfce2d5008464. Change-Id: Ie0bd12ee21f92caa2c021571b3200ee09c64c173 --- tools/releasetools/edify_generator.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index 2fe4675de65..326c9c4041f 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -133,15 +133,14 @@ def AssertSomeBootloader(self, *bootloaders): self.script.append(self._WordWrap(cmd)) def RunBackup(self, command): - self.script.append('') -# self.script.append('package_extract_file("system/bin/backuptool.sh", "/tmp/backuptool.sh");') -# self.script.append('package_extract_file("system/bin/backuptool.functions", "/tmp/backuptool.functions");') -# self.script.append('set_perm(0, 0, 0777, "/tmp/backuptool.sh");') -# self.script.append('set_perm(0, 0, 0644, "/tmp/backuptool.functions");') -# self.script.append(('run_program("/tmp/backuptool.sh", "%s");' % command)) -# if command == "restore": -# self.script.append('delete("/system/bin/backuptool.sh");') -# self.script.append('delete("/system/bin/backuptool.functions");') + self.script.append('package_extract_file("system/bin/backuptool.sh", "/tmp/backuptool.sh");') + self.script.append('package_extract_file("system/bin/backuptool.functions", "/tmp/backuptool.functions");') + self.script.append('set_perm(0, 0, 0777, "/tmp/backuptool.sh");') + self.script.append('set_perm(0, 0, 0644, "/tmp/backuptool.functions");') + self.script.append(('run_program("/tmp/backuptool.sh", "%s");' % command)) + if command == "restore": + self.script.append('delete("/system/bin/backuptool.sh");') + self.script.append('delete("/system/bin/backuptool.functions");') def ShowProgress(self, frac, dur): """Update the progress bar, advancing it over 'frac' over the next From 335f0d514f54544d58960f0c7ee3037baa7b5dd3 Mon Sep 17 00:00:00 2001 From: Anthony King Date: Sun, 27 Apr 2014 13:06:42 +0100 Subject: [PATCH 581/837] edify: update the RunBackup function set_perm was removed a few days ago, use the built in function for setting permissions TMPFS does not have xattr set, which is across most devices. dump the scripts into system so set_metadata will work Change-Id: I9ee00f15fa0be1eef31c5435b9d94845fd3aa630 --- tools/releasetools/edify_generator.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index 326c9c4041f..ccc97472238 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -133,14 +133,14 @@ def AssertSomeBootloader(self, *bootloaders): self.script.append(self._WordWrap(cmd)) def RunBackup(self, command): - self.script.append('package_extract_file("system/bin/backuptool.sh", "/tmp/backuptool.sh");') - self.script.append('package_extract_file("system/bin/backuptool.functions", "/tmp/backuptool.functions");') - self.script.append('set_perm(0, 0, 0777, "/tmp/backuptool.sh");') - self.script.append('set_perm(0, 0, 0644, "/tmp/backuptool.functions");') - self.script.append(('run_program("/tmp/backuptool.sh", "%s");' % command)) + self.UnpackPackageDir("system/addon.d", "/system/addon.d") + self.script.append('package_extract_file("system/bin/backuptool.sh", "/system/bin/backuptool.sh");') + self.script.append('package_extract_file("system/bin/backuptool.functions", "/system/bin/backuptool.functions");') + self.SetPermissions("/system/bin/backuptool.sh", 0, 0, 0755, None, None) + self.SetPermissions("/system/bin/backuptool.functions", 0, 0, 0644, None, None) + self.script.append(('run_program("/system/bin/backuptool.sh", "%s");' % command)) if command == "restore": - self.script.append('delete("/system/bin/backuptool.sh");') - self.script.append('delete("/system/bin/backuptool.functions");') + self.DeleteFiles(["/system/bin/backuptool.sh", "/system/bin/backuptool.functions"]) def ShowProgress(self, frac, dur): """Update the progress bar, advancing it over 'frac' over the next From 90369c155046808587cfc30ee6277b535fa7e7c7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 17 Nov 2014 06:20:24 -0800 Subject: [PATCH 582/837] "LMX48" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..3193f058b26 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX48 From 4f58f6573a2eeb33c2c8f33572e394e713ccb604 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 17 Nov 2014 14:04:52 -0800 Subject: [PATCH 583/837] "LMX48B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3193f058b26..7523470661f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX48 +export BUILD_ID=LMX48B From 7dabd329b08268a263e3fe47c1b28a62890dd1c6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 17 Nov 2014 17:27:43 -0800 Subject: [PATCH 584/837] "LMX48C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7523470661f..cb9e9e88af7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX48B +export BUILD_ID=LMX48C From 49c2a05e5df7d50fbec8abe032f2c4b6873df95b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 18 Nov 2014 06:16:36 -0800 Subject: [PATCH 585/837] "LMX49" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..60048d3e4a7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX49 From 30de1b624d459d68b57543c026113c25252ccdb9 Mon Sep 17 00:00:00 2001 From: Dave Langemak Date: Mon, 17 Nov 2014 16:37:50 -0800 Subject: [PATCH 586/837] Increment Android versions to 5.0.1 Change-Id: I2880123f0d1215f2028e6d3bc3f88fee5714ae74 --- CleanSpec.mk | 3 +++ core/version_defaults.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index f348692dd24..ca6617850f3 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -299,6 +299,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) +# 5.0.1 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 8cb8d262626..36e4e98fa1f 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 5.0 + PLATFORM_VERSION := 5.0.1 endif ifeq "" "$(PLATFORM_SDK_VERSION)" From 4eab14a6ac5d9deafef778c7bf65f72e130cb2b3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 18 Nov 2014 10:44:44 -0800 Subject: [PATCH 587/837] "LRX21X" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 35e2b1f836a..487676a81db 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21W +export BUILD_ID=LRX21X From 205c1f8aa4429f742e768199c84ab5f4877b51ab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 18 Nov 2014 10:59:42 -0800 Subject: [PATCH 588/837] "LRX21Y" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 487676a81db..d4eef641b10 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21X +export BUILD_ID=LRX21Y From 48266259c494d04b8433a3654a45256ea1962d76 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 18 Nov 2014 17:40:03 -0800 Subject: [PATCH 589/837] "LMX49B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 60048d3e4a7..85e63163a93 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX49 +export BUILD_ID=LMX49B From c22ab444445a1d4bad1eb567dbcc0d51a45362b2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 19 Nov 2014 06:18:05 -0800 Subject: [PATCH 590/837] "LMX50" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..8885d66cbcb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX50 From ced3fdcfa3d576fc42a6a8ad2ff0114af5643255 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 19 Nov 2014 12:04:49 -0800 Subject: [PATCH 591/837] "LRX21Z" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d4eef641b10..507b17f1997 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21Y +export BUILD_ID=LRX21Z From df63709bee49143d309c34dbc46f768f40124fa1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 19 Nov 2014 14:56:23 -0800 Subject: [PATCH 592/837] "LMX50B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8885d66cbcb..0f1540c0397 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX50 +export BUILD_ID=LMX50B From 9a6afb827125755d5fc850eb32c3f08078277d93 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 19 Nov 2014 16:28:10 -0800 Subject: [PATCH 593/837] "LMX50C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0f1540c0397..7210c459336 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX50B +export BUILD_ID=LMX50C From c2e4dd6eec749ac5d12fb673258b476d7626758b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Nov 2014 06:16:28 -0800 Subject: [PATCH 594/837] "LMX51" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..7c983d586bc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX51 From 12df78d8848325537d64ff0d0370aac6af203866 Mon Sep 17 00:00:00 2001 From: Dees Troy Date: Thu, 20 Nov 2014 16:08:21 +0000 Subject: [PATCH 595/837] Recovery: remove wiping of res folder The rm -rf of the res folder wipes out all of the TWRP theme and images. Remove this so that TWRP will work properly. Change-Id: I27c372d53eaae3cc8b476a909c2d3f3fc4fcb558 --- core/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 7bddbd4357c..5eb2152839c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -907,7 +907,6 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ $(hide) cp -f $(recovery_binary) $(TARGET_RECOVERY_ROOT_OUT)/sbin/ $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/system/bin $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res - $(hide) rm -rf $(TARGET_RECOVERY_ROOT_OUT)/res/* $(hide) cp -rf $(recovery_resources_common)/* $(TARGET_RECOVERY_ROOT_OUT)/res $(hide) cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png $(hide) $(foreach item,$(recovery_resources_private), \ From 8fcaf6a45f7fe891737f398431d9071a8cced3ce Mon Sep 17 00:00:00 2001 From: Andrew Dodd Date: Sat, 8 Nov 2014 16:53:21 -0500 Subject: [PATCH 596/837] build: Don't use block mode by default, allow it to be chosen Currently this uses the same logic as backuptool (but inverted) i.e. block mode will be disabled in all cases where backuptool is enabled which is the current default for all Omni builds. Block mode is not needed now, and may never be needed for custom projects, as block mode is preparation for dm-verity, which is mostly pointless on devices with unlocked bootloaders since the kernel already has broken the chain of trust. TODO: Determine if Nexus 9 *requires* blockmode. If it does, this may need to be reworked to allow the device to specify blockmode. Change-Id: I36725b44f4066a43ec7e1615bd4b072f7eb3db28 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 5eb2152839c..a3da9948ffa 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1581,7 +1581,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) @echo -e ${PRT_HST}"Package OTA: $@"${CL_RST} MKBOOTIMG=$(BOARD_CUSTOM_BOOTIMG_MK) \ $(OTA_FROM_TARGET_SCRIPT) -v \ - --block \ + $(if $(CUSTOM_BUILD),, --block) \ -p $(HOST_OUT) \ -k $(KEY_CERT_PAIR) \ --backup=$(backuptool) \ From ff8b5b19bed47660bcc6319a73b5b78d1e6dacda Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Nov 2014 15:32:46 -0800 Subject: [PATCH 597/837] "LRX22B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 507b17f1997..30e3f532c3b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX21Z +export BUILD_ID=LRX22B From 9cc93738aeb5723e8f9d502e7ac6210c6f6d4073 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Nov 2014 15:48:58 -0800 Subject: [PATCH 598/837] "LRX22C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 30e3f532c3b..146ce2a6834 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX22B +export BUILD_ID=LRX22C From 50994fbdc75d69e304a5ba3d19aafd679af42cc3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Nov 2014 16:42:58 -0800 Subject: [PATCH 599/837] "LMX51B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7c983d586bc..4a431046356 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX51 +export BUILD_ID=LMX51B From 3029c93e0660109a41e1c98f21a9908cb90a1a54 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 21 Nov 2014 16:52:22 -0800 Subject: [PATCH 600/837] "LMX51C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4a431046356..09169420f02 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX51B +export BUILD_ID=LMX51C From 2e9f18cba0eda0999bf4d14f6eb9682fb989e8f3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 24 Nov 2014 06:17:59 -0800 Subject: [PATCH 601/837] "LMX55" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..223ce144449 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX55 From 19070e1f26c62da5ab0ea1a349105a5979bba038 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 24 Nov 2014 15:18:35 -0800 Subject: [PATCH 602/837] "LMX55B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 223ce144449..96572dce270 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX55 +export BUILD_ID=LMX55B From d9770f77c86810b2312e66412aa8ae352522029b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 24 Nov 2014 18:00:37 -0800 Subject: [PATCH 603/837] LMX55C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 96572dce270..17c144d6423 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX55B +export BUILD_ID=LMX55C From eabc912959cb4015a23d618bdb6fe518c333f6ae Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 26 Nov 2014 12:51:54 -0800 Subject: [PATCH 604/837] "LMX55D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 17c144d6423..38c80dcbfba 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX55C +export BUILD_ID=LMX55D From 9c98a176c96a4ed337686eb26a4fd8ba99cbe6e2 Mon Sep 17 00:00:00 2001 From: maxwen Date: Wed, 26 Nov 2014 00:17:41 +0100 Subject: [PATCH 605/837] edify: fix the RunBackup function Remove 'self.UnpackPackageDir(system/addon.d, /system/addon.d)' since this would overwrite any existing backup script e.g. gapps Extract functions file to /tmp to not break existing backup script files that rely on that file beeing in /tmp Change-Id: I16741c17f30c28f5d537c693eaf43879d08f7ac1 --- tools/releasetools/edify_generator.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py index ccc97472238..22a421bd147 100644 --- a/tools/releasetools/edify_generator.py +++ b/tools/releasetools/edify_generator.py @@ -133,14 +133,12 @@ def AssertSomeBootloader(self, *bootloaders): self.script.append(self._WordWrap(cmd)) def RunBackup(self, command): - self.UnpackPackageDir("system/addon.d", "/system/addon.d") self.script.append('package_extract_file("system/bin/backuptool.sh", "/system/bin/backuptool.sh");') - self.script.append('package_extract_file("system/bin/backuptool.functions", "/system/bin/backuptool.functions");') + self.script.append('package_extract_file("system/bin/backuptool.functions", "/tmp/backuptool.functions");') self.SetPermissions("/system/bin/backuptool.sh", 0, 0, 0755, None, None) - self.SetPermissions("/system/bin/backuptool.functions", 0, 0, 0644, None, None) self.script.append(('run_program("/system/bin/backuptool.sh", "%s");' % command)) if command == "restore": - self.DeleteFiles(["/system/bin/backuptool.sh", "/system/bin/backuptool.functions"]) + self.DeleteFiles(["/tmp/backuptool.functions"]) def ShowProgress(self, frac, dur): """Update the progress bar, advancing it over 'frac' over the next From 27f32d93bac401e240386d73f252b82295b532e1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 27 Nov 2014 06:24:26 -0800 Subject: [PATCH 606/837] "LMX58" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..03cc3c1e391 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX58 From 18acbf6b2dd85019ca6d0914d7889a67fcaaa2ad Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 1 Dec 2014 06:11:17 -0800 Subject: [PATCH 607/837] "LMX62" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..06ec08aada1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX62 From 42e9acfc8c343b563e4a9910c6382271dab038e7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Dec 2014 06:13:21 -0800 Subject: [PATCH 608/837] "LMX63" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..9502b143200 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX63 From 0cc244a4f4d3d3934ac79a7bfe8b3a4dad62aa6a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Dec 2014 14:41:19 -0800 Subject: [PATCH 609/837] "LMX63B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9502b143200..e97b333c952 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX63 +export BUILD_ID=LMX63B From 48764c1a31b65eea965f3b3e1ec4e97597a8621c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Dec 2014 17:49:32 -0800 Subject: [PATCH 610/837] "LMX63C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e97b333c952..6803685802e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX63B +export BUILD_ID=LMX63C From 05d71e7beac0900f1fe6e77f682bfcff03e8e5eb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Dec 2014 06:13:19 -0800 Subject: [PATCH 611/837] "LMX64" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..8895cf7ec83 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX64 From 5ad50f91cef1c5e9c14b71a2a405f2f12b2c5e00 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Dec 2014 11:51:21 -0800 Subject: [PATCH 612/837] "LMX64B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8895cf7ec83..5d400b8bd80 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX64 +export BUILD_ID=LMX64B From d15fbc930fc5b1bb48f1621570d27e47078614f8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Dec 2014 06:16:27 -0800 Subject: [PATCH 613/837] "LMX65" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..c2b735a0174 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX65 From 69105e98440482965cff301798d111024cc862cc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Dec 2014 10:59:11 -0800 Subject: [PATCH 614/837] LMX65B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c2b735a0174..c792d73de25 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX65 +export BUILD_ID=LMX65B From 69297cd8f073fd273fe969a378db56bf5d24cae4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Dec 2014 14:11:50 -0800 Subject: [PATCH 615/837] "LMX65C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c792d73de25..0201c3ba030 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX65B +export BUILD_ID=LMX65C From f5d159e5a7cdd167c6b0443ef0a35e297229e7c2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Dec 2014 17:59:49 -0800 Subject: [PATCH 616/837] LMX65D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0201c3ba030..48b2191e163 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX65C +export BUILD_ID=LMX65D From c8e899d264c13f5a45db97df2a61487596977d7d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Dec 2014 14:11:28 -0800 Subject: [PATCH 617/837] "LMX65E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 48b2191e163..2cf612e968c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX65D +export BUILD_ID=LMX65E From eb063f1eca146521102bdfb2f0346c4bede39891 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Dec 2014 18:53:11 -0800 Subject: [PATCH 618/837] "LMX65F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2cf612e968c..144925b6fc5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX65E +export BUILD_ID=LMX65F From 8a1c3689fe01d000bdd111a6608f9ce5b07b60a5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Dec 2014 06:14:38 -0800 Subject: [PATCH 619/837] "LMX69" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..7f32fb9f286 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX69 From 90fe60196c97176573e8cdfed9cadcce88dde8ac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Dec 2014 16:44:44 -0800 Subject: [PATCH 620/837] "LMX69B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7f32fb9f286..a58aa1195b9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX69 +export BUILD_ID=LMX69B From 8cc1071352edc89d6accc5d0d5e96b71fc3ae2ef Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Dec 2014 18:50:59 -0800 Subject: [PATCH 621/837] LMX69C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a58aa1195b9..6e53b431ec5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX69B +export BUILD_ID=LMX69C From 2e12c4e02df6ff5171489ffd610f2fff0c319469 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Dec 2014 06:15:00 -0800 Subject: [PATCH 622/837] "LMX70" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..759533db418 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX70 From 1ac57d7deeb2cc2697e2c64a63f9a87439d5aa12 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Dec 2014 15:17:54 -0800 Subject: [PATCH 623/837] "LMX70B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 759533db418..8a97b2dec67 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX70 +export BUILD_ID=LMX70B From df3793c0347a6fe857d138569ff6676265b1a3e3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Dec 2014 06:14:46 -0800 Subject: [PATCH 624/837] "LMX71" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..5a1211f981e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX71 From a0bccdfd0fe8c9db7a65d9f18d0349ef320de47d Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Wed, 10 Dec 2014 23:52:22 +0100 Subject: [PATCH 625/837] [4/4] JDK8: JDK check should succeed with OpenJDK 8 Change-Id: I1c1eaff7fa36bba2db261e0c5311bbc6d005a726 --- core/main.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/main.mk b/core/main.mk index ae64cfb5192..47ff2d4d2c4 100644 --- a/core/main.mk +++ b/core/main.mk @@ -142,10 +142,10 @@ javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1) # Check for the correct version of java, should be 1.7 by # default, and 1.6 if LEGACY_USE_JAVA6 is set. ifeq ($(LEGACY_USE_JAVA6),) -required_version := "1.7.x" -required_javac_version := "1.7" -java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.7[\. "$$]') -javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.7[\. "$$]') +required_version := "1.7.x/1.8.x" +required_javac_version := "1.7/1.8" +java_version := $(shell echo '$(java_version_str)' | grep -E '^(java|openjdk) .*[ "]1\.[78][\. "$$]') +javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.[78][\. "$$]') else # if LEGACY_USE_JAVA6 required_version := "1.6.x" required_javac_version := "1.6" From 95a5d384b0ed20556cdc237fa0dcc241a314d20c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Dec 2014 15:12:12 -0800 Subject: [PATCH 626/837] "LMX71B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5a1211f981e..337efb4f552 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX71 +export BUILD_ID=LMX71B From 6377b19bb99a1915fd6294ebac85db6c2c9f66a7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Dec 2014 02:56:23 -0800 Subject: [PATCH 627/837] LMX71C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 337efb4f552..634f3c9b6ba 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX71B +export BUILD_ID=LMX71C From 84b9197cf8371c2bb34b7844fa6bf69f1237d75c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Dec 2014 06:18:53 -0800 Subject: [PATCH 628/837] "LMX72" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..d50dc5282e7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX72 From d64cb2d8adcda8796f0443aa1df2b85d31bf0e2a Mon Sep 17 00:00:00 2001 From: Benjamin Cheng Date: Mon, 8 Dec 2014 22:58:42 -0500 Subject: [PATCH 629/837] Fix grammar error in roomservice; Only add xml files in local_manifests Change-Id: Ia132acddd2761ec4c1bea7fb510e3bea306ea9fc --- tools/roomservice.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index b37bb1f63dc..f87ddbabc63 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -96,7 +96,8 @@ def parse_device_directory(device_url, device): def iterate_manifests(): files = [] for file in os.listdir(local_manifest_dir): - files.append(os.path.join(local_manifest_dir, file)) + if file.endswith(".xml"): + files.append(os.path.join(local_manifest_dir, file)) files.append('.repo/manifest.xml') for file in files: try: @@ -197,7 +198,7 @@ def parse_device_from_folder(device): elif len(search) == 1: location = search[0] else: - print("you device can't be found in device sources..") + print("Your device can't be found in device sources..") location = parse_device_from_manifest(device) return location From 0af08a09b42a3b9beaa1263a283deb45bcca01e1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Dec 2014 13:49:33 -0800 Subject: [PATCH 630/837] "LMX72B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d50dc5282e7..f948e272e86 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72 +export BUILD_ID=LMX72B From 7aff6e615ff38e119a8229d0b492e47e77a55c14 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Dec 2014 15:12:28 -0800 Subject: [PATCH 631/837] "LMX72C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f948e272e86..19f07fc321a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72B +export BUILD_ID=LMX72C From 4267d4fb098c30c05cb3d8bd6391bfb9d4ef648d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Dec 2014 18:59:47 -0800 Subject: [PATCH 632/837] "LMX72D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 19f07fc321a..d616fa73366 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72C +export BUILD_ID=LMX72D From 72ce3c99a5722d908922ce4b071ff9f6a7ad4f9e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Dec 2014 09:50:32 -0800 Subject: [PATCH 633/837] "LMX72E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d616fa73366..cef5a0bdefd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72D +export BUILD_ID=LMX72E From e938ffbb6b33208a493c8a191ae1b4cb5f473c8c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Dec 2014 13:35:06 -0800 Subject: [PATCH 634/837] "LMX72F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cef5a0bdefd..b6a235c5ba7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72E +export BUILD_ID=LMX72F From 1386992fd600150c103d31c60aa56e6bfbc67fbe Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 14 Dec 2014 14:48:51 -0800 Subject: [PATCH 635/837] "LMX72G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b6a235c5ba7..01ecb20c431 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72F +export BUILD_ID=LMX72G From e67a10610a96e7e92cdc2f000f3086d71b56f726 Mon Sep 17 00:00:00 2001 From: that Date: Mon, 15 Dec 2014 23:56:52 +0100 Subject: [PATCH 636/837] releasetools: allow overriding partition for boot image This is required for Asus Transformer devices where the boot image is not written directly to the boot partition. Instead it is packaged with a blob header and written to a separate staging partition. The bootloader moves the boot image to the final location at the next reboot. Change-Id: Ie97c8f6821c30aa4b3e7c5249fbd98bd9b798ffd --- core/Makefile | 1 + tools/releasetools/ota_from_target_files | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index a3da9948ffa..b62acfb75d7 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1589,6 +1589,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) --override_prop=$(override_prop) \ --mount_by_label=$(mount_by_label) \ $(if $(OEM_OTA_CONFIG), -o $(OEM_OTA_CONFIG)) \ + $(TARGET_RELEASETOOL_OTA_FROM_TARGET_ADDITIONAL_ARGS) \ $(BUILT_TARGET_FILES_PACKAGE) $@ CUSTOM_TARGET_PACKAGE := $(PRODUCT_OUT)/omni-$(ROM_VERSION).zip diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index a0c753f3e49..26c78e42e79 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -71,6 +71,10 @@ Usage: ota_from_target_files [flags] input_target_files output_ota_package Override build.prop items with custom vendor init. Enabled when TARGET_UNIFIED_DEVICE is defined in BoardConfig + --override_boot_partition + Override the partition where the boot image is installed. + Used for devices with a staging partition (Asus Transformer). + --mount_by_label Force the OTA package to mount and format System by label Can be enabled by defining TARGET_SETS_FSTAB. Defaults to false. @@ -137,6 +141,7 @@ if OPTIONS.worker_threads == 0: OPTIONS.backuptool = False OPTIONS.override_device = 'auto' OPTIONS.override_prop = False +OPTIONS.override_boot_partition = '' OPTIONS.mount_by_label = False OPTIONS.two_step = False OPTIONS.no_signing = False @@ -679,7 +684,8 @@ else if get_stage("%(bcb_dev)s") == "3/3" then script.ShowProgress(0.2, 10) script.Print("Flashing boot.img") - script.WriteRawImage("/boot", "boot.img") + bootpartition = "/boot" if OPTIONS.override_boot_partition == "" else OPTIONS.override_boot_partition + script.WriteRawImage(bootpartition, "boot.img") script.ShowProgress(0.1, 0) script.Print("Enjoy OMNI ROM!"); @@ -1487,6 +1493,8 @@ def main(argv): OPTIONS.override_device = a elif o in ("--override_prop"): OPTIONS.override_prop = bool(a.lower() == 'true') + elif o in ("--override_boot_partition"): + OPTIONS.override_boot_partition = a elif o in ("--mount_by_label"): OPTIONS.mount_by_label = bool(a.lower() == 'true') elif o in ("-2", "--two_step"): @@ -1518,6 +1526,7 @@ def main(argv): "backup=", "override_device=", "override_prop=", + "override_boot_partition=", "two_step", "mount_by_label=", "no_signing", From ce8efb536cdcffb1701d10732be3b028def3b7d0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Dec 2014 15:38:38 -0800 Subject: [PATCH 637/837] "LMX72H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 01ecb20c431..0508799c7b4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72G +export BUILD_ID=LMX72H From 7e0934a70d065b449d75a47f55200c4b0b94cb89 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Dec 2014 15:00:38 -0800 Subject: [PATCH 638/837] "LMX72I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0508799c7b4..9ab74c82384 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72H +export BUILD_ID=LMX72I From aed71501955ca1d6c84083aa7f9eedce290c6eea Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Dec 2014 12:55:11 -0800 Subject: [PATCH 639/837] "LMX72J" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9ab74c82384..0fa8f7e4db8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72I +export BUILD_ID=LMX72J From 97bcbabdc4c68ff56bc4ca416301674f5bde6489 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Dec 2014 18:21:05 -0800 Subject: [PATCH 640/837] LMX72K --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0fa8f7e4db8..6f555de28a4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72J +export BUILD_ID=LMX72K From c13288956407c4500d5b33d9a2c3e771d1ab8bbd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Dec 2014 22:22:49 -0800 Subject: [PATCH 641/837] "LMX72L" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6f555de28a4..b0775dfca64 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72K +export BUILD_ID=LMX72L From 64f49d394175dc427e3af5f5f3aa3dced1ede440 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Dec 2014 00:00:55 -0800 Subject: [PATCH 642/837] "LMX72M" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b0775dfca64..ff58fcd4d38 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72L +export BUILD_ID=LMX72M From 7b1631a87af9cdb94082afd7f88b5a392b61300e Mon Sep 17 00:00:00 2001 From: rooque Date: Mon, 8 Dec 2014 00:46:36 -0200 Subject: [PATCH 643/837] build: Fix PreBuilt Chromium refs Change-Id: Icc553d5be1e71d8c754bc85b6906252e5690b508 --- envsetup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envsetup.sh b/envsetup.sh index 7d558c55d75..29b48aef8f6 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1566,7 +1566,7 @@ function chromium_prebuilt() { export TARGET_DEVICE=$(get_build_var TARGET_DEVICE) hash=$T/prebuilts/chromium/$TARGET_DEVICE/hash.txt - if [ -r $hash ] && [ $(git --git-dir=$T/external/chromium/.git --work-tree=$T/external/chromium rev-parse --verify HEAD) == $(cat $hash) ]; then + if [ -r $hash ] && [ $(git --git-dir=$T/external/chromium_org/.git --work-tree=$T/external/chromium_org rev-parse --verify HEAD) == $(cat $hash) ]; then export PRODUCT_PREBUILT_WEBVIEWCHROMIUM=yes echo "** Prebuilt Chromium is up-to-date; Will be used for build **" else From b41ec583878f79f68622f389e9b5f9d4ff617db8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Dec 2014 18:39:19 -0800 Subject: [PATCH 644/837] "LMX72N" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ff58fcd4d38..488ef6658fa 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72M +export BUILD_ID=LMX72N From 64d88c619623d12829247b49d44b201d526fe28c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 19 Dec 2014 14:50:00 -0800 Subject: [PATCH 645/837] "LMX72O" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 488ef6658fa..ed8ae91a0c6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMX72N +export BUILD_ID=LMX72O From 250ee9019572be84ace57d4dfc2504f10e4eb748 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 1 Dec 2014 11:40:37 -0800 Subject: [PATCH 646/837] "LRX22D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 146ce2a6834..dda1e9b5ec8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX22C +export BUILD_ID=LRX22D From 88e4e23c8eedae921b6b79b6f82d0ad295d7c6d9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Dec 2014 17:48:55 -0800 Subject: [PATCH 647/837] "LRX22E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index dda1e9b5ec8..1ae003b0863 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX22D +export BUILD_ID=LRX22E From fc9fc27acd6fb305a827ea1ac88852f1e45f2f78 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Thu, 11 Dec 2014 14:04:55 -0800 Subject: [PATCH 648/837] DO NOT MERGE. Bump version to 5.0.2. Change-Id: Ia6426dd03ac3b51061429b7da36e317bd3503775 --- CleanSpec.mk | 3 +++ core/version_defaults.mk | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index ca6617850f3..a1dec2e62c0 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -302,6 +302,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) # 5.0.1 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +# 5.0.2 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 36e4e98fa1f..abfa0725658 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 5.0.1 + PLATFORM_VERSION := 5.0.2 endif ifeq "" "$(PLATFORM_SDK_VERSION)" From 22c2721e1f576ba6877388355fc9c9b28f8a25a2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Dec 2014 18:03:20 -0800 Subject: [PATCH 649/837] "LRX22F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1ae003b0863..dc304464271 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX22E +export BUILD_ID=LRX22F From 80a04c13f02b2fb77f1059e37b047cefb8f6bd63 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Dec 2014 13:11:28 -0800 Subject: [PATCH 650/837] LRX22G --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index dc304464271..1ade5425c80 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LRX22F +export BUILD_ID=LRX22G From 6e6300d3abec26e1a67d107d0e8f5daca7f4ccbc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Dec 2014 06:14:28 -0800 Subject: [PATCH 651/837] "LMX83" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..3921294ce4d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX83 From 47c17b144f6a36d80210207288e677a1205a913c Mon Sep 17 00:00:00 2001 From: dhacker29 Date: Tue, 28 Jan 2014 15:51:51 -0600 Subject: [PATCH 652/837] Allow devices to specify certain ro. props via TARGET_UNIFIED_DEVICE This modifies buildinfo.sh to not set model, name, description, and fingerprint in build.prop. These can then be set via custom init lib. This also fixes ota_from_target_files to function without these props being preset. Change-Id: Ia7dfcdea5aab7ebf51d3ab29a0d9e5751fc96663 Conflicts: core/Makefile tools/buildinfo.sh tools/releasetools/ota_from_target_files PS2: fix whitespaces Change-Id: I300171045dff9e601b66854649eeb3a8cfa9cb5f --- tools/releasetools/ota_from_target_files | 39 ++++++++++++++---------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 26c78e42e79..0cea0abc659 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -416,7 +416,6 @@ def AppendAssertions(script, info_dict, oem_dict = None): device = GetBuildProp("ro.product.device", info_dict) else: device = OPTIONS.override_device - script.AssertDevice(device) else: if oem_dict is None: raise common.ExternalError("No OEM file provided to answer expected assertions") @@ -505,13 +504,14 @@ def WriteFullOTAPackage(input_zip, output_zip): script.Mount("/oem", recovery_mount_options) oem_dict = common.LoadDictionaryFromLines(open(OPTIONS.oem_source).readlines()) - metadata = {"post-build": CalculateFingerprint( - oem_props, oem_dict, OPTIONS.info_dict), - "pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict, - OPTIONS.info_dict), - "post-timestamp": GetBuildProp("ro.build.date.utc", - OPTIONS.info_dict), - } + metadata = {} + metadata["post-timestamp"] = GetBuildProp("ro.build.date.utc", + OPTIONS.info_dict) + if not OPTIONS.override_prop: + metadata["post-build"] = GetBuildProp("ro.build.fingerprint", + OPTIONS.info_dict) + metadata["pre-device"] = GetBuildProp("ro.product.device", + OPTIONS.info_dict) if not OPTIONS.override_prop: metadata["post-build"] = GetBuildProp("ro.build.fingerprint", @@ -1135,11 +1135,12 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): script.Mount("/oem", recovery_mount_options) oem_dict = common.LoadDictionaryFromLines(open(OPTIONS.oem_source).readlines()) - metadata = {"pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict, - OPTIONS.source_info_dict), - "post-timestamp": GetBuildProp("ro.build.date.utc", - OPTIONS.target_info_dict), - } + metadata = {} + metadata["post-timestamp"] = GetBuildProp("ro.build.date.utc", + OPTIONS.info_dict) + if not OPTIONS.override_prop: + metadata["pre-device"] = GetBuildProp("ro.product.device", + OPTIONS.info_dict) device_specific = common.DeviceSpecificParams( source_zip=source_zip, @@ -1169,8 +1170,14 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): GetBuildProp("ro.build.thumbprint", OPTIONS.target_info_dict), GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict)) - metadata["pre-build"] = source_fp - metadata["post-build"] = target_fp + if not OPTIONS.override_prop: + source_fp = GetBuildProp("ro.build.fingerprint", OPTIONS.source_info_dict) + target_fp = GetBuildProp("ro.build.fingerprint", OPTIONS.target_info_dict) + metadata["pre-build"] = source_fp + metadata["post-build"] = target_fp + + script.Mount("/system") + script.AssertSomeFingerprint(source_fp, target_fp) source_boot = common.GetBootableImage( "/tmp/boot.img", "boot.img", OPTIONS.source_tmp, "BOOT", @@ -1535,7 +1542,7 @@ def main(argv): "oem_settings=", "verify", "no_fallback_to_full", - ], + "override_prop="], extra_option_handler=option_handler) if len(args) != 2: From 8c44fb4d5c0b1d7bd81a1b352a518d1f5e39a1f8 Mon Sep 17 00:00:00 2001 From: Max Weninger Date: Tue, 23 Dec 2014 00:20:24 +0100 Subject: [PATCH 653/837] Revert "Allow devices to specify certain ro. props via TARGET_UNIFIED_DEVICE" This reverts commit 47c17b144f6a36d80210207288e677a1205a913c. Until I understand all of this :) Change-Id: I6f72913b6d9b1624c29658707b8d2657536244a5 --- tools/releasetools/ota_from_target_files | 39 ++++++++++-------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 0cea0abc659..26c78e42e79 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -416,6 +416,7 @@ def AppendAssertions(script, info_dict, oem_dict = None): device = GetBuildProp("ro.product.device", info_dict) else: device = OPTIONS.override_device + script.AssertDevice(device) else: if oem_dict is None: raise common.ExternalError("No OEM file provided to answer expected assertions") @@ -504,14 +505,13 @@ def WriteFullOTAPackage(input_zip, output_zip): script.Mount("/oem", recovery_mount_options) oem_dict = common.LoadDictionaryFromLines(open(OPTIONS.oem_source).readlines()) - metadata = {} - metadata["post-timestamp"] = GetBuildProp("ro.build.date.utc", - OPTIONS.info_dict) - if not OPTIONS.override_prop: - metadata["post-build"] = GetBuildProp("ro.build.fingerprint", - OPTIONS.info_dict) - metadata["pre-device"] = GetBuildProp("ro.product.device", - OPTIONS.info_dict) + metadata = {"post-build": CalculateFingerprint( + oem_props, oem_dict, OPTIONS.info_dict), + "pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict, + OPTIONS.info_dict), + "post-timestamp": GetBuildProp("ro.build.date.utc", + OPTIONS.info_dict), + } if not OPTIONS.override_prop: metadata["post-build"] = GetBuildProp("ro.build.fingerprint", @@ -1135,12 +1135,11 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): script.Mount("/oem", recovery_mount_options) oem_dict = common.LoadDictionaryFromLines(open(OPTIONS.oem_source).readlines()) - metadata = {} - metadata["post-timestamp"] = GetBuildProp("ro.build.date.utc", - OPTIONS.info_dict) - if not OPTIONS.override_prop: - metadata["pre-device"] = GetBuildProp("ro.product.device", - OPTIONS.info_dict) + metadata = {"pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict, + OPTIONS.source_info_dict), + "post-timestamp": GetBuildProp("ro.build.date.utc", + OPTIONS.target_info_dict), + } device_specific = common.DeviceSpecificParams( source_zip=source_zip, @@ -1170,14 +1169,8 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): GetBuildProp("ro.build.thumbprint", OPTIONS.target_info_dict), GetBuildProp("ro.build.thumbprint", OPTIONS.source_info_dict)) - if not OPTIONS.override_prop: - source_fp = GetBuildProp("ro.build.fingerprint", OPTIONS.source_info_dict) - target_fp = GetBuildProp("ro.build.fingerprint", OPTIONS.target_info_dict) - metadata["pre-build"] = source_fp - metadata["post-build"] = target_fp - - script.Mount("/system") - script.AssertSomeFingerprint(source_fp, target_fp) + metadata["pre-build"] = source_fp + metadata["post-build"] = target_fp source_boot = common.GetBootableImage( "/tmp/boot.img", "boot.img", OPTIONS.source_tmp, "BOOT", @@ -1542,7 +1535,7 @@ def main(argv): "oem_settings=", "verify", "no_fallback_to_full", - "override_prop="], + ], extra_option_handler=option_handler) if len(args) != 2: From 543c8cbcc23ef365e27a169e30a43ab7ea992ee2 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Fri, 21 Nov 2014 00:46:52 -0600 Subject: [PATCH 654/837] build: Ensure /system unmounted at install start Account for the possibility that a user has mounted system manually before installing the FullOTA package. Change-Id: I97d0540676a7ce98762545e76ecb1a7f6335d204 --- tools/releasetools/ota_from_target_files | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 26c78e42e79..8ddafc60039 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -578,6 +578,7 @@ reboot_now("%(bcb_dev)s", "recovery"); else if get_stage("%(bcb_dev)s") == "3/3" then """ % bcb_dev) + script.AppendExtra("ifelse(is_mounted(\"/system\"), unmount(\"/system\"));") device_specific.FullOTA_InstallBegin() if OPTIONS.backuptool: From 5f92d8b0f659e3838e0ab7a1ef7d4a045b9e320f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 23 Dec 2014 06:11:10 -0800 Subject: [PATCH 655/837] "LMX84" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..6a57b9fa29f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX84 From 2d6cd623917ac5e70cc57ca73246621e2d2010f3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Dec 2014 06:10:38 -0800 Subject: [PATCH 656/837] "LMX85" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..563e7b1db58 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX85 From b1f2739ee2952eb0b77b69f9a399533fa0501b35 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Dec 2014 06:09:53 -0800 Subject: [PATCH 657/837] "LMX86" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..9d9bc17b22f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX86 From df1c38678efdfae3586c847cc04467cf2de96847 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Dec 2014 06:09:49 -0800 Subject: [PATCH 658/837] "LMX90" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..23ae3debd04 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX90 From 82badea0104110e9e47410a48b4988e2bf01c61b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Dec 2014 06:10:30 -0800 Subject: [PATCH 659/837] "LMX91" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..aa7e3647326 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX91 From e18b4982395acc2066f75b78a81d240fc3fcf2c9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 31 Dec 2014 06:10:26 -0800 Subject: [PATCH 660/837] "LMX92" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..fee3c4eb629 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMX92 From 800bf2e67f152fedd1a2dcfafbfc528fbcc21201 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 1 Jan 2015 06:10:18 -0800 Subject: [PATCH 661/837] "LMY01" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..80c551f9749 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY01 From 03dbc4bb4170dbcf063b4511ac80038e29c3b214 Mon Sep 17 00:00:00 2001 From: Tom Marshall Date: Tue, 28 Oct 2014 16:12:15 -0700 Subject: [PATCH 662/837] build: recovery: Support adding device-specific items (cdesai): Also add the relevant parts from koush's commit 7fd5a89df5ec3961c9aedfd2afad50d6d2561056 "Add initial support for charge mode. also support recovery/root in the device tree to easily copy props into recovery images." Change-Id: I25205e68282680932917016646dabd1abadbfce6 --- core/Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index b62acfb75d7..a41f9d0806e 100644 --- a/core/Makefile +++ b/core/Makefile @@ -824,6 +824,16 @@ else recovery_font := $(call include-path-for, recovery)/fonts/12x22.png endif +ifneq ($(TARGET_RECOVERY_DEVICE_DIRS),) +recovery_root_private := $(strip \ + $(foreach d,$(TARGET_RECOVERY_DEVICE_DIRS), $(wildcard $(d)/recovery/root))) +else +recovery_root_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/root)) +endif +ifneq ($(recovery_root_private),) +recovery_root_deps := $(shell find $(recovery_root_private) -type f) +endif + recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/res)) recovery_resource_deps := $(shell find $(recovery_resources_common) \ $(recovery_resources_private) -type f) @@ -890,7 +900,7 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ $(recovery_binary) \ $(recovery_initrc) $(recovery_sepolicy) $(recovery_kernel) \ $(INSTALLED_2NDBOOTLOADER_TARGET) \ - $(recovery_build_prop) $(recovery_resource_deps) \ + $(recovery_build_prop) $(recovery_resource_deps) $(recovery_root_deps) \ $(recovery_fstab) \ $(RECOVERY_INSTALL_OTA_KEYS) @echo -e ${PRT_IMG}"----- Making recovery filesystem ------"${CL_RST} @@ -909,6 +919,8 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/res $(hide) cp -rf $(recovery_resources_common)/* $(TARGET_RECOVERY_ROOT_OUT)/res $(hide) cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png + $(hide) $(foreach item,$(recovery_root_private), \ + cp -rf $(item) $(TARGET_RECOVERY_OUT)/) $(hide) $(foreach item,$(recovery_resources_private), \ cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/) $(hide) $(foreach item,$(recovery_fstab), \ From e5b1b8b98f583a49ea859caeec6eca00f4f4b50e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 2 Jan 2015 15:55:14 -0800 Subject: [PATCH 663/837] "LMY02" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..00edf867002 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY02 From 117230d11a25d9186cfb4d25e8db123b80cae552 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 5 Jan 2015 06:10:26 -0800 Subject: [PATCH 664/837] "LMY05" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..2316150e8c2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY05 From 934cb161b8bd9f0e09e65443d761adcec536766c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 6 Jan 2015 06:11:39 -0800 Subject: [PATCH 665/837] "LMY06" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..18f3389c0c7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY06 From 65f4c615dc56c19687621f5cfa30fe92a38f2825 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 6 Jan 2015 14:25:01 -0800 Subject: [PATCH 666/837] "LMY06B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 18f3389c0c7..5c5bfbe8673 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY06 +export BUILD_ID=LMY06B From 1ab8b63a12d245b257680fa3fb58a579afad2b61 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 7 Jan 2015 06:12:09 -0800 Subject: [PATCH 667/837] "LMY07" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..4eef7ae0caf 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY07 From f9ed01d21f0de6be9b7168af27ea24a08e9c450d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 7 Jan 2015 15:03:01 -0800 Subject: [PATCH 668/837] "LMY07B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4eef7ae0caf..449e44f65b0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY07 +export BUILD_ID=LMY07B From 0ef07a048f63cdcdddfb4cff355e848e2144c757 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 8 Jan 2015 09:36:05 -0800 Subject: [PATCH 669/837] "LMY08" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..75310be867b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY08 From cd907b70b8d9ff1acf9fa687287a874b3fe88d49 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 8 Jan 2015 12:12:52 -0800 Subject: [PATCH 670/837] "LMY08B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 75310be867b..9cc19b68283 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY08 +export BUILD_ID=LMY08B From 2ece6872148625f6ef4cb15978c8c51553fe54e1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 8 Jan 2015 15:10:44 -0800 Subject: [PATCH 671/837] "LMY08C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9cc19b68283..9003c0ef641 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY08B +export BUILD_ID=LMY08C From cf2f649a19e3b30ace91a0f458b1c5a2847ed85d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 9 Jan 2015 13:03:00 -0800 Subject: [PATCH 672/837] "LMY08D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9003c0ef641..de7bd32eb32 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY08C +export BUILD_ID=LMY08D From bb9be91c6d7b214d3867e8c2ad45d5de7753a169 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 9 Jan 2015 15:40:01 -0800 Subject: [PATCH 673/837] "LMY08E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index de7bd32eb32..31149297ef4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY08D +export BUILD_ID=LMY08E From a2cef5e9f7a8a52208e7c44703bfbb3a42a77439 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 11 Jan 2015 12:02:07 -0800 Subject: [PATCH 674/837] "LMY08F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 31149297ef4..f0e170ac3ce 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY08E +export BUILD_ID=LMY08F From a3b7a4a8f2e0d055008e7ceff83dfa3fae7be35b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 12 Jan 2015 06:45:35 -0800 Subject: [PATCH 675/837] "LMY12" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..add2339eca5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY12 From ead232b706db331abc87d4607d220c5d9fce2cbb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 12 Jan 2015 15:21:29 -0800 Subject: [PATCH 676/837] "LMY12B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index add2339eca5..1b308f5be7b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY12 +export BUILD_ID=LMY12B From a0e18667d568acb83b2a0ed27df7af5f27d1b16b Mon Sep 17 00:00:00 2001 From: Alex Cruz Date: Mon, 12 Jan 2015 20:28:05 -0500 Subject: [PATCH 677/837] build: Remove QuickSearchBox from core apps Change-Id: Ibc44a2e96fb9343a0ae898b460503e4adfeeef7f --- target/product/core.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/target/product/core.mk b/target/product/core.mk index 876a536b6bf..29178fc656c 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -46,7 +46,6 @@ PRODUCT_PACKAGES += \ libpac \ PrintSpooler \ ProxyHandler \ - QuickSearchBox \ Settings \ SharedStorageBackup \ Telecom \ From 7b3d19ee60b5d0dacb739badc2854e4ccddeff9a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 13 Jan 2015 06:11:25 -0800 Subject: [PATCH 678/837] "LMY13" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..486c27423cc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY13 From bd361924d0ea342cb48810ce3dfc3cce7ed1160e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 13 Jan 2015 13:54:16 -0800 Subject: [PATCH 679/837] "LMY13B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 486c27423cc..7a0ceccbc4b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY13 +export BUILD_ID=LMY13B From 4fc513270cf3fb122dd2fc415e21007528a46609 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 14 Jan 2015 06:13:48 -0800 Subject: [PATCH 680/837] "LMY14" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..bf78cddcb7a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY14 From 41d06ef570edbce4d85a07702e9f310e45e2a2ee Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 14 Jan 2015 14:36:50 -0800 Subject: [PATCH 681/837] "LMY14B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index bf78cddcb7a..ba43f1c855f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY14 +export BUILD_ID=LMY14B From 82ff232e534c467fc44bef0b53c7565213573cb5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 15 Jan 2015 06:12:21 -0800 Subject: [PATCH 682/837] "LMY15" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..43cf19c6134 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY15 From bc032f56164f9c4605329d425b84c12ed81c2ad1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 15 Jan 2015 14:50:48 -0800 Subject: [PATCH 683/837] "LMY15B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 43cf19c6134..6fc933e0a85 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY15 +export BUILD_ID=LMY15B From 33e478cc3eb131eb7b473e8807aa31aa2ec77648 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 15 Jan 2015 15:29:35 -0800 Subject: [PATCH 684/837] "LMY15C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6fc933e0a85..6a55a6d1042 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY15B +export BUILD_ID=LMY15C From 975a5b2b707a0661467d96d428e6651bd0528229 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 16 Jan 2015 11:57:11 -0800 Subject: [PATCH 685/837] "LMY15D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6a55a6d1042..cf421cfb6d9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY15C +export BUILD_ID=LMY15D From 580d39c13c50181f81ad740e75c8b719da08e411 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 16 Jan 2015 17:34:35 -0800 Subject: [PATCH 686/837] "LMY15E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index cf421cfb6d9..b30282cfa6e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY15D +export BUILD_ID=LMY15E From a99ac5d42dbdb3dcd4a20d62d6e59289c82db508 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Tue, 23 Sep 2014 22:46:54 -0700 Subject: [PATCH 687/837] build: Add "dtbs" target when building the kernel * This is needed for 3.10 Change-Id: I4044ea9e67017452efc25097a3327141a6627c24 --- core/tasks/kernel.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index d27b6ba3537..af1bf550692 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -175,6 +175,7 @@ $(KERNEL_OUT)/piggy : $(TARGET_PREBUILT_INT_KERNEL) TARGET_KERNEL_BINARIES: $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL) $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) $(TARGET_PREBUILT_INT_KERNEL_TYPE) + -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) dtbs -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) modules -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) modules_install $(mv-modules) From 9696b6c0f5db672854d092ec7cf2e5ecb3aa38e5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 19 Jan 2015 06:12:26 -0800 Subject: [PATCH 688/837] "LMY19" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..d645a83ed63 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY19 From bd6b04aea71c02f69fa154d359cafd90b3269cc7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 20 Jan 2015 06:10:20 -0800 Subject: [PATCH 689/837] "LMY20" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..0c845ce427c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY20 From a73ac1ee5a21a498c08a75607627d69fd64315fe Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 20 Jan 2015 15:31:50 -0800 Subject: [PATCH 690/837] "LMY20B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0c845ce427c..57ee98af3a3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY20 +export BUILD_ID=LMY20B From dd4f77f9957ecc47747bab94d84e77cc15088ff6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 21 Jan 2015 06:12:13 -0800 Subject: [PATCH 691/837] "LMY21" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..fd3efd1d8b7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY21 From 48d48386fc6b0553012741e4c6c64d924d6faee2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 21 Jan 2015 15:04:16 -0800 Subject: [PATCH 692/837] "LMY21B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fd3efd1d8b7..37ecd3faa48 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY21 +export BUILD_ID=LMY21B From a45c5836b7e2ed7083fff05385f2c2b5b1a77335 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 22 Jan 2015 06:12:05 -0800 Subject: [PATCH 693/837] "LMY22" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..80ac1467514 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY22 From 14e0e8e7d3601da2034b70d4b94b46d6e516e594 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 22 Jan 2015 15:11:35 -0800 Subject: [PATCH 694/837] "LMY22B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 80ac1467514..4a82e77b9ba 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY22 +export BUILD_ID=LMY22B From 71095ef9e2a36b8409ba310d0f650b184dfcaf10 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 22 Jan 2015 21:39:31 -0800 Subject: [PATCH 695/837] "LMY22C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4a82e77b9ba..b75b19a810e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY22B +export BUILD_ID=LMY22C From 3d8dbb5bc92039e744cfc4085e935a714fec95ea Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 23 Jan 2015 07:36:38 -0800 Subject: [PATCH 696/837] "LMY22D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b75b19a810e..4129b9d5c36 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY22C +export BUILD_ID=LMY22D From b5547a97bab374a2a247043e0fdad38b3533de59 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 23 Jan 2015 12:21:13 -0800 Subject: [PATCH 697/837] "LMY22E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4129b9d5c36..643c8997b73 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY22D +export BUILD_ID=LMY22E From bdd2b684b36af3c1d767d92c1f7c5db7ac0236eb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 26 Jan 2015 06:14:07 -0800 Subject: [PATCH 698/837] "LMY26" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..b746a1f24ca 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY26 From 1dd5a532492dc4ad56c2196eaa3beb905f35b028 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 26 Jan 2015 14:54:54 -0800 Subject: [PATCH 699/837] "LMY26B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b746a1f24ca..f70a03ea346 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY26 +export BUILD_ID=LMY26B From 4a9f9a3eea029e3d49bc70b28eb54e295ba5925b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 27 Jan 2015 06:12:38 -0800 Subject: [PATCH 700/837] "LMY27" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..62235df7670 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY27 From e27f7d954e2f5b367e0f06134a6a9fff298756d7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 27 Jan 2015 15:05:26 -0800 Subject: [PATCH 701/837] "LMY27B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 62235df7670..d85bce5c4d6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY27 +export BUILD_ID=LMY27B From 6f9bceab8fb415905b9acd80ba8c40c2117008db Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 28 Jan 2015 06:12:01 -0800 Subject: [PATCH 702/837] "LMY28" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..e5611a4b374 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY28 From 8e189416467dbb3c951232f678cd9e82543a0fc3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 28 Jan 2015 13:37:11 -0800 Subject: [PATCH 703/837] "LMY28B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e5611a4b374..be727486b1f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY28 +export BUILD_ID=LMY28B From f9f468b874eec59c272957a816ebccbea7ad46d3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 28 Jan 2015 15:28:01 -0800 Subject: [PATCH 704/837] "LMY28C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index be727486b1f..81aaca0565d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY28B +export BUILD_ID=LMY28C From 7a31d48c8ce3e8e4d90148d366c338e0dc5cb45d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 29 Jan 2015 06:14:27 -0800 Subject: [PATCH 705/837] "LMY29" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..4c7214c8729 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY29 From b8c634f2a756c737ced8b7e7747db15888cdb1e0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 29 Jan 2015 12:27:10 -0800 Subject: [PATCH 706/837] "LMY29B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 4c7214c8729..b8d46288755 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY29 +export BUILD_ID=LMY29B From a83b3c8d2afb6a76857a0d6ca307e1fed9c3e315 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 29 Jan 2015 15:11:14 -0800 Subject: [PATCH 707/837] "LMY29C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b8d46288755..fe467811ec6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY29B +export BUILD_ID=LMY29C From 83840ad05fba920deec83735d8173ff3daaa2eb6 Mon Sep 17 00:00:00 2001 From: Pawit Pornkitprasan Date: Thu, 9 Jan 2014 22:31:56 +0700 Subject: [PATCH 708/837] build: Keep InCallUI in memory (3/3) Build the dummy InCallUI apk Change-Id: I5a9e13cb9f53930a69486b3cc11cd5fa43e5ae9e --- target/product/telephony.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/telephony.mk b/target/product/telephony.mk index da1497d099c..283875cac52 100644 --- a/target/product/telephony.mk +++ b/target/product/telephony.mk @@ -19,6 +19,7 @@ PRODUCT_PACKAGES := \ Dialer \ + InCallUI \ Mms \ rild From 5dbaf4378c1d55c3349ff85617ead2137d96fc15 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 30 Jan 2015 13:18:20 -0800 Subject: [PATCH 709/837] "LMY29D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fe467811ec6..db883fa31ae 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY29C +export BUILD_ID=LMY29D From 7041bb4d1c100d1d412c1106eaf138a6d4f072cc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 30 Jan 2015 14:47:52 -0800 Subject: [PATCH 710/837] "LMY29E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index db883fa31ae..f2e5a2149d4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY29D +export BUILD_ID=LMY29E From 798c65e151221f411ac215cf31a23cae8fcb1646 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 30 Jan 2015 16:14:49 -0800 Subject: [PATCH 711/837] LMY29F --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f2e5a2149d4..552b4ae45cd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY29E +export BUILD_ID=LMY29F From 9a93327c510e75d8dbc2f5d83b5448514454e3cd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 2 Feb 2015 06:13:15 -0800 Subject: [PATCH 712/837] "LMY33" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..83a0834b078 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY33 From 1587fa3e41091e9b64da512891b6d3f59012ed37 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 3 Feb 2015 06:12:13 -0800 Subject: [PATCH 713/837] "LMY34" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..eea810092b8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY34 From a6101048013e3269d6f3e29e737aa03e3c0fcacc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 3 Feb 2015 15:19:42 -0800 Subject: [PATCH 714/837] "LMY34B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index eea810092b8..c019e2177e1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY34 +export BUILD_ID=LMY34B From 72a42e06d3ff78dded0aa6f6ce7467291f9f8ea3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 4 Feb 2015 06:14:27 -0800 Subject: [PATCH 715/837] "LMY35" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..135785113d1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY35 From 0c41b95600521d749eff9f93d6bfbce6b0a99da5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 5 Feb 2015 06:18:36 -0800 Subject: [PATCH 716/837] "LMY36" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..8a9681d4c6f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY36 From d64857104cbbc08f0909f48b51350a5760c10448 Mon Sep 17 00:00:00 2001 From: dhacker29 Date: Mon, 22 Dec 2014 01:42:04 -0500 Subject: [PATCH 717/837] Fix ro.build.product not found by ota_from_target_files in some cases After I5dccba2172dade3dacc55d832a2042fce306b5f5 it was possible that if override_prop was set and override_device was not set the script was looking for a prop that did not exist. Change-Id: I9e545ff6dcd07acc13e09f58de7d128b22c7a243 --- core/Makefile | 3 +++ tools/releasetools/ota_from_target_files | 28 ++++++++++-------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/core/Makefile b/core/Makefile index a41f9d0806e..d8d21dc4566 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1581,6 +1581,9 @@ ifeq ($(TARGET_UNIFIED_DEVICE),) $(INTERNAL_OTA_PACKAGE_TARGET): override_prop := false else $(INTERNAL_OTA_PACKAGE_TARGET): override_prop := true + ifeq ($(TARGET_OTA_ASSERT_DEVICE),) + $(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_DEVICE) + endif endif ifneq ($(TARGET_SETS_FSTAB),) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 8ddafc60039..846b3aca34b 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -410,10 +410,7 @@ def AppendAssertions(script, info_dict, oem_dict = None): oem_props = info_dict.get("oem_fingerprint_properties") if oem_props is None or len(oem_props) == 0: if OPTIONS.override_device == "auto": - if OPTIONS.override_prop: - device = GetBuildProp("ro.build.product", info_dict) - else: - device = GetBuildProp("ro.product.device", info_dict) + device = GetBuildProp("ro.product.device", info_dict) else: device = OPTIONS.override_device script.AssertDevice(device) @@ -505,19 +502,18 @@ def WriteFullOTAPackage(input_zip, output_zip): script.Mount("/oem", recovery_mount_options) oem_dict = common.LoadDictionaryFromLines(open(OPTIONS.oem_source).readlines()) - metadata = {"post-build": CalculateFingerprint( - oem_props, oem_dict, OPTIONS.info_dict), - "pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict, - OPTIONS.info_dict), - "post-timestamp": GetBuildProp("ro.build.date.utc", + if OPTIONS.override_prop: + metadata = {"post-timestamp": GetBuildProp("ro.build.date.utc", + OPTIONS.info_dict), + } + else: + metadata = {"post-build": CalculateFingerprint( + oem_props, oem_dict, OPTIONS.info_dict), + "pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict, + OPTIONS.info_dict), + "post-timestamp": GetBuildProp("ro.build.date.utc", OPTIONS.info_dict), - } - - if not OPTIONS.override_prop: - metadata["post-build"] = GetBuildProp("ro.build.fingerprint", - OPTIONS.info_dict) - metadata["pre-device"] = GetBuildProp("ro.product.device", - OPTIONS.info_dict) + } device_specific = common.DeviceSpecificParams( input_zip=input_zip, From ef11433b1c183e46fdfd8b01623d9d4a36e56180 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 5 Feb 2015 15:03:32 -0800 Subject: [PATCH 718/837] "LMY36B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8a9681d4c6f..2361b2e3af4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY36 +export BUILD_ID=LMY36B From 150507d00f04ea07094f5bfd0fa38b641483a882 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 6 Feb 2015 18:00:00 -0800 Subject: [PATCH 719/837] "LMY36C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2361b2e3af4..eb2259cb38b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY36B +export BUILD_ID=LMY36C From e8a60f51b739708e9f22cc65d352b40afaf9552f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 9 Feb 2015 06:12:36 -0800 Subject: [PATCH 720/837] "LMY40" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..b0cdfa32ca4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY40 From 33be60eebcfde42fe5c88b28204d070cc4ac75de Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 10 Feb 2015 06:15:23 -0800 Subject: [PATCH 721/837] "LMY41" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..2418fb58115 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY41 From dd94073e09558a765ce2c7d250b8508b2a8bb999 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 11 Feb 2015 06:15:44 -0800 Subject: [PATCH 722/837] "LMY42" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..6c580ea3123 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY42 From 9f874acf04f196663c7b42c11cd645a9cde753b0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 11 Feb 2015 14:34:23 -0800 Subject: [PATCH 723/837] "LMY42B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6c580ea3123..15059430d0c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY42 +export BUILD_ID=LMY42B From 916da206c2cd0d4443d53d4986bb9ab0cbe57074 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 12 Feb 2015 06:14:31 -0800 Subject: [PATCH 724/837] "LMY43" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..e35eee47864 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY43 From e4d5a2c5bd023e12383745fe527e410e67d0cfed Mon Sep 17 00:00:00 2001 From: Volk204 Date: Fri, 30 Jan 2015 22:37:46 +0100 Subject: [PATCH 725/837] [1/2] build: Cleanup PRODUCT_PACKAGES Removed VideoEditor and it's libs - it is not exist anymore Removed OpenWnn Change-Id: I63c0a3bb1c52a4c9d9ccf42766ac0177beb8b4d3 --- target/product/full_base.mk | 5 ----- target/product/generic_no_telephony.mk | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 8f8a3f8a115..18f47f90ba9 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -21,11 +21,6 @@ PRODUCT_PACKAGES := \ libfwdlockengine \ - VideoEditor \ - OpenWnn \ - libWnnEngDic \ - libWnnJpnDic \ - libwnndict \ WAPPushManager PRODUCT_PACKAGES += \ diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk index 321c8c2f7b0..3bb8e44071e 100644 --- a/target/product/generic_no_telephony.mk +++ b/target/product/generic_no_telephony.mk @@ -37,12 +37,7 @@ PRODUCT_PACKAGES += \ screenrecord PRODUCT_PACKAGES += \ - librs_jni \ - libvideoeditor_jni \ - libvideoeditor_core \ - libvideoeditor_osal \ - libvideoeditor_videofilters \ - libvideoeditorplayer \ + librs_jni PRODUCT_PACKAGES += \ audio.primary.default \ From 6a853773669ff450a2e684577b8c73b3b00d6e28 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 13 Feb 2015 01:12:59 -0800 Subject: [PATCH 726/837] "LMY44" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..a4c4d4033f1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY44 From ef863cb1ab796e262c2ce5f048a285b0a2d7393c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 16 Feb 2015 18:03:00 -0800 Subject: [PATCH 727/837] "LMY47" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..9e2ab869b4e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY47 From 37a9ed2dcb275b618c56f58c8e81fe1ce7aace2e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 16 Feb 2015 23:44:14 -0800 Subject: [PATCH 728/837] "LMY47B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..56668c7cd5a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LMY47B From c0a4083e8e9b8c60adff86651578ed1f927674d2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 17 Feb 2015 16:32:25 -0800 Subject: [PATCH 729/837] "LMY47C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 56668c7cd5a..ab021ef20e4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47B +export BUILD_ID=LMY47C From 9ef2e964cab7bbdb3582ad58653148669a485dc7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 18 Feb 2015 20:57:59 -0800 Subject: [PATCH 730/837] "LMY47D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ab021ef20e4..e59357b9ea3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47C +export BUILD_ID=LMY47D From 741d29ddf5192748a70700f95f2f624c3e006f0e Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Thu, 19 Feb 2015 09:47:52 -0800 Subject: [PATCH 731/837] Fix build id on lmp-mr1-wfc-release branch --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..4775a45a4a2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY50B From 025cf46f820f01a0c2af7cbbf58174068548954c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 20 Feb 2015 06:01:11 -0800 Subject: [PATCH 732/837] "LYY51" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..53506ae50f6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY51 From 98e641005c7a4aa4c146eead366b1d0c3c77643d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 21 Feb 2015 06:02:03 -0800 Subject: [PATCH 733/837] "LYY52" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..77dfee11763 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY52 From 7b2e9f086eb1ab2e432c5e6c02cb42c26e3d8268 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 21 Feb 2015 19:52:30 -0800 Subject: [PATCH 734/837] LMY47E --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e59357b9ea3..d07b15cbd96 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47D +export BUILD_ID=LMY47E From 31d0c910400938bffbd0dd652691862597576438 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 22 Feb 2015 06:00:16 -0800 Subject: [PATCH 735/837] "LYY53" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..b722887a39d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY53 From 4bff044c05c3c62734fdf7e50594c713f2c8daa2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 23 Feb 2015 06:00:31 -0800 Subject: [PATCH 736/837] "LYY54" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..caddb4ad86d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY54 From 06260a3a6742891fac4c472f7f8442a9baf4b9de Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 24 Feb 2015 06:01:29 -0800 Subject: [PATCH 737/837] "LYY55" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..33d1734b2a6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY55 From dbb2ce9e8a0403d35cdf9a866a6c409652bf12dd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 25 Feb 2015 06:02:16 -0800 Subject: [PATCH 738/837] "LYY56" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..cca4235d6d3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY56 From be9ec017d7645cc957a6cedff0ef817e0829865f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 25 Feb 2015 11:45:17 -0800 Subject: [PATCH 739/837] "LMY47F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d07b15cbd96..23fd09ce8f5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47E +export BUILD_ID=LMY47F From b4e7683d66a102e86d5a4c13068b4cf6a81c73af Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 26 Feb 2015 06:01:41 -0800 Subject: [PATCH 740/837] "LYY57" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..e0bea04cec0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY57 From 16eea6e59a64fe1554dd85df85561d2225ad1517 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 27 Feb 2015 15:05:35 -0800 Subject: [PATCH 741/837] LMY47G --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 23fd09ce8f5..67ce9558cce 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47F +export BUILD_ID=LMY47G From 07475e540cfbbebf221dc329b6793cd6695b73ab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 27 Feb 2015 15:06:36 -0800 Subject: [PATCH 742/837] "LYY57B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e0bea04cec0..72e9e898ef5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYY57 +export BUILD_ID=LYY57B From fecbe129164f40d72751cec5e66254c5a0e80a34 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 2 Mar 2015 06:02:38 -0800 Subject: [PATCH 743/837] "LYY61" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..5f35124bd1d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY61 From 8d5f0f9f6007082c74e8a554d4b3b0e9ea7b2f29 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 2 Mar 2015 10:50:32 -0800 Subject: [PATCH 744/837] "LMY47H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 67ce9558cce..ff0694c407e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47G +export BUILD_ID=LMY47H From a8898c04188918c55ca0bead639d0544a08d9912 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 3 Mar 2015 06:02:39 -0800 Subject: [PATCH 745/837] "LYY62" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..e8aaddce812 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY62 From d61ef571a7fa0d6fa84c19410a9b3a5911c55917 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 3 Mar 2015 20:05:34 -0800 Subject: [PATCH 746/837] "LMY47I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ff0694c407e..09e5c6b2e03 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47H +export BUILD_ID=LMY47I From 85d27f03e6f9e08cce74a415baeb508046419eb1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 4 Mar 2015 06:01:19 -0800 Subject: [PATCH 747/837] "LYY63" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..df1ee4be59c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY63 From 5a0b3c77d318fad0f79d9d982dc1ed13de2999c5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 4 Mar 2015 19:54:17 -0800 Subject: [PATCH 748/837] "LMY47J" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e59357b9ea3..09c131e7e73 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47D +export BUILD_ID=LMY47J From 2c595ea428ea914705c2ea7da1fa3bfba3ed66c6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 5 Mar 2015 06:01:29 -0800 Subject: [PATCH 749/837] "LYY64" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..6ef4bac604c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY64 From bd5479c36e631cbf186027c7706f1a77aaac2809 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 5 Mar 2015 17:57:51 -0800 Subject: [PATCH 750/837] "LMY47K" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 09c131e7e73..c5d26556552 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47J +export BUILD_ID=LMY47K From 4522f419e9e51a35fd225ef0b0ecab84ba6a44b9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 6 Mar 2015 13:15:34 -0800 Subject: [PATCH 751/837] "LMY47L" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c5d26556552..57c9109a32a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47K +export BUILD_ID=LMY47L From 42785298907f49c2447eeb664eab8e753485cf3d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 6 Mar 2015 15:55:18 -0800 Subject: [PATCH 752/837] "LMY47M" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 57c9109a32a..6036f4e3059 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47L +export BUILD_ID=LMY47M From 06047ced6348c2bc3799b79d80da09f44798a4d3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 9 Mar 2015 06:02:23 -0700 Subject: [PATCH 753/837] "LYY68" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..d18821947e9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY68 From 394055b7de2b26995a0ac16a3a37f521daedad4c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 10 Mar 2015 06:01:36 -0700 Subject: [PATCH 754/837] "LYY69" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..1e4e745c008 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY69 From 128bb23c675e4dca5875d4202ff10d0617bb0e83 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 10 Mar 2015 17:13:58 -0700 Subject: [PATCH 755/837] "LMY47N" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 09e5c6b2e03..b048f4dd236 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47I +export BUILD_ID=LMY47N From 5624c45955b850158c4a2d8b588e93f036c05c8c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 11 Mar 2015 06:01:52 -0700 Subject: [PATCH 756/837] "LYY70" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..e292319e617 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY70 From 09844be7f702c00bc49287f8e9ad2f8a054f815c Mon Sep 17 00:00:00 2001 From: erikcas Date: Wed, 11 Mar 2015 21:59:19 +0100 Subject: [PATCH 757/837] roomservice: update default revision Change-Id: Ied6c6c0383a05083156bb758eeb68ff60bc6e75d --- tools/roomservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index f87ddbabc63..7725fa44d9b 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -38,7 +38,7 @@ # set this to the default remote to use in repo default_rem = "omnirom" # set this to the default revision to use (branch/tag name) -default_rev = "android-5.0" +default_rev = "android-5.1" # set this to the remote that you use for projects from your team repos # example fetch="https://github.com/omnirom" default_team_rem = "omnirom" From 1ac5b83b11ff41d4ce2dd3d582d2af0f1a88262a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 11 Mar 2015 19:35:44 -0700 Subject: [PATCH 758/837] "LMY47O" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b048f4dd236..29b44b78178 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47N +export BUILD_ID=LMY47O From e0c3076c5371fb6bc3d1ee49a49ad4531299bbe7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 12 Mar 2015 06:02:38 -0700 Subject: [PATCH 759/837] "LYY71" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..0fea6383a89 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY71 From 182ec7413a7eff5218253af48e49e4b744d187e9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 16 Mar 2015 06:02:28 -0700 Subject: [PATCH 760/837] "LYY75" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..b6413d3f503 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY75 From caa45d6db77982ec592f1bc196d6ae72f1dda57f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 16 Mar 2015 18:12:36 -0700 Subject: [PATCH 761/837] "LMY47P" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 29b44b78178..677ba9c2d0d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47O +export BUILD_ID=LMY47P From 44182daec866410373ee09e19c471b93013412f0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 17 Mar 2015 06:02:50 -0700 Subject: [PATCH 762/837] "LYY76" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..7e8b764040c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY76 From 5cdb00233b8678a148a551b1acb65680e36af94d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 18 Mar 2015 06:02:26 -0700 Subject: [PATCH 763/837] "LYY77" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..3732f7cea3b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY77 From 12f670bd773771d9aa1c69c943402b1f120ad196 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 19 Mar 2015 06:03:13 -0700 Subject: [PATCH 764/837] "LYY78" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..5497cb259e6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY78 From a98d1b59374377fe42f470f06687f50756d5d975 Mon Sep 17 00:00:00 2001 From: Humberto Borba Date: Wed, 11 Feb 2015 21:30:00 -0200 Subject: [PATCH 765/837] build: product: add new flag to exclude live wallpapers from build flag: TARGET_EXCLUDE_LIVEWALLPAPERS := true In general these entries are located on device repo, in omni_[device name].mk It should be declared before full_base_telephony.mk inherit statement Ps. Make sure that not exists packages declarations on specific device vendor repo. Signed-off-by: Humberto Borba Change-Id: Ib77c3e2d13cc43981a0e12d853346abfc7549c67 --- target/product/full_base.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 785787c1136..4e9653ff858 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -23,6 +23,7 @@ PRODUCT_PACKAGES := \ libfwdlockengine \ WAPPushManager +ifneq ($(TARGET_EXCLUDE_LIVEWALLPAPERS), true) PRODUCT_PACKAGES += \ Galaxy4 \ HoloSpiralWallpaper \ @@ -33,6 +34,11 @@ PRODUCT_PACKAGES += \ PhaseBeam \ VisualizationWallpapers \ PhotoTable +else +PRODUCT_PACKAGES += \ + LiveWallpapersPicker \ + PhotoTable +endif # Additional settings used in all AOSP builds PRODUCT_PROPERTY_OVERRIDES := \ From d14e7f7a1908dac2b59db687bd03ef2b615d1f13 Mon Sep 17 00:00:00 2001 From: Humberto Borba Date: Sun, 15 Feb 2015 20:39:02 -0200 Subject: [PATCH 766/837] [1/2] build: introduce TARGET_LOW_RAM_DEVICE reduce build size for low ram devices remove: livewallpapers voice dialer flag: TARGET_LOW_RAM_DEVICE := true In general this entry is located on device repo, in omni_[device name].mk It should be declared before full_base_telephony.mk inherit statement reference: https://source.android.com/devices/tech/low-ram.html [2]: https://gerrit.omnirom.org/#/c/12539/ Signed-off-by: Humberto Borba Change-Id: I4d3f524aa50e639ddac69bd13e1147d88e56a3cd --- target/product/full_base.mk | 32 ++++++++++++++------------- target/product/full_base_telephony.mk | 2 ++ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/target/product/full_base.mk b/target/product/full_base.mk index 4e9653ff858..833cadf9b2a 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -23,21 +23,23 @@ PRODUCT_PACKAGES := \ libfwdlockengine \ WAPPushManager -ifneq ($(TARGET_EXCLUDE_LIVEWALLPAPERS), true) -PRODUCT_PACKAGES += \ - Galaxy4 \ - HoloSpiralWallpaper \ - LiveWallpapers \ - LiveWallpapersPicker \ - MagicSmokeWallpapers \ - NoiseField \ - PhaseBeam \ - VisualizationWallpapers \ - PhotoTable -else -PRODUCT_PACKAGES += \ - LiveWallpapersPicker \ - PhotoTable +ifneq ($(TARGET_LOW_RAM_DEVICE), true) + ifneq ($(TARGET_EXCLUDE_LIVEWALLPAPERS), true) + PRODUCT_PACKAGES += \ + Galaxy4 \ + HoloSpiralWallpaper \ + LiveWallpapers \ + LiveWallpapersPicker \ + MagicSmokeWallpapers \ + NoiseField \ + PhaseBeam \ + VisualizationWallpapers \ + PhotoTable + else + PRODUCT_PACKAGES += \ + LiveWallpapersPicker \ + PhotoTable + endif endif # Additional settings used in all AOSP builds diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk index 04132300832..c4b85838471 100644 --- a/target/product/full_base_telephony.mk +++ b/target/product/full_base_telephony.mk @@ -19,9 +19,11 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. +ifneq ($(TARGET_LOW_RAM_DEVICE), true) PRODUCT_PACKAGES := \ VoiceDialer \ libsrec_jni +endif PRODUCT_PROPERTY_OVERRIDES := \ keyguard.no_require_sim=true \ From 058dc07162264749858093eca18322a350da1d0f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 20 Mar 2015 05:32:24 -0700 Subject: [PATCH 767/837] "LYY78B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5497cb259e6..b0c1a363e0c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYY78 +export BUILD_ID=LYY78B From cc61059e2cfc62efb0c13804ac99abb3394d0243 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 20 Mar 2015 22:42:26 -0700 Subject: [PATCH 768/837] "LMY47Q" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 677ba9c2d0d..c0c33ae4d21 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47P +export BUILD_ID=LMY47Q From 3bf1cbdca97ad19aea05ab1465ea7fb7c4855ccf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 23 Mar 2015 06:02:54 -0700 Subject: [PATCH 769/837] "LYY82" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..b5c65460326 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY82 From 1b9104f60d310d62d37d87c2346b62164c32994d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 24 Mar 2015 06:02:07 -0700 Subject: [PATCH 770/837] "LYY83" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..3b7e0667e51 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY83 From f086fec9f4ed78673c7e56b59b6c085267bf8232 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 25 Mar 2015 06:02:03 -0700 Subject: [PATCH 771/837] "LYY84" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..f4c6623dfaf 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY84 From 33045bedb902b02eefac4ad18d3507b35d4b72cd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 25 Mar 2015 18:50:30 -0700 Subject: [PATCH 772/837] "LMY47R" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c0c33ae4d21..3dcabc98bef 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47Q +export BUILD_ID=LMY47R From 7f47ecb1106df3f3b43cfeee1bcfc660a8c53a29 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 26 Mar 2015 06:02:56 -0700 Subject: [PATCH 773/837] "LYY85" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..462dff2d692 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY85 From a14b24a7762b268e647c7b4cd402172c368728cb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 26 Mar 2015 19:00:26 -0700 Subject: [PATCH 774/837] "LYY85B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 462dff2d692..3004bed6c08 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYY85 +export BUILD_ID=LYY85B From 9ef1170e93314ccb33a09ae4eb93d669c6073cb6 Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Wed, 25 Mar 2015 21:04:38 -0700 Subject: [PATCH 775/837] DO NOT MERGE - Bump version to 5.1.1 Bug: 19939307 Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb --- CleanSpec.mk | 5 +++++ core/version_defaults.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 6e7c9b0d321..e706b9c9e5e 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -309,6 +309,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) +# 5.1.1! +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index d87a032386f..cc63286b28f 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 5.1 + PLATFORM_VERSION := 5.1.1 endif ifeq "" "$(PLATFORM_SDK_VERSION)" From 60c5a0928625b56f7ec9884173d0c1deb937d3a8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 27 Mar 2015 15:05:16 -0700 Subject: [PATCH 776/837] "LMY47S" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3dcabc98bef..8b78098698a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47R +export BUILD_ID=LMY47S From 6859665d8dc5fc719ba85619133af7908e5b065d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 27 Mar 2015 16:20:40 -0700 Subject: [PATCH 777/837] "LYY85C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3004bed6c08..ab027a8ed9d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYY85B +export BUILD_ID=LYY85C From 07e4f1999665b8482bad0219f9ab2e213a4ba1f3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 21 Feb 2015 19:52:30 -0800 Subject: [PATCH 778/837] LMY47E Change-Id: Ifce043b43a421a37dac4e0cb81ee9d833be8d066 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e59357b9ea3..d07b15cbd96 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47D +export BUILD_ID=LMY47E From 9a3515f667b40d42fbfb243b3fec28fcd6dfecc8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 25 Feb 2015 11:45:17 -0800 Subject: [PATCH 779/837] "LMY47F" Change-Id: I1a0577101ae4d7fa1ffedd8f880c5029bdc706e5 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d07b15cbd96..23fd09ce8f5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47E +export BUILD_ID=LMY47F From bfe5b3dfa772516715ef8ddc5ef1053adeeb1583 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 27 Feb 2015 15:05:35 -0800 Subject: [PATCH 780/837] LMY47G Change-Id: Ic86f90cbceaadde007bd5b172eb6d037791e28d7 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 23fd09ce8f5..67ce9558cce 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47F +export BUILD_ID=LMY47G From d71de71b1d6d85eb223e399cb58f08fd962b99a8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 2 Mar 2015 10:50:32 -0800 Subject: [PATCH 781/837] "LMY47H" Change-Id: Ie71a6ee6884dcc29bb488b16f501888a50fcd617 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 67ce9558cce..ff0694c407e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47G +export BUILD_ID=LMY47H From 7d5a9c5697719f44e0be83e4d8f29bc49318fe3b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 3 Mar 2015 20:05:34 -0800 Subject: [PATCH 782/837] "LMY47I" Change-Id: Iae866420142afd000b8659ad1304aeea640681ad --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ff0694c407e..09e5c6b2e03 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47H +export BUILD_ID=LMY47I From 6d84b9a1958fc2d56efdebaafeb8f98779ebc154 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 30 Mar 2015 06:03:19 -0700 Subject: [PATCH 783/837] "LYY89" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..ba78b61f843 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY89 From a117fb539a09d349c17e065a312347c09530d05c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 31 Mar 2015 06:00:57 -0700 Subject: [PATCH 784/837] "LYY90" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..988b8ad10c2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYY90 From 3892a6c15b8e0b4c5902e0c252bfadb7d134f8a2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 31 Mar 2015 15:16:40 -0700 Subject: [PATCH 785/837] "LMY47T" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8b78098698a..1bc52c3b7f7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47S +export BUILD_ID=LMY47T From 02eb1ebd99fc821ba0a929fb0d33af3661a498d2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Apr 2015 06:00:43 -0700 Subject: [PATCH 786/837] "LYZ01" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..4c382fbb9bd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ01 From b2bc140ba6cee19680b7ffbaff2a6d348234d016 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Apr 2015 10:53:02 -0700 Subject: [PATCH 787/837] "LMY47U" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1bc52c3b7f7..8d782bb843b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47T +export BUILD_ID=LMY47U From 52776a92f06ed7793335686873a1adc494bcb2cd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Apr 2015 06:02:29 -0700 Subject: [PATCH 788/837] "LYZ02" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..2a3d2d44929 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ02 From efbcf1b6db22abf8e474ccf93f1b942d55dfd403 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Apr 2015 12:03:12 -0700 Subject: [PATCH 789/837] "LYZ02B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2a3d2d44929..645b9cdc078 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ02 +export BUILD_ID=LYZ02B From 78b2bbb275c3606eec65342aa0e01f166f5d1163 Mon Sep 17 00:00:00 2001 From: Captain Throwback Date: Thu, 2 Apr 2015 17:16:57 -0400 Subject: [PATCH 790/837] Fix setting ro.product.model on unified devices Change-Id: I768264481f5d2228534db7fa9fab32c6bc8bc17a --- tools/buildinfo.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index b69f3b143c6..7684b1e653e 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -17,7 +17,6 @@ echo "ro.build.user=$USER" echo "ro.build.host=`hostname`" echo "ro.build.tags=$BUILD_VERSION_TAGS" echo "ro.build.flavor=$TARGET_BUILD_FLAVOR" -echo "ro.product.model=$PRODUCT_MODEL" echo "ro.product.brand=$PRODUCT_BRAND" echo "ro.product.board=$TARGET_BOOTLOADER_BOARD_NAME" From a6950656be246a4ef846c8a26d301e316ee7a48f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 Apr 2015 12:00:14 -0700 Subject: [PATCH 791/837] "LYZ02C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 645b9cdc078..35ce4446399 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ02B +export BUILD_ID=LYZ02C From 1c619e30703e32a0c478364c81d816f70cb1fead Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Apr 2015 06:01:22 -0700 Subject: [PATCH 792/837] "LYZ06" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..0ad76235340 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ06 From a9c8e589abbd5f14df1ffac6d6e90f83bd6648fb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Apr 2015 18:51:43 -0700 Subject: [PATCH 793/837] "LMY47V" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8d782bb843b..fa2386729d0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47U +export BUILD_ID=LMY47V From dfc3eb2922438037e914cdc4d0ecbad4fc5478b6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Apr 2015 06:01:07 -0700 Subject: [PATCH 794/837] "LYZ07" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..b39645347ca 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ07 From 76db86ac5fe105e6954ade79b649b5b64a9fb7f5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Apr 2015 10:00:03 -0700 Subject: [PATCH 795/837] "LMY47W" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fa2386729d0..0b7c28f8f2e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47V +export BUILD_ID=LMY47W From 626d99a8c8cd3d8f42874f6543fbb849bbe444ac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Apr 2015 06:01:02 -0700 Subject: [PATCH 796/837] "LYZ08" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..72bd3083593 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ08 From 28b8959c41f7cb4cd80454f4ba920385c0a1eec5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Apr 2015 06:00:49 -0700 Subject: [PATCH 797/837] "LYZ09" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..a05b40903c5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ09 From d6ee8112555d7ea819d0c95c26ec2ad14a9879cd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 10 Apr 2015 11:20:44 -0700 Subject: [PATCH 798/837] "LYZ09B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a05b40903c5..c7f0d0f2d40 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ09 +export BUILD_ID=LYZ09B From b2373fb7ec3abe0470c59dfbf1ec10b7034b10ef Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Apr 2015 06:01:21 -0700 Subject: [PATCH 799/837] "LYZ13" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..e15d977b3c6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ13 From 793c7e33b87dcbd679ee2653e16a08b1df139a02 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Apr 2015 08:28:07 -0700 Subject: [PATCH 800/837] "LMY47X" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0b7c28f8f2e..4da1962dd09 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMY47W +export BUILD_ID=LMY47X From 8747eaedee4281683dfa4956d3165ba9d24d2f82 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Apr 2015 06:01:19 -0700 Subject: [PATCH 801/837] "LYZ14" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..aff2d132435 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ14 From c096f93734cb26a649bf25ad7a8fbcaf6f0a873d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 Apr 2015 06:01:25 -0700 Subject: [PATCH 802/837] "LYZ15" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..9525751c3eb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ15 From cd9a1634309983b9fc09ba904406f6f6db296143 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Apr 2015 06:01:10 -0700 Subject: [PATCH 803/837] "LYZ16" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..421bdf2302b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ16 From 9704040d6f34424413bcc8dcb9108f567b71fd6e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Apr 2015 10:54:02 -0700 Subject: [PATCH 804/837] "LYZ16B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 421bdf2302b..a4e4a08aca8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ16 +export BUILD_ID=LYZ16B From 23d521c75cab33c79cf07194c4a75c91fd6bbd5d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 20 Apr 2015 06:02:19 -0700 Subject: [PATCH 805/837] "LYZ20" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..d1b08eda2ff 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ20 From e113a5495f05f75dbefa22dd3d2d863b6c8358e9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Apr 2015 06:01:21 -0700 Subject: [PATCH 806/837] "LYZ21" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..9e208be4392 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ21 From a87306b0ebb3e55d878029513f816ca882ee0249 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Apr 2015 06:01:22 -0700 Subject: [PATCH 807/837] "LYZ22" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..7e56a7d619a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ22 From dcece825cce853d32ea2327090e161cd8aa770cd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Apr 2015 06:01:37 -0700 Subject: [PATCH 808/837] "LYZ23" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..bd090c2b9a7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ23 From b6386149f26292f8ee8acabe2bb0bf4baf4fb3bd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Apr 2015 09:04:29 -0700 Subject: [PATCH 809/837] "LYZ24" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..034b2eaa96e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ24 From 5008b9c6fd9dc8704298c37a0873fbd2289bf6ce Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 25 Apr 2015 17:09:08 -0700 Subject: [PATCH 810/837] "LYZ24B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 034b2eaa96e..4d484173678 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ24 +export BUILD_ID=LYZ24B From ae2a6c6dbd6cde4fff8a71f52c7404130f744469 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Apr 2015 06:02:41 -0700 Subject: [PATCH 811/837] "LYZ27" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..7e37ed34158 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ27 From 0ce1110aff8544ea3abb0d991ab1b9a1234c5b2c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Apr 2015 20:26:01 -0700 Subject: [PATCH 812/837] "LYZ27B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7e37ed34158..5aedf2119d6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ27 +export BUILD_ID=LYZ27B From 11d7d4432986724db3f0cdc98687fdf495040d16 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Apr 2015 06:01:47 -0700 Subject: [PATCH 813/837] "LYZ28" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 00a691f85bd..d3db74b0fb4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LMP +export BUILD_ID=LYZ28 From 31bd6900fbd3f2560e53d6f96a9dda8a67d8c1d0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Apr 2015 20:45:01 -0700 Subject: [PATCH 814/837] LYZ28B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d3db74b0fb4..32cf515b04b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28 +export BUILD_ID=LYZ28B From dc9faafd1fa4b4eb0702f6775eee884093d0fd4c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Apr 2015 18:43:31 -0700 Subject: [PATCH 815/837] LYZ28C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 32cf515b04b..bfa67821a0d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28B +export BUILD_ID=LYZ28C From 52e6cd16de87b332a8d80af9f7330587f59edbf6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 1 May 2015 12:13:21 -0700 Subject: [PATCH 816/837] "LYZ28D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index bfa67821a0d..8beb3505132 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28C +export BUILD_ID=LYZ28D From c851fb8c5417fe0b2d910c0ddcf60a5f98570db2 Mon Sep 17 00:00:00 2001 From: invisiblek Date: Sat, 29 Nov 2014 11:14:13 -0600 Subject: [PATCH 817/837] buildinfo: only set ro.build.product on non-unified devices Change-Id: I5dccba2172dade3dacc55d832a2042fce306b5f5 --- tools/buildinfo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index 7684b1e653e..2016e724eec 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -42,9 +42,9 @@ fi echo "ro.wifi.channels=$PRODUCT_DEFAULT_WIFI_CHANNELS" echo "ro.board.platform=$TARGET_BOARD_PLATFORM" -echo "# ro.build.product is obsolete; use ro.product.device" -echo "ro.build.product=$TARGET_DEVICE" if [ "$TARGET_UNIFIED_DEVICE" == "" ] ; then + echo "# ro.build.product is obsolete; use ro.product.device" + echo "ro.build.product=$TARGET_DEVICE" echo "ro.product.model=$PRODUCT_MODEL" echo "ro.product.name=$PRODUCT_NAME" echo "ro.product.device=$TARGET_DEVICE" From f28d2f58e66ec6a0da4f9a0e5bfe9051335e356b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 May 2015 15:51:15 -0700 Subject: [PATCH 818/837] "LYZ28E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8beb3505132..409668d0787 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28D +export BUILD_ID=LYZ28E From e6e0508e71c9cbb11010898e9bdf8355f38f04ef Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 May 2015 08:34:15 -0700 Subject: [PATCH 819/837] LYZ28F --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 409668d0787..f3f41f1fd0a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28E +export BUILD_ID=LYZ28F From c24f878cbb8df85cdbcc2110b9a12bf8a06b00c4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Jun 2015 12:31:13 -0700 Subject: [PATCH 820/837] "LYZ28G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f3f41f1fd0a..3bb1d6c3c05 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28F +export BUILD_ID=LYZ28G From 1124c59242916a53dc891dede9a8e19fcdf4aa25 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Jun 2015 10:27:47 -0700 Subject: [PATCH 821/837] "LYZ28H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3bb1d6c3c05..88c2eb41caf 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28G +export BUILD_ID=LYZ28H From 1a9c8e9a21114c88cf8638468de5538180b010b7 Mon Sep 17 00:00:00 2001 From: maxwen Date: Tue, 9 Jun 2015 01:22:25 +0200 Subject: [PATCH 822/837] build: av-caf split Change-Id: I533cc0403e5e98c25615eb4b590613638fef9060 --- core/config.mk | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/core/config.mk b/core/config.mk index 117f7ca4d44..23305796899 100644 --- a/core/config.mk +++ b/core/config.mk @@ -44,8 +44,8 @@ SRC_HEADERS := \ $(TOPDIR)libnativehelper/include \ $(TOPDIR)frameworks/native/include \ $(TOPDIR)frameworks/native/opengl/include \ - $(TOPDIR)frameworks/av/include \ $(TOPDIR)frameworks/base/include + SRC_HOST_HEADERS:=$(TOPDIR)tools/include SRC_LIBRARIES:= $(TOPDIR)libs SRC_SERVERS:= $(TOPDIR)servers @@ -516,9 +516,19 @@ HOST_GLOBAL_LD_DIRS += -L$(HOST_OUT_INTERMEDIATE_LIBRARIES) TARGET_GLOBAL_LD_DIRS += -L$(TARGET_OUT_INTERMEDIATE_LIBRARIES) HOST_PROJECT_INCLUDES:= $(SRC_HEADERS) $(SRC_HOST_HEADERS) $(HOST_OUT_HEADERS) + +ifeq ($(BOARD_USES_QCOM_HARDWARE),true) +TARGET_AV_HEADERS := \ + frameworks/av-caf/include +else +TARGET_AV_HEADERS := \ + frameworks/av/include +endif + TARGET_PROJECT_INCLUDES:= $(SRC_HEADERS) $(TARGET_OUT_HEADERS) \ $(TARGET_DEVICE_KERNEL_HEADERS) $(TARGET_BOARD_KERNEL_HEADERS) \ - $(TARGET_PRODUCT_KERNEL_HEADERS) + $(TARGET_PRODUCT_KERNEL_HEADERS) $(TARGET_AV_HEADERS) + # Many host compilers don't support these flags, so we have to make # sure to only specify them for the target compilers checked in to From 180cb3da6175a6538a9ebae8285629fd9ea90d5b Mon Sep 17 00:00:00 2001 From: maxwen Date: Wed, 10 Jun 2015 22:13:47 +0200 Subject: [PATCH 823/837] roomservice: support same repo using different path and revision Change-Id: Ifd47cbeab2ca7e99a117883e3a3ecb880581e110 --- tools/roomservice.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/roomservice.py b/tools/roomservice.py index 7725fa44d9b..619c18d66fc 100755 --- a/tools/roomservice.py +++ b/tools/roomservice.py @@ -110,9 +110,9 @@ def iterate_manifests(): yield project -def check_project_exists(url): +def check_project_exists(url, revision, path): for project in iterate_manifests(): - if project.get("name") == url: + if project.get("name") == url and project.get("revision") == revision and project.get("path") == path: return True return False @@ -141,7 +141,7 @@ def indent(elem, level=0): def create_manifest_project(url, directory, remote=default_rem, revision=default_rev): - project_exists = check_project_exists(url) + project_exists = check_project_exists(url, revision, directory) if project_exists: return None From f76328806c18c6ce5fb46b04aca22a4c8c19cf9c Mon Sep 17 00:00:00 2001 From: Chirayu Desai Date: Sun, 9 Nov 2014 17:27:51 +0530 Subject: [PATCH 824/837] Squashed commit of updates to kernel.mk from CM PS2: Add default toolchain prefix for KERNEL_ARCH=arm64 Allow specifying kernel toolchain and prefix Change-Id: Ib75cfe772e073f2196455f3e3dfba247f6b3feff core: More flexible kernel configuration * Allow various combinations of kernel vs. userspace architectures * Get rid of various assumptions about everything being ARM or 32-bit * This adds the following target flags: TARGET_KERNEL_ARCH TARGET_KERNEL_HEADER_ARCH KERNEL_HEADER_DEFCONFIG TARGET_KERNEL_CROSS_COMPILE_PREFIX Change-Id: If0bc202abd35c216ba3ea5707ffdb602526d8ed3 Fix kernel.mk if SELINUX or VARIANT_DEFCONFIG is defined KERNEL_HEADER_DEFCONFIG was ignoring SELINUX_DEFCONFIG thus breaking all selinux support Change-Id: Idc3367d6b4b85343078e63e87dca6d6d052e7f53 build: kernel: Fix stray "@" Nested "$(hide)"s (makefile @) don't work. There was one at the beginning of the script, remove the inner one to prevent it from being interpreted as a shell command Change-Id: I08a829ee56b212366a0f5a3812f7a614667a9c2b build: Add support for additional kernel config snippet * Add support for TARGET_KERNEL_ADDITIONAL_CONFIG which will append a config snippet from arch/$ARCH/configs/ to the main defconfig. * This can be used for various things, such as including DIAG support into debuggable builds. Change-Id: Ifa48688a3f951dd8ecc9a13a27de3a476e7bf633 kernel: Fix kernelconfig build * Copy the generated defconfig to the correct directory Change-Id: Ia8e259946d67501675dd5a3433165d54df6c13c5 --- core/tasks/kernel.mk | 160 +++++++++++++++++++++++++++++++------------ 1 file changed, 115 insertions(+), 45 deletions(-) diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index af1bf550692..aa64f912b3f 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -31,12 +31,51 @@ SELINUX_DEFCONFIG := $(TARGET_KERNEL_SELINUX_CONFIG) KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ KERNEL_CONFIG := $(KERNEL_OUT)/.config +TARGET_KERNEL_ARCH := $(strip $(TARGET_KERNEL_ARCH)) +ifeq ($(TARGET_KERNEL_ARCH),) +KERNEL_ARCH := $(TARGET_ARCH) +else +KERNEL_ARCH := $(TARGET_KERNEL_ARCH) +endif + +TARGET_KERNEL_HEADER_ARCH := $(strip $(TARGET_KERNEL_HEADER_ARCH)) +ifeq ($(TARGET_KERNEL_HEADER_ARCH),) +KERNEL_HEADER_ARCH := $(KERNEL_ARCH) +else +KERNEL_HEADER_ARCH := $(TARGET_KERNEL_HEADER_ARCH) +endif + +KERNEL_HEADER_DEFCONFIG := $(strip $(KERNEL_HEADER_DEFCONFIG)) +ifeq ($(KERNEL_HEADER_DEFCONFIG),) +KERNEL_HEADER_DEFCONFIG := $(KERNEL_DEFCONFIG) +endif + + ifneq ($(BOARD_KERNEL_IMAGE_NAME),) - TARGET_PREBUILT_INT_KERNEL_TYPE := $(BOARD_KERNEL_IMAGE_NAME) - TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/$(TARGET_PREBUILT_INT_KERNEL_TYPE) + TARGET_PREBUILT_INT_KERNEL_TYPE := $(BOARD_KERNEL_IMAGE_NAME) else - TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/zImage - TARGET_PREBUILT_INT_KERNEL_TYPE := zImage + ifeq ($(TARGET_USES_UNCOMPRESSED_KERNEL),true) + TARGET_PREBUILT_INT_KERNEL_TYPE := Image + else + TARGET_PREBUILT_INT_KERNEL_TYPE := zImage + endif +endif + +TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/$(TARGET_PREBUILT_INT_KERNEL_TYPE) + +# Clear this first to prevent accidental poisoning from env +MAKE_FLAGS := + +ifeq ($(KERNEL_ARCH),arm64) + # Avoid "unsupported RELA relocation: 311" errors (R_AARCH64_ADR_GOT_PAGE) + MAKE_FLAGS += CFLAGS_MODULE="-fno-pic" + ifeq ($(TARGET_ARCH),arm) + KERNEL_CONFIG_OVERRIDE := CONFIG_ANDROID_BINDER_IPC_32BIT=y + endif +endif + +ifneq ($(TARGET_KERNEL_ADDITIONAL_CONFIG),) +KERNEL_ADDITIONAL_CONFIG := $(TARGET_KERNEL_ADDITIONAL_CONFIG) endif ## Do be discontinued in a future version. Notify builder about target @@ -99,12 +138,7 @@ else else #$(info Kernel source found, building it) FULL_KERNEL_BUILD := true - ifeq ($(TARGET_USES_UNCOMPRESSED_KERNEL),true) - $(info Using uncompressed kernel) - KERNEL_BIN := $(KERNEL_OUT)/piggy - else - KERNEL_BIN := $(TARGET_PREBUILT_INT_KERNEL) - endif + KERNEL_BIN := $(TARGET_PREBUILT_INT_KERNEL) endif endif @@ -114,12 +148,42 @@ KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr KERNEL_MODULES_INSTALL := system KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules +TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREFIX)) +ifeq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),) +ifeq ($(KERNEL_TOOLCHAIN_PREFIX),) + ifeq ($(KERNEL_ARCH),arm64) + KERNEL_TOOLCHAIN_PREFIX := aarch64-linux-android- + else + KERNEL_TOOLCHAIN_PREFIX := arm-eabi- + endif +endif +else +KERNEL_TOOLCHAIN_PREFIX := $(TARGET_KERNEL_CROSS_COMPILE_PREFIX) +endif + +ifeq ($(KERNEL_TOOLCHAIN),) +KERNEL_TOOLCHAIN_PATH := $(KERNEL_TOOLCHAIN_PREFIX) +else +ifneq ($(KERNEL_TOOLCHAIN_PREFIX),) +KERNEL_TOOLCHAIN_PATH := $(KERNEL_TOOLCHAIN)/$(KERNEL_TOOLCHAIN_PREFIX) +endif +endif + +ifneq ($(USE_CCACHE),) + ccache := $(ANDROID_BUILD_TOP)/prebuilts/misc/$(HOST_PREBUILT_TAG)/ccache/ccache + # Check that the executable is here. + ccache := $(strip $(wildcard $(ccache))) +endif + +KERNEL_CROSS_COMPILE := CROSS_COMPILE="$(ccache) $(KERNEL_TOOLCHAIN_PATH)" +ccache = + define mv-modules mdpath=`find $(KERNEL_MODULES_OUT) -type f -name modules.order`;\ if [ "$$mdpath" != "" ];then\ mpath=`dirname $$mdpath`;\ ko=`find $$mpath/kernel -type f -name *.ko`;\ - for i in $$ko; do $(ARM_EABI_TOOLCHAIN)/arm-eabi-strip --strip-unneeded $$i;\ + for i in $$ko; do $(KERNEL_TOOLCHAIN_PATH)strip --strip-unneeded $$i;\ mv $$i $(KERNEL_MODULES_OUT)/; done;\ fi endef @@ -131,32 +195,8 @@ define clean-module-folder fi endef -ifeq ($(TARGET_ARCH),arm) - ifneq ($(USE_CCACHE),) - # search executable - ccache = - ifneq ($(strip $(wildcard $(ANDROID_BUILD_TOP)/prebuilts/misc/$(HOST_PREBUILT_EXTRA_TAG)/ccache/ccache)),) - ccache := $(ANDROID_BUILD_TOP)/prebuilts/misc/$(HOST_PREBUILT_EXTRA_TAG)/ccache/ccache - else - ifneq ($(strip $(wildcard $(ANDROID_BUILD_TOP)/prebuilts/misc/$(HOST_PREBUILT_TAG)/ccache/ccache)),) - ccache := $(ANDROID_BUILD_TOP)/prebuilts/misc/$(HOST_PREBUILT_TAG)/ccache/ccache - endif - endif - endif - ifneq ($(TARGET_KERNEL_CUSTOM_TOOLCHAIN),) - ifeq ($(HOST_OS),darwin) - ARM_CROSS_COMPILE:=CROSS_COMPILE="$(ccache) $(ANDROID_BUILD_TOP)/prebuilts/gcc/darwin-x86/arm/$(TARGET_KERNEL_CUSTOM_TOOLCHAIN)/bin/arm-eabi-" - else - ARM_CROSS_COMPILE:=CROSS_COMPILE="$(ccache) $(ANDROID_BUILD_TOP)/prebuilts/gcc/linux-x86/arm/$(TARGET_KERNEL_CUSTOM_TOOLCHAIN)/bin/arm-eabi-" - endif - else - ARM_CROSS_COMPILE:=CROSS_COMPILE="$(ccache) $(ARM_EABI_TOOLCHAIN)/arm-eabi-" - endif - ccache = -endif - ifeq ($(HOST_OS),darwin) - MAKE_FLAGS := C_INCLUDE_PATH=$(ANDROID_BUILD_TOP)/external/elfutils/libelf + MAKE_FLAGS += C_INCLUDE_PATH=$(ANDROID_BUILD_TOP)/external/elfutils/0.153/libelf/ endif ifeq ($(TARGET_KERNEL_MODULES),) @@ -168,16 +208,21 @@ $(KERNEL_OUT): mkdir -p $(KERNEL_MODULES_OUT) $(KERNEL_CONFIG): $(KERNEL_OUT) - $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG) - -$(KERNEL_OUT)/piggy : $(TARGET_PREBUILT_INT_KERNEL) - $(hide) gunzip -c $(KERNEL_OUT)/arch/$(TARGET_ARCH)/boot/compressed/piggy.gzip > $(KERNEL_OUT)/piggy + $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG) + $(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \ + echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \ + echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \ + $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) oldconfig; fi + $(hide) if [ ! -z "$(KERNEL_ADDITIONAL_CONFIG)" ]; then \ + echo "Using additional config '$(KERNEL_ADDITIONAL_CONFIG)'"; \ + cat $(KERNEL_SRC)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_ADDITIONAL_CONFIG) >> $(KERNEL_OUT)/.config; \ + $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) oldconfig; fi TARGET_KERNEL_BINARIES: $(KERNEL_OUT) $(KERNEL_CONFIG) $(KERNEL_HEADERS_INSTALL) - $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) $(TARGET_PREBUILT_INT_KERNEL_TYPE) - -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) dtbs - -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) modules - -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) modules_install + $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) $(TARGET_PREBUILT_INT_KERNEL_TYPE) + -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) dtbs + -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) modules + -$(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) INSTALL_MOD_PATH=../../$(KERNEL_MODULES_INSTALL) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) modules_install $(mv-modules) $(clean-module-folder) @@ -188,7 +233,32 @@ $(TARGET_PREBUILT_INT_KERNEL): $(TARGET_KERNEL_MODULES) $(clean-module-folder) $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_CONFIG) - $(MAKE) $(MAKE_FLAGS) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(TARGET_ARCH) $(ARM_CROSS_COMPILE) headers_install + $(hide) if [ ! -z "$(KERNEL_HEADER_DEFCONFIG)" ]; then \ + rm -f ../$(KERNEL_CONFIG); \ + $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_HEADER_DEFCONFIG); \ + $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) $(KERNEL_CROSS_COMPILE) headers_install; fi + $(hide) if [ "$(KERNEL_HEADER_DEFCONFIG)" != "$(KERNEL_DEFCONFIG)" ]; then \ + echo "Used a different defconfig for header generation"; \ + rm -f ../$(KERNEL_CONFIG); \ + $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) VARIANT_DEFCONFIG=$(VARIANT_DEFCONFIG) SELINUX_DEFCONFIG=$(SELINUX_DEFCONFIG) $(KERNEL_DEFCONFIG); fi + $(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \ + echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \ + echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_OUT)/.config; \ + $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) oldconfig; fi + $(hide) if [ ! -z "$(KERNEL_ADDITIONAL_CONFIG)" ]; then \ + echo "Using additional config '$(KERNEL_ADDITIONAL_CONFIG)'"; \ + cat $(KERNEL_SRC)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_ADDITIONAL_CONFIG) >> $(KERNEL_OUT)/.config; \ + $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) oldconfig; fi + +kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG) + $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) tags + +kernelconfig: $(KERNEL_OUT) $(KERNEL_CONFIG) + env KCONFIG_NOTIMESTAMP=true \ + $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) menuconfig + env KCONFIG_NOTIMESTAMP=true \ + $(MAKE) -C $(KERNEL_SRC) O=$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) savedefconfig + cp $(KERNEL_OUT)/defconfig $(KERNEL_SRC)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_DEFCONFIG) endif # FULL_KERNEL_BUILD From 857091baa17d3c55e344a523ad39b215b7784a62 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Jul 2015 12:37:16 -0700 Subject: [PATCH 825/837] "LYZ28I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 88c2eb41caf..e81f3690041 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28H +export BUILD_ID=LYZ28I From 1daf50733f6853eac22dabeabb5fe0284d1550f2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Jul 2015 15:58:38 -0700 Subject: [PATCH 826/837] LYZ28J --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e81f3690041..e4649463f4e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28I +export BUILD_ID=LYZ28J From 759f8c5b9c55710f66f9069263bd3caaf7c2b9ff Mon Sep 17 00:00:00 2001 From: Hernan Castanon Alvarez Date: Wed, 23 Sep 2015 08:15:56 -0700 Subject: [PATCH 827/837] Add msm8916 as a QCOM board platform Change-Id: Iad741afeabbec5806eb9f1f235c84555ef9fd522 --- core/qcom_utils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/qcom_utils.mk b/core/qcom_utils.mk index eac5b7c2641..e34f76b28f6 100755 --- a/core/qcom_utils.mk +++ b/core/qcom_utils.mk @@ -6,6 +6,7 @@ QCOM_BOARD_PLATFORMS += msm7x30 QCOM_BOARD_PLATFORMS += qsd8k QCOM_BOARD_PLATFORMS += msm8226 QCOM_BOARD_PLATFORMS += msm8660 +QCOM_BOARD_PLATFORMS += msm8916 QCOM_BOARD_PLATFORMS += msm8960 QCOM_BOARD_PLATFORMS += msm8974 From 0fbee7c9e3d789a14a2bda5032bcf5bf68661508 Mon Sep 17 00:00:00 2001 From: Menno van Grinsven Date: Sun, 1 Nov 2015 19:08:23 +0100 Subject: [PATCH 828/837] Add msm8992 as target platform Change-Id: I61b3c86b270bdba975f37853782f5d133f879ae6 --- core/qcom_utils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/qcom_utils.mk b/core/qcom_utils.mk index e34f76b28f6..3911a901bc5 100755 --- a/core/qcom_utils.mk +++ b/core/qcom_utils.mk @@ -9,6 +9,7 @@ QCOM_BOARD_PLATFORMS += msm8660 QCOM_BOARD_PLATFORMS += msm8916 QCOM_BOARD_PLATFORMS += msm8960 QCOM_BOARD_PLATFORMS += msm8974 +QCOM_BOARD_PLATFORMS += msm8992 MSM7K_BOARD_PLATFORMS := msm7x30 MSM7K_BOARD_PLATFORMS += msm7x27 From 62ea192cb2170ebba79bf4c90fb39b8c9fa20070 Mon Sep 17 00:00:00 2001 From: Captain Throwback Date: Sat, 27 Jun 2015 18:59:29 -0400 Subject: [PATCH 829/837] Add msm8994 to QCOM_BOARD_PLATFORMS Change-Id: Iab8ce395972c242970ed5f19b17ab1361a30a354 --- core/qcom_utils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/qcom_utils.mk b/core/qcom_utils.mk index 3911a901bc5..a73325b64be 100755 --- a/core/qcom_utils.mk +++ b/core/qcom_utils.mk @@ -10,6 +10,7 @@ QCOM_BOARD_PLATFORMS += msm8916 QCOM_BOARD_PLATFORMS += msm8960 QCOM_BOARD_PLATFORMS += msm8974 QCOM_BOARD_PLATFORMS += msm8992 +QCOM_BOARD_PLATFORMS += msm8994 MSM7K_BOARD_PLATFORMS := msm7x30 MSM7K_BOARD_PLATFORMS += msm7x27 From 0e67a4913481cd7f31f1a7302ec0280debd240e3 Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Fri, 11 Sep 2015 17:27:09 -0700 Subject: [PATCH 830/837] DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3 b/23946860 Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3 --- CleanSpec.mk | 3 +++ core/Makefile | 2 ++ core/version_defaults.mk | 17 +++++++++++++++++ tools/buildinfo.sh | 2 ++ 4 files changed, 24 insertions(+) diff --git a/CleanSpec.mk b/CleanSpec.mk index e706b9c9e5e..e9d44557677 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -314,6 +314,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) +# Added new build props +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/Makefile b/core/Makefile index 1bd9171b011..9dfbbf843d6 100644 --- a/core/Makefile +++ b/core/Makefile @@ -252,6 +252,8 @@ endif BUILD_DISPLAY_ID="$(BUILD_DISPLAY_ID)" \ BUILD_NUMBER="$(BUILD_NUMBER)" \ PLATFORM_VERSION="$(PLATFORM_VERSION)" \ + PLATFORM_SECURITY_PATCH="$(PLATFORM_SECURITY_PATCH)" \ + PLATFORM_BASE_OS="$(PLATFORM_BASE_OS)" \ PLATFORM_SDK_VERSION="$(PLATFORM_SDK_VERSION)" \ PLATFORM_VERSION_CODENAME="$(PLATFORM_VERSION_CODENAME)" \ PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index cc63286b28f..e405b6d1d7b 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -24,6 +24,7 @@ # DEFAULT_APP_TARGET_SDK # BUILD_ID # BUILD_NUMBER +# SECURITY_PATCH # # Look for an optional file containing overrides of the defaults, @@ -67,6 +68,22 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)" PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME) endif +ifeq "" "$(PLATFORM_SECURITY_PATCH)" + # Used to indicate the security patch that has been applied to the device. + # Can be an arbitrary string, but must be a single word. + # + # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. + PLATFORM_SECURITY_PATCH := 2015-11-01 +endif + +ifeq "" "$(PLATFORM_BASE_OS)" + # Used to indicate the base os applied to the device. + # Can be an arbitrary string, but must be a single word. + # + # If there is no $PLATFORM_BASE_OS set, keep it empty. + PLATFORM_BASE_OS := +endif + ifeq "" "$(DEFAULT_APP_TARGET_SDK)" # This is the default minSdkVersion and targetSdkVersion to use for # all .apks created by the build system. It can be overridden by explicitly diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index 2016e724eec..a9aa77bcada 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -10,6 +10,8 @@ echo "ro.build.version.sdk=$PLATFORM_SDK_VERSION" echo "ro.build.version.codename=$PLATFORM_VERSION_CODENAME" echo "ro.build.version.all_codenames=$PLATFORM_VERSION_ALL_CODENAMES" echo "ro.build.version.release=$PLATFORM_VERSION" +echo "ro.build.version.security_patch=$PLATFORM_SECURITY_PATCH" +echo "ro.build.version.base_os=$PLATFORM_BASE_OS" echo "ro.build.date=`date`" echo "ro.build.date.utc=`date +%s`" echo "ro.build.type=$TARGET_BUILD_TYPE" From b48a4be90c3fbbef7c8ef96675a7050d868340f9 Mon Sep 17 00:00:00 2001 From: Captain Throwback Date: Wed, 11 Nov 2015 14:17:07 -0500 Subject: [PATCH 831/837] Add msm8909 and msm8952 to QCOM_BOARD_PLATFORMS PS2: Added 8909 Change-Id: I9b539017e02a4232e76fe8d473f6df42ac167076 --- core/qcom_utils.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/qcom_utils.mk b/core/qcom_utils.mk index a73325b64be..03b3933ee37 100755 --- a/core/qcom_utils.mk +++ b/core/qcom_utils.mk @@ -6,7 +6,9 @@ QCOM_BOARD_PLATFORMS += msm7x30 QCOM_BOARD_PLATFORMS += qsd8k QCOM_BOARD_PLATFORMS += msm8226 QCOM_BOARD_PLATFORMS += msm8660 +QCOM_BOARD_PLATFORMS += msm8909 QCOM_BOARD_PLATFORMS += msm8916 +QCOM_BOARD_PLATFORMS += msm8952 QCOM_BOARD_PLATFORMS += msm8960 QCOM_BOARD_PLATFORMS += msm8974 QCOM_BOARD_PLATFORMS += msm8992 From f700a081e92ad0914ecbbfae1d76622d68080887 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Sat, 9 Jan 2016 18:26:57 +0100 Subject: [PATCH 832/837] "LYZ28K" Change-Id: I2a685cf8d79e6c85ae26c7d7a4395a56168a8395 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e4649463f4e..a37922b76cb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28J +export BUILD_ID=LYZ28K From ef3a95c592ed9ae38648f5de5ace01c33e47c273 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Sat, 9 Jan 2016 18:29:03 +0100 Subject: [PATCH 833/837] LYZ28L Change-Id: Ic7ab7d763a44e96f0499be3f1cf18a0ce294cecb --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a37922b76cb..54575f26941 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28K +export BUILD_ID=LYZ28L From 0a63ba5b4d33e4c9628fda210f9fd89036759dd8 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Sat, 9 Jan 2016 18:30:13 +0100 Subject: [PATCH 834/837] "LYZ28M" Change-Id: I6b10c34099bae73fc09f9a1147c57be77fcb058e --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 54575f26941..74ff889a512 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28L +export BUILD_ID=LYZ28M From ac04f3505a590c8878f44f9d721044ab2ab75d8b Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Sat, 9 Jan 2016 18:30:53 +0100 Subject: [PATCH 835/837] "LYZ28N" Change-Id: I3554cdc6a792a1deab068c61e5a84c2e094bcccc --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 74ff889a512..62bf93dae60 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=LYZ28M +export BUILD_ID=LYZ28N From ce836d8286c24ef8d5fa867f3f6b50a3b8849047 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Tue, 8 Sep 2015 10:57:18 -0500 Subject: [PATCH 836/837] build: Separate commands in recovery foreach loops The foreach loops output a space separated list, not necessarily one command per line. Separate commands with semicolons. Notably, this fixes an issue with multiple device directories included in TARGET_RECOVERY_DEVICE_DIRS. Change-Id: I5ebdc84ecaaacabaea77b8b752141e2041622480 --- core/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index 9dfbbf843d6..753727e27a2 100644 --- a/core/Makefile +++ b/core/Makefile @@ -927,11 +927,11 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ $(hide) cp -rf $(recovery_resources_common)/* $(TARGET_RECOVERY_ROOT_OUT)/res $(hide) cp -f $(recovery_font) $(TARGET_RECOVERY_ROOT_OUT)/res/images/font.png $(hide) $(foreach item,$(recovery_root_private), \ - cp -rf $(item) $(TARGET_RECOVERY_OUT)/) + cp -rf $(item) $(TARGET_RECOVERY_OUT)/;) $(hide) $(foreach item,$(recovery_resources_private), \ - cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/) + cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/;) $(hide) $(foreach item,$(recovery_fstab), \ - cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab) + cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab;) $(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys $(hide) cat $(INSTALLED_DEFAULT_PROP_TARGET) $(recovery_build_prop) \ > $(TARGET_RECOVERY_ROOT_OUT)/default.prop From 46a2a7e00ea779439d35ad8f6d2b9885c8b58b2c Mon Sep 17 00:00:00 2001 From: Alistair Strachan Date: Thu, 5 May 2016 16:29:08 -0700 Subject: [PATCH 837/837] Avoid accidentally using the host's native 'as' command. When invoking clang for the host to assemble .S files, the -B flag would not be provided, which allowed the host prebuilt clang to use an 'as' from the native environment. Most of the time this "just works", but some newer 'as' versions cause problems with the older prebuilt toolchain, for example by generating unsupported relocation types. To avoid this problem, simply use the -B flag to tell clang to invoke the assembler from the correct prebuilt gcc prefix. Change-Id: I18ea4f37ae637b652cfd7321c41929f8be075342 Signed-off-by: Alistair Strachan --- core/clang/HOST_x86_common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/clang/HOST_x86_common.mk b/core/clang/HOST_x86_common.mk index 0241cb6636a..77547b79c69 100644 --- a/core/clang/HOST_x86_common.mk +++ b/core/clang/HOST_x86_common.mk @@ -8,6 +8,7 @@ ifeq ($(HOST_OS),linux) CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \ --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \ --sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \ + -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \ -no-integrated-as CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \