From 49537b071fde734f5ec01b3736942d058e1bd928 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Feb 2016 12:28:52 -0800 Subject: "MOB29W" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e57fdb2..e748a8d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MMB29V +export BUILD_ID=MOB29W -- cgit v1.1 From c322528db32e50d7605cfaeae22e74a1c6a29a37 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Feb 2016 13:21:39 -0800 Subject: "MOB29X" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e748a8d..057846e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB29W +export BUILD_ID=MOB29X -- cgit v1.1 From 5994b1142aede11502a55d553d687d9635a886a0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Feb 2016 19:56:31 -0800 Subject: MOB29Y --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 057846e..8048d9e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB29X +export BUILD_ID=MOB29Y -- cgit v1.1 From f103e81bba74436aa4e1d8beb6e224928f02f796 Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Fri, 19 Feb 2016 13:50:29 -0800 Subject: Updating security string patch to 2016-04-01 b/27272697 Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index be5833d..8cc6900 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-03-01 + PLATFORM_SECURITY_PATCH := 2016-04-01 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 0a9c18bf6371aee147dd7e519e972c67c93960d3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Feb 2016 16:56:25 -0800 Subject: "MOB29Z" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8048d9e..ec118e6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB29Y +export BUILD_ID=MOB29Z -- cgit v1.1 From 5228b927c0e8c14ed99ecee8529e05c94417e8f0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 1 Mar 2016 09:41:39 -0800 Subject: "MHC19K" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c2f0b28..179abc4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MHC19J +export BUILD_ID=MHC19K -- cgit v1.1 From 7e848b35d6926db0dbb12fbc91f7801362054969 Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Fri, 19 Feb 2016 13:50:29 -0800 Subject: Updating security string patch to 2016-04-01 b/27272697 Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index be5833d..8cc6900 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-03-01 + PLATFORM_SECURITY_PATCH := 2016-04-01 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 1b865fa1f4da77e2d21d7786e4eb71b1194ffff3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 1 Mar 2016 15:27:11 -0800 Subject: "MHC19L" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 179abc4..865056d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MHC19K +export BUILD_ID=MHC19L -- cgit v1.1 From 5250d69c46f459ed00787d70fa08eb903c2d9530 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 1 Mar 2016 19:15:31 -0800 Subject: MOB30B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ec118e6..c690778 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB29Z +export BUILD_ID=MOB30B -- cgit v1.1 From 70593a0ca8aa6ab48d7fa4f3e6711332596a5cf1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 2 Mar 2016 16:41:15 -0800 Subject: "MHC19M" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 865056d..058b210 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MHC19L +export BUILD_ID=MHC19M -- cgit v1.1 From 3300537abfe6d3fbcfa565c15007986e4f1a6a65 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 8 Mar 2016 19:44:51 -0800 Subject: "MHC19N" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 058b210..20b88f6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MHC19M +export BUILD_ID=MHC19N -- cgit v1.1 From 13678cf2674202ad27216098a6a529a735038965 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 16 Mar 2016 19:47:23 -0700 Subject: MOB30C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c690778..a28103c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30B +export BUILD_ID=MOB30C -- cgit v1.1 From de753e125f6d7e01663cc16378c1859eba043c10 Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Thu, 17 Mar 2016 17:04:32 -0700 Subject: Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 b/27724091 Change-Id: If448a426d78388208e15254ef30b42873a729647 --- core/version_defaults.mk | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index be5833d..bcdc2c8 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -68,21 +68,20 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)" PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME) endif -ifeq "REL" "$(PLATFORM_VERSION_CODENAME)" - PLATFORM_PREVIEW_SDK_VERSION := 0 -else - ifeq "" "$(PLATFORM_PREVIEW_SDK_VERSION)" - # This is the definition of a preview SDK version over and above the current - # platform SDK version. Unlike the platform SDK version, a higher value - # for preview SDK version does NOT mean that all prior preview APIs are - # included. Packages reading this value to determine compatibility with - # known APIs should check that this value is precisely equal to the preview - # SDK version the package was built for, otherwise it should fall back to - # assuming the device can only support APIs as of the previous official - # public release. - # This value will always be 0 for release builds. - PLATFORM_PREVIEW_SDK_VERSION := 0 - 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 := 2016-03-18 +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)" -- cgit v1.1 From 31fe037275d3fb8097a00cc3337247aa0ca2fa40 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 17 Mar 2016 18:50:56 -0700 Subject: MHC19O --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index c2f0b28..a6a2087 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MHC19J +export BUILD_ID=MHC19O -- cgit v1.1 From 532238f7497cac5e174094e68dd71cc5fe9f8451 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Mar 2016 15:48:00 -0700 Subject: "MHC82" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 058b210..61f5609 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MHC19M +export BUILD_ID=MHC82 -- cgit v1.1 From 42d5725319ba9e30d9f938d2c3b230ad33e04151 Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Thu, 17 Mar 2016 17:11:47 -0700 Subject: Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 b/27724967 Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f Fix merge conflict to mnc-mr2-release w/ security string change to 2016-04-02 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 8cc6900..40ddfa0 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-04-01 + PLATFORM_SECURITY_PATCH := 2016-04-02 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 25b7ce3eaa4a9703e5dffdda848c18b82079d87c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Mar 2016 16:00:09 -0700 Subject: MOB30D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a28103c..28fdc2b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30C +export BUILD_ID=MOB30D -- cgit v1.1 From 9833719c0787e1a2e982b1db2dab17e298aa0062 Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Thu, 17 Mar 2016 17:11:47 -0700 Subject: Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 b/27724967 Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f --- core/version_defaults.mk | 49 ++++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 8cc6900..452d788 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -42,7 +42,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 6.0.1 + PLATFORM_VERSION := 5.1.1 endif ifeq "" "$(PLATFORM_SDK_VERSION)" @@ -54,7 +54,7 @@ ifeq "" "$(PLATFORM_SDK_VERSION)" # intermediate builds). During development, this number remains at the # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds # the code-name of the new development work. - PLATFORM_SDK_VERSION := 23 + PLATFORM_SDK_VERSION := 22 endif ifeq "" "$(PLATFORM_VERSION_CODENAME)" @@ -68,42 +68,12 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)" PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME) endif -ifeq "REL" "$(PLATFORM_VERSION_CODENAME)" - PLATFORM_PREVIEW_SDK_VERSION := 0 -else - ifeq "" "$(PLATFORM_PREVIEW_SDK_VERSION)" - # This is the definition of a preview SDK version over and above the current - # platform SDK version. Unlike the platform SDK version, a higher value - # for preview SDK version does NOT mean that all prior preview APIs are - # included. Packages reading this value to determine compatibility with - # known APIs should check that this value is precisely equal to the preview - # SDK version the package was built for, otherwise it should fall back to - # assuming the device can only support APIs as of the previous official - # public release. - # This value will always be 0 for release builds. - PLATFORM_PREVIEW_SDK_VERSION := 0 - endif -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 - # setting these in the .apk's AndroidManifest.xml. It is either the code - # name of the development build or, if this is a release build, the official - # SDK version of this release. - ifeq "REL" "$(PLATFORM_VERSION_CODENAME)" - DEFAULT_APP_TARGET_SDK := $(PLATFORM_SDK_VERSION) - else - DEFAULT_APP_TARGET_SDK := $(PLATFORM_VERSION_CODENAME) - endif -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 := 2016-04-01 + PLATFORM_SECURITY_PATCH := 2016-04-02 endif ifeq "" "$(PLATFORM_BASE_OS)" @@ -114,6 +84,19 @@ ifeq "" "$(PLATFORM_BASE_OS)" 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 + # setting these in the .apk's AndroidManifest.xml. It is either the code + # name of the development build or, if this is a release build, the official + # SDK version of this release. + ifeq "REL" "$(PLATFORM_VERSION_CODENAME)" + DEFAULT_APP_TARGET_SDK := $(PLATFORM_SDK_VERSION) + else + DEFAULT_APP_TARGET_SDK := $(PLATFORM_VERSION_CODENAME) + endif +endif + ifeq "" "$(BUILD_ID)" # Used to signify special builds. E.g., branches and/or releases, # like "M5-RC7". Can be an arbitrary string, but must be a single -- cgit v1.1 From e76159e0e64bc423bceaf450cb4996ad6f88814e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Mar 2016 16:27:49 -0700 Subject: MHC19P --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 61f5609..4e6dc23 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MHC82 +export BUILD_ID=MHC19P -- cgit v1.1 From 01cad60d6953e052e881763bd6a98f24ca6ad43a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Mar 2016 20:01:26 -0700 Subject: Per Zach Jang: bump PLATFORM_SECURITY_PATCH date. --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 8cc6900..40ddfa0 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-04-01 + PLATFORM_SECURITY_PATCH := 2016-04-02 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 225291834f51370f9b5df185f0590c871ebe6b20 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Mar 2016 20:02:10 -0700 Subject: "MHC19Q" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 058b210..e54fb9f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MHC19M +export BUILD_ID=MHC19Q -- cgit v1.1 From c8641b4f7847c38f0e6622a420a06c590f498d1d Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Mon, 21 Mar 2016 17:42:55 -0700 Subject: Update Security String to 2016-05-01 in preparation for May 2016 Security OTA b/27724973 Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 40ddfa0..721e5b4 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-04-02 + PLATFORM_SECURITY_PATCH := 2016-05-01 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 85ff546a9e70a8da43fe0a207cac87bf37def2f2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 25 Mar 2016 17:48:21 -0700 Subject: "MOB30E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 28fdc2b..5d9fcf9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30D +export BUILD_ID=MOB30E -- cgit v1.1 From 3ef1982aebebd9ee7c57033f75d8e00bfe855e7d Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Sat, 26 Mar 2016 02:56:10 +0000 Subject: Revert "binary: Generate dummy rule for relocated protobuf headers" This reverts commit ba297413c51feab9fa43be5af56e12b79891f5fb. The dummy rule creates an empty file. Instead of relying on header dependency resolution, copy all protobuf output when the source is generated in replacement of separate source/header steps. Change-Id: I358459be7c812afea5be56e14dc74ea11abb3502 --- core/binary.mk | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/core/binary.mk b/core/binary.mk index e25fb31..77612ad 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -542,9 +542,10 @@ define copy-proto-files $(if $(PRIVATE_PROTOC_OUTPUT), \ $(if $(call streq,$(PRIVATE_PROTOC_INPUT),$(PRIVATE_PROTOC_OUTPUT)),, \ $(eval proto_generated_path := $(dir $(subst $(PRIVATE_PROTOC_INPUT),$(PRIVATE_PROTOC_OUTPUT),$@))) + $(eval proto_target_files := $(patsubst %.pb$(PRIVATE_PROTOC_SUFFIX), %.pb.*, $@)) @mkdir -p $(dir $(proto_generated_path)) - @echo "Protobuf relocation: $@ => $(proto_generated_path)" - @cp -f $@ $(proto_generated_path) ),) + @echo "Protobuf relocation: $(proto_target_files) => $(proto_generated_path)" + @cp -f $(proto_target_files) $(proto_generated_path) ),) endef @@ -554,28 +555,15 @@ $(proto_generated_sources): PRIVATE_PROTO_INCLUDES := $(TOP) $(proto_generated_sources): PRIVATE_PROTOC_FLAGS := $(LOCAL_PROTOC_FLAGS) $(my_protoc_flags) $(proto_generated_sources): PRIVATE_PROTOC_OUTPUT := $(LOCAL_PROTOC_OUTPUT) $(proto_generated_sources): PRIVATE_PROTOC_INPUT := $(LOCAL_PATH) +$(proto_generated_sources): PRIVATE_PROTOC_SUFFIX := $(my_proto_source_suffix) $(proto_generated_sources): $(proto_generated_sources_dir)/%.pb$(my_proto_source_suffix): %.proto $(PROTOC) $(transform-proto-to-cc) $(copy-proto-files) # This is just a dummy rule to make sure gmake doesn't skip updating the dependents. -$(proto_generated_headers): PRIVATE_PROTOC_OUTPUT := $(LOCAL_PROTOC_OUTPUT) -$(proto_generated_headers): PRIVATE_PROTOC_INPUT := $(LOCAL_PATH) $(proto_generated_headers): $(proto_generated_sources_dir)/%.pb.h: $(proto_generated_sources_dir)/%.pb$(my_proto_source_suffix) @echo "Updated header file $@." $(hide) touch $@ - $(copy-proto-files) - -$(if $(LOCAL_PROTOC_OUTPUT), \ -$(if $(call streq,$(LOCAL_PROTOC_OUTPUT),$(LOCAL_PATH)),, \ - $(eval proto_relocated_headers := $(subst $(LOCAL_PATH),$(LOCAL_PROTOC_OUTPUT),$(proto_generated_headers))) \ - ), ) - -ifdef proto_relocated_headers -$(proto_relocated_headers): $(proto_generated_headers) - echo "Refreshed header file $@." - $(hide) touch $@ -endif $(my_prefix)_$(LOCAL_MODULE_CLASS)_$(LOCAL_MODULE)_proto_defined := true endif # transform-proto-to-cc rule included only once -- cgit v1.1 From 7feafe7ab6c07cfd18a0a16c4e8783da7af19cfa Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 28 Mar 2016 18:12:02 -0700 Subject: "MOB30F" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 5d9fcf9..d212d32 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30E +export BUILD_ID=MOB30F -- cgit v1.1 From 46d1699b45e53e023a78ef95282002cdf7695017 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 29 Mar 2016 15:59:28 -0700 Subject: "MOB30G" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d212d32..504d794 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30F +export BUILD_ID=MOB30G -- cgit v1.1 From bc9ae3d5c21915c165b2b2cb41d07e1573814254 Mon Sep 17 00:00:00 2001 From: Dark Eyes Date: Tue, 8 Mar 2016 22:05:10 -0500 Subject: envsetup: Always look up JAVA_HOME path Change-Id: I8b0641eb107cd095079bb17f92e99730f532fda7 --- envsetup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envsetup.sh b/envsetup.sh index 446947f..00dfbf1 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -2404,7 +2404,7 @@ function set_java_home() { export JAVA_HOME=$(/usr/libexec/java_home -v 1.7) ;; *) - export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 + export JAVA_HOME=$(dirname $(dirname $(dirname $(readlink -f $(which java))))) ;; esac -- cgit v1.1 From 85fe6388fec3c57726e84724d565ce793990f4bc Mon Sep 17 00:00:00 2001 From: Abhishek G Date: Mon, 4 Apr 2016 17:03:24 -0700 Subject: Preventing default locale from being overridden because of buildinfo.sh Adding the ability to set default locale from the device tree. Adding the TARGET_SKIP_DEFAULT_LOCALE flag which can be set in the device tree, thus preventing buildinfo.sh from overriding default locale. Change-Id: I66bcedb42216acee56ceaf657a39dc23d7eea6f4 Issue-Id: FEIJ-22 --- core/Makefile | 1 + core/product.mk | 3 +++ tools/buildinfo.sh | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 583e79d..5177476 100644 --- a/core/Makefile +++ b/core/Makefile @@ -248,6 +248,7 @@ endif TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \ TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \ TARGET_UNIFIED_DEVICE="$(TARGET_UNIFIED_DEVICE)" \ + TARGET_SKIP_DEFAULT_LOCALE="$(TARGET_SKIP_DEFAULT_LOCALE)" \ $(PRODUCT_BUILD_PROP_OVERRIDES) \ bash $(BUILDINFO_SH) >> $@ $(hide) $(foreach file,$(system_prop_file), \ diff --git a/core/product.mk b/core/product.mk index 427fd83..b9cb556 100644 --- a/core/product.mk +++ b/core/product.mk @@ -327,6 +327,9 @@ _product_stash_var_list += \ GLOBAL_CFLAGS_NO_OVERRIDE \ GLOBAL_CPPFLAGS_NO_OVERRIDE \ +_product_stash_var_list += \ + TARGET_SKIP_DEFAULT_LOCALE \ + # # Stash values of the variables in _product_stash_var_list. # $(1): Renamed prefix diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index 559cd88..c621859 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -37,7 +37,7 @@ echo "ro.product.cpu.abilist32=$TARGET_CPU_ABI_LIST_32_BIT" echo "ro.product.cpu.abilist64=$TARGET_CPU_ABI_LIST_64_BIT" echo "ro.product.manufacturer=$PRODUCT_MANUFACTURER" -if [ -n "$PRODUCT_DEFAULT_LOCALE" ] ; then +if [ -n "$PRODUCT_DEFAULT_LOCALE" ] && [ -z "$TARGET_SKIP_DEFAULT_LOCALE" ] ; then echo "ro.product.locale=$PRODUCT_DEFAULT_LOCALE" fi echo "ro.wifi.channels=$PRODUCT_DEFAULT_WIFI_CHANNELS" -- cgit v1.1 From f994a23561991d5b315d1fed08553b58af29330f Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Mon, 28 Mar 2016 15:29:28 -0700 Subject: qcom: Allow usage of default QC HAL paths Change-Id: Icbeaa995047289b5e10cdebf805f8bd8cb7978b1 --- core/qcom_target.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/core/qcom_target.mk b/core/qcom_target.mk index 092d832..e38378d 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -69,6 +69,21 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) endif endif +# HACK: check to see if build uses standard QC HAL paths by checking for CM path structure +AOSP_VARIANT_MAKEFILE := $(wildcard hardware/qcom/audio/default/Android.mk) +ifeq ("$(AOSP_VARIANT_MAKEFILE)","") +$(call project-set-path,qcom-audio,hardware/qcom/audio) +$(call project-set-path,qcom-display,hardware/qcom/display) +$(call project-set-path,qcom-media,hardware/qcom/media) +$(call set-device-specific-path,CAMERA,camera,hardware/qcom/camera) +$(call set-device-specific-path,GPS,gps,hardware/qcom/gps) +$(call set-device-specific-path,SENSORS,sensors,hardware/qcom/sensors) +$(call set-device-specific-path,LOC_API,loc-api,vendor/qcom/opensource/location) +$(call set-device-specific-path,DATASERVICES,dataservices,vendor/qcom/opensource/dataservices) +$(call project-set-path,ril,hardware/ril) +$(call project-set-path,wlan,hardware/qcom/wlan) +$(call project-set-path,bt,hardware/qcom/bt) +else $(call project-set-path,qcom-audio,hardware/qcom/audio-caf/$(QCOM_HARDWARE_VARIANT)) ifeq ($(SONY_BF64_KERNEL_VARIANT),true) @@ -88,6 +103,7 @@ $(call set-device-specific-path,DATASERVICES,dataservices,vendor/qcom/opensource $(call ril-set-path-variant,ril) $(call wlan-set-path-variant,wlan-caf) $(call bt-vendor-set-path-variant,bt-caf) +endif # AOSP_VARIANT_MAKEFILE else -- cgit v1.1 From 375268cd4fc9af9c3ab0a24870c3a912cb9edd76 Mon Sep 17 00:00:00 2001 From: Khalid Zubair Date: Wed, 2 Mar 2016 13:57:01 -0800 Subject: build: add cmts config to global build Change-Id: I554840be954545ab7637c9e5a6fcc7cb5a5da7c1 --- core/main.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/main.mk b/core/main.mk index 8fabea6..4894fc2 100644 --- a/core/main.mk +++ b/core/main.mk @@ -96,6 +96,9 @@ include $(BUILD_SYSTEM)/config.mk # CTS-specific config. -include cts/build/config.mk +# CMTS-specific config. +-include vendor/cmts/build/config.mk + # This allows us to force a clean build - included after the config.mk # environment setup is done, but before we generate any dependencies. This # file does the rm -rf inline so the deps which are all done below will -- cgit v1.1 From e7ac98d6826afe6dad141beef85311b36040705f Mon Sep 17 00:00:00 2001 From: Diogo Ferreira Date: Wed, 16 Mar 2016 19:04:48 +0000 Subject: build: Add MTK support When setting BOARD_USES_MTK_HARDWARE, a global MTK_HARDWARE define will be available to all target modules. Change-Id: Id2a2996139a31afb6eb37f7ee24202587cb4beb1 --- core/config.mk | 3 +++ core/mtk_target.mk | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 core/mtk_target.mk diff --git a/core/config.mk b/core/config.mk index 9344958..4fd5bda 100644 --- a/core/config.mk +++ b/core/config.mk @@ -566,6 +566,9 @@ endif # Rules for QCOM targets include $(BUILD_SYSTEM)/qcom_target.mk +# Rules for MTK targets +include $(BUILD_SYSTEM)/mtk_target.mk + # ############################################################### # Set up final options. # ############################################################### diff --git a/core/mtk_target.mk b/core/mtk_target.mk new file mode 100644 index 0000000..7c3ba1f --- /dev/null +++ b/core/mtk_target.mk @@ -0,0 +1,13 @@ +ifeq ($(BOARD_USES_MTK_HARDWARE),true) + mtk_flags := -DMTK_HARDWARE + + TARGET_GLOBAL_CFLAGS += $(mtk_flags) + TARGET_GLOBAL_CPPFLAGS += $(mtk_flags) + CLANG_TARGET_GLOBAL_CFLAGS += $(mtk_flags) + CLANG_TARGET_GLOBAL_CPPFLAGS += $(mtk_flags) + + 2ND_TARGET_GLOBAL_CFLAGS += $(mtk_flags) + 2ND_TARGET_GLOBAL_CPPFLAGS += $(mtk_flags) + 2ND_CLANG_TARGET_GLOBAL_CFLAGS += $(mtk_flags) + 2ND_CLANG_TARGET_GLOBAL_CPPFLAGS += $(mtk_flags) +endif -- cgit v1.1 From 571de13b115482fd6cfb4e298813f21873b2edaa Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 Apr 2016 10:35:01 -0700 Subject: "MOB30H" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 504d794..17fb16b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30G +export BUILD_ID=MOB30H -- cgit v1.1 From de6dc955103591ae11ea746c3fc82764ef073d5e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 Apr 2016 17:36:00 -0700 Subject: "MOB30I" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 17fb16b..d6f09d4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30H +export BUILD_ID=MOB30I -- cgit v1.1 From f31558c416b9fb7a4b1e555aab0c12863d5e9814 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Tue, 12 Apr 2016 17:03:29 -0700 Subject: build: Use compatibility DTB directory path for custom DTB tool builds * dtbToolCM is able to search subdirectories, but we are not guaranteed that other dtbTool binaries have the same capability. Re-specify multiple paths for non-dtbToolCM builds just in case. Change-Id: Id69e000af5eba60a07662b178cb95950451efd17 --- core/tasks/dt_image.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/tasks/dt_image.mk b/core/tasks/dt_image.mk index ca7e87f..a1e8ee7 100644 --- a/core/tasks/dt_image.mk +++ b/core/tasks/dt_image.mk @@ -18,8 +18,13 @@ DTBTOOL := $(HOST_OUT_EXECUTABLES)/$(DTBTOOL_NAME)$(HOST_EXECUTABLE_SUFFIX) INSTALLED_DTIMAGE_TARGET := $(PRODUCT_OUT)/dt.img -# Most specific paths must come first in possible_dtb_dirs +ifeq ($(strip $(TARGET_CUSTOM_DTBTOOL)),) +# dtbToolCM will search subdirectories possible_dtb_dirs = $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/ +else +# Most specific paths must come first in possible_dtb_dirs +possible_dtb_dirs = $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts/ $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/ +endif dtb_dir = $(firstword $(wildcard $(possible_dtb_dirs))) define build-dtimage-target -- cgit v1.1 From 4bbce4fdc6186d3dd6986daff4fc5ce6dc918421 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Wed, 13 Apr 2016 17:49:36 -0700 Subject: build: Add BOOTIMAGE_EXTRA_DEPS for BOOT_SIGNER products too * Products supporting BOOT_SIGNER should depend on BOOTIMAGE_EXTRA_DEPS as well, since that dt.img generation is tied to that rule. Change-Id: I7c3040d0c59c66aaac46121d6ca50ab96bdf7e72 --- core/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 5177476..4d91425 100644 --- a/core/Makefile +++ b/core/Makefile @@ -544,7 +544,7 @@ ifeq ($(TARGET_BOOTIMAGE_USE_EXT2),true) $(error TARGET_BOOTIMAGE_USE_EXT2 is not supported anymore) else ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_BOOT_SIGNER)) # TARGET_BOOTIMAGE_USE_EXT2 != true -$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_SIGNER) +$(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(BOOT_SIGNER) $(BOOTIMAGE_EXTRA_DEPS) $(call pretty,"Target boot image: $@") $(hide) $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@ $(BOOT_SIGNER) /boot $@ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).pk8 $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_VERITY_SIGNING_KEY).x509.pem $@ -- cgit v1.1 From c9c78dbd214d3ca9e79788c3406a40cb80638dcb Mon Sep 17 00:00:00 2001 From: Diogo Ferreira Date: Fri, 4 Sep 2015 11:59:13 +0100 Subject: build: Create a oem image when BOARD_OEMIMAGE_FILE_SYSTEM_TYPE is defined This adds the capability of generating a OEM image with the build and adding it to target files when BOARD_OEMIMAGE_FILE_SYSTEM_TYPE is set. Change-Id: I6c596d58d9d5ece1a261d953eeb8c60eac30e642 Ticket: CYNGNOS-936 (cherry picked from commit 1966a9e7c22b95eb4c16be6aee7adf43cb6ce118) --- core/Makefile | 7 ++++++ core/tasks/oem_image.mk | 11 ++++++++- tools/releasetools/add_img_to_target_files.py | 33 +++++++++++++++++++++++++++ tools/releasetools/img_from_target_files.py | 6 +++++ 4 files changed, 56 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 4d91425..1146f13 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1650,6 +1650,7 @@ endif # Depending on the various images guarantees that the underlying # directories are up-to-date. +include $(BUILD_SYSTEM)/tasks/oem_image.mk $(BUILT_TARGET_FILES_PACKAGE): \ $(INSTALLED_BOOTIMAGE_TARGET) \ $(INSTALLED_RADIOIMAGE_TARGET) \ @@ -1658,6 +1659,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ $(INSTALLED_USERDATAIMAGE_TARGET) \ $(INSTALLED_CACHEIMAGE_TARGET) \ $(INSTALLED_VENDORIMAGE_TARGET) \ + $(INSTALLED_OEMIMAGE_TARGET) \ $(INSTALLED_ANDROID_INFO_TXT_TARGET) \ $(SELINUX_FC) \ $(built_ota_tools) \ @@ -1767,6 +1769,11 @@ ifdef BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE $(hide) $(call package_files-copy-root, \ $(TARGET_OUT_VENDOR),$(zip_root)/VENDOR) endif +ifdef BOARD_OEMIMAGE_FILE_SYSTEM_TYPE + @# Contents of the oem image + $(call package_files-copy-root, \ + $(TARGET_OUT_OEM),$(zip_root)/OEM) +endif @# Extra contents of the OTA package $(hide) mkdir -p $(zip_root)/OTA/bin $(hide) $(ACP) $(INSTALLED_ANDROID_INFO_TXT_TARGET) $(zip_root)/OTA/ diff --git a/core/tasks/oem_image.mk b/core/tasks/oem_image.mk index 32d56a7..8a06670 100644 --- a/core/tasks/oem_image.mk +++ b/core/tasks/oem_image.mk @@ -15,7 +15,16 @@ # # We build oem.img only if it's asked for. +skip_oem_image := true ifneq ($(filter $(MAKECMDGOALS),oem_image),) + skip_oem_image := false +endif + +ifneq ($(BOARD_OEMIMAGE_FILE_SYSTEM_TYPE),) + skip_oem_image := false +endif + +ifneq ($(skip_oem_image),true) ifndef BOARD_OEMIMAGE_PARTITION_SIZE $(error BOARD_OEMIMAGE_PARTITION_SIZE is not set.) endif @@ -43,4 +52,4 @@ $(INSTALLED_OEMIMAGE_TARGET) : $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_OEMIMAGE_F oem_image : $(INSTALLED_OEMIMAGE_TARGET) $(call dist-for-goals, oem_image, $(INSTALLED_OEMIMAGE_TARGET)) -endif # oem_image in $(MAKECMDGOALS) +endif diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py index b132963..b699135 100755 --- a/tools/releasetools/add_img_to_target_files.py +++ b/tools/releasetools/add_img_to_target_files.py @@ -100,6 +100,29 @@ def BuildVendor(input_dir, info_dict, block_list=None): file containing it.""" return CreateImage(input_dir, info_dict, "vendor", block_list=block_list) +def AddOem(output_zip, prefix="IMAGES/"): + """Turn the contents of OEM into a oem image and store in it + output_zip.""" + + prebuilt_path = os.path.join(OPTIONS.input_tmp, prefix, "oem.img") + if os.path.exists(prebuilt_path): + print("oem.img already exists in %s, no need to rebuild..." % prefix) + return + + block_list = common.MakeTempFile(prefix="oem-blocklist-", suffix=".map") + imgname = BuildOem(OPTIONS.input_tmp, OPTIONS.info_dict, + block_list=block_list) + with open(imgname, "rb") as f: + common.ZipWriteStr(output_zip, prefix + "oem.img", f.read()) + with open(block_list, "rb") as f: + common.ZipWriteStr(output_zip, prefix + "oem.map", f.read()) + + +def BuildOem(input_dir, info_dict, block_list=None): + """Build the (sparse) oem image and return the name of a temp + file containing it.""" + return CreateImage(input_dir, info_dict, "oem", block_list=block_list) + def CreateImage(input_dir, info_dict, what, block_list=None): print("creating " + what + ".img...") @@ -314,6 +337,12 @@ def AddImagesToTargetFiles(filename): except KeyError: has_vendor = False + try: + input_zip.getinfo("OEM/") + has_oem = True + except KeyError: + has_oem = False + OPTIONS.info_dict = common.LoadInfoDict(input_zip) if "selinux_fc" in OPTIONS.info_dict: OPTIONS.info_dict["selinux_fc"] = os.path.join( @@ -365,6 +394,10 @@ def AddImagesToTargetFiles(filename): AddUserdataExtra(output_zip) banner("cache") AddCache(output_zip) + if has_oem: + banner("oem") + AddOem(output_zip) + common.ZipClose(output_zip) diff --git a/tools/releasetools/img_from_target_files.py b/tools/releasetools/img_from_target_files.py index d486a7a..e9f9af6 100755 --- a/tools/releasetools/img_from_target_files.py +++ b/tools/releasetools/img_from_target_files.py @@ -165,6 +165,12 @@ def main(argv): add_img_to_target_files.AddUserdataExtra(output_zip, prefix="") banner("AddCache") add_img_to_target_files.AddCache(output_zip, prefix="") + try: + input_zip.getinfo("OEM/") + banner("AddOem") + add_img_to_target_files.AddOem(output_zip, prefix="") + except KeyError: + pass # no oem partition for this device finally: print("cleaning up...") -- cgit v1.1 From 06a72275fb859eaffd879c22f86b87a0e3f36e87 Mon Sep 17 00:00:00 2001 From: Edward Wang Date: Fri, 15 Apr 2016 23:03:14 -0700 Subject: build: skip 'ro.product.device' using new macro "TARGET_SKIP_PRODUCT_DEVICE" Change-Id: Id17ef7de8b0146dd6e4b2cc3cc5b88453da38f6c Ticket: FEIJ-62 --- core/Makefile | 1 + core/product.mk | 1 + tools/buildinfo.sh | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 1146f13..3ac9b0d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -249,6 +249,7 @@ endif TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \ TARGET_UNIFIED_DEVICE="$(TARGET_UNIFIED_DEVICE)" \ TARGET_SKIP_DEFAULT_LOCALE="$(TARGET_SKIP_DEFAULT_LOCALE)" \ + TARGET_SKIP_PRODUCT_DEVICE="$(TARGET_SKIP_PRODUCT_DEVICE)" \ $(PRODUCT_BUILD_PROP_OVERRIDES) \ bash $(BUILDINFO_SH) >> $@ $(hide) $(foreach file,$(system_prop_file), \ diff --git a/core/product.mk b/core/product.mk index b9cb556..cced554 100644 --- a/core/product.mk +++ b/core/product.mk @@ -329,6 +329,7 @@ _product_stash_var_list += \ _product_stash_var_list += \ TARGET_SKIP_DEFAULT_LOCALE \ + TARGET_SKIP_PRODUCT_DEVICE \ # # Stash values of the variables in _product_stash_var_list. diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index c621859..fa717b7 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -46,7 +46,9 @@ echo "ro.board.platform=$TARGET_BOARD_PLATFORM" 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" + if [ -z "$TARGET_SKIP_PRODUCT_DEVICE" ] ; then + echo "ro.product.model=$PRODUCT_MODEL" + fi echo "ro.product.device=$TARGET_DEVICE" echo "# Do not try to parse description, fingerprint, or thumbprint" echo "ro.build.description=$PRIVATE_BUILD_DESC" -- cgit v1.1 From 5f59260b19817e8fc54f00c3829ba432d887da92 Mon Sep 17 00:00:00 2001 From: "Brint E. Kriebel" Date: Sun, 22 Feb 2015 23:23:13 -0800 Subject: releasetools: Add bootable image signing Set PRODUCT_PRIVATE_KEY to the path of the boot image signing certificate to sign an image for secure boot. Ticket: RM-233 Change-Id: I2c767c6f9c3740bed3d7094d2d0b50a075e08abc --- tools/releasetools/common.py | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 26cc674..efdab16 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -338,6 +338,7 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): ramdisk_img = tempfile.NamedTemporaryFile() img = tempfile.NamedTemporaryFile() + bootimg_key = os.getenv("PRODUCT_PRIVATE_KEY", None) if os.access(fs_config_file, os.F_OK): cmd = ["mkbootfs", "-f", fs_config_file, os.path.join(sourcedir, "RAMDISK")] @@ -404,8 +405,9 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): fn = os.path.join(sourcedir, "pagesize") if os.access(fn, os.F_OK): + kernel_pagesize=open(fn).read().rstrip("\n") cmd.append("--pagesize") - cmd.append(open(fn).read().rstrip("\n")) + cmd.append(kernel_pagesize) args = info_dict.get("mkbootimg_args", None) if args and args.strip(): @@ -425,6 +427,42 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): assert p.returncode == 0, "mkbootimg of %s image failed" % ( os.path.basename(sourcedir),) + if bootimg_key and os.path.exists(bootimg_key) and kernel_pagesize > 0: + print "Signing bootable image..." + bootimg_key_passwords = {} + bootimg_key_passwords.update(PasswordManager().GetPasswords(bootimg_key.split())) + bootimg_key_password = bootimg_key_passwords[bootimg_key] + if bootimg_key_password is not None: + bootimg_key_password += "\n" + img_sha256 = tempfile.NamedTemporaryFile() + img_sig = tempfile.NamedTemporaryFile() + img_sig_padded = tempfile.NamedTemporaryFile() + img_secure = tempfile.NamedTemporaryFile() + p = Run(["openssl", "dgst", "-sha256", "-binary", "-out", img_sha256.name, img.name], + stdout=subprocess.PIPE) + p.communicate() + assert p.returncode == 0, "signing of bootable image failed" + p = Run(["openssl", "rsautl", "-sign", "-in", img_sha256.name, "-inkey", bootimg_key, "-out", + img_sig.name, "-passin", "stdin"], stdin=subprocess.PIPE, stdout=subprocess.PIPE) + p.communicate(bootimg_key_password) + assert p.returncode == 0, "signing of bootable image failed" + p = Run(["dd", "if=/dev/zero", "of=%s" % img_sig_padded.name, "bs=%s" % kernel_pagesize, + "count=1"], stdout=subprocess.PIPE) + p.communicate() + assert p.returncode == 0, "signing of bootable image failed" + p = Run(["dd", "if=%s" % img_sig.name, "of=%s" % img_sig_padded.name, "conv=notrunc"], + stdout=subprocess.PIPE) + p.communicate() + assert p.returncode == 0, "signing of bootable image failed" + p = Run(["cat", img.name, img_sig_padded.name], stdout=img_secure.file.fileno()) + p.communicate() + assert p.returncode == 0, "signing of bootable image failed" + shutil.copyfile(img_secure.name, img.name) + img_sha256.close() + img_sig.close() + img_sig_padded.close() + img_secure.close() + if (info_dict.get("boot_signer", None) == "true" and info_dict.get("verity_key", None)): path = "/" + os.path.basename(sourcedir).lower() -- cgit v1.1 From e1caad2880015a111566c59690f33c039b937147 Mon Sep 17 00:00:00 2001 From: "Brint E. Kriebel" Date: Sun, 22 Feb 2015 23:23:13 -0800 Subject: releasetools: Fix print in boot image signing Python 3 compatibility fail Change-Id: I0acb7059b554ad16833ccdd09643f52f2c44a3f2 Ticket: RM-233 --- tools/releasetools/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index efdab16..ac4cdf7 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -428,7 +428,7 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): os.path.basename(sourcedir),) if bootimg_key and os.path.exists(bootimg_key) and kernel_pagesize > 0: - print "Signing bootable image..." + print("Signing bootable image...") bootimg_key_passwords = {} bootimg_key_passwords.update(PasswordManager().GetPasswords(bootimg_key.split())) bootimg_key_password = bootimg_key_passwords[bootimg_key] -- cgit v1.1 From b0fa40c8a8dfac5077e80a0a7b18098dcd15b4cf Mon Sep 17 00:00:00 2001 From: "Brint E. Kriebel" Date: Tue, 8 Sep 2015 17:11:37 -0700 Subject: img_from_target_files: Skip oem.img in fastboot image creation We don't need this package to be included in fastboot images, so skip it when we are creating fastboot images. Change-Id: I1e0676f5cbf7468088e6997f83ae845578864668 Ticket: CYNGNOS-936 --- tools/releasetools/img_from_target_files.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/releasetools/img_from_target_files.py b/tools/releasetools/img_from_target_files.py index e9f9af6..33375ca 100755 --- a/tools/releasetools/img_from_target_files.py +++ b/tools/releasetools/img_from_target_files.py @@ -111,6 +111,7 @@ def main(argv): if os.path.exists(images_path): # If this is a new target-files, it already contains the images, # and all we have to do is copy them to the output zip. + # Skip oem.img files since they are not needed in fastboot images. images = os.listdir(images_path) if images: for image in images: @@ -118,6 +119,8 @@ def main(argv): continue if not image.endswith(".img"): continue + if image == "oem.img": + continue common.ZipWrite( output_zip, os.path.join(images_path, image), image) done = True @@ -165,12 +168,6 @@ def main(argv): add_img_to_target_files.AddUserdataExtra(output_zip, prefix="") banner("AddCache") add_img_to_target_files.AddCache(output_zip, prefix="") - try: - input_zip.getinfo("OEM/") - banner("AddOem") - add_img_to_target_files.AddOem(output_zip, prefix="") - except KeyError: - pass # no oem partition for this device finally: print("cleaning up...") -- cgit v1.1 From f30ec8b29170894c4afda1fc4c20f267833865bc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 18 Apr 2016 14:33:07 -0700 Subject: "MOB30J" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index d6f09d4..86c8d81 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30I +export BUILD_ID=MOB30J -- cgit v1.1 From 175aa0c1c0dba01e196df8e8f858535ebac5c378 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Mon, 18 Apr 2016 17:18:47 -0700 Subject: qcom: Use correct path for BT vendor Change-Id: I81971e65a7f75ad5755bfdbed229c30d447c7d55 --- 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 e38378d..9fda1ff 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -82,7 +82,7 @@ $(call set-device-specific-path,LOC_API,loc-api,vendor/qcom/opensource/location) $(call set-device-specific-path,DATASERVICES,dataservices,vendor/qcom/opensource/dataservices) $(call project-set-path,ril,hardware/ril) $(call project-set-path,wlan,hardware/qcom/wlan) -$(call project-set-path,bt,hardware/qcom/bt) +$(call project-set-path,bt-vendor,hardware/qcom/bt) else $(call project-set-path,qcom-audio,hardware/qcom/audio-caf/$(QCOM_HARDWARE_VARIANT)) -- cgit v1.1 From e2407355a0fee43062308b97519fd28976fd0a0a Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Tue, 19 Apr 2016 10:56:31 -0700 Subject: Update security patch string to 2016-06-01 b/28269112 Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 721e5b4..e0c68cf 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-05-01 + PLATFORM_SECURITY_PATCH := 2016-06-01 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 18648c18a827daa9952162e39e32a4d5727d7eb9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Apr 2016 19:11:37 -0700 Subject: "MOB30K" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 86c8d81..1591832 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30J +export BUILD_ID=MOB30K -- cgit v1.1 From 1efc554af5a47172f98c729baaeb338d69536fcd Mon Sep 17 00:00:00 2001 From: Jorge Ruesga Date: Fri, 29 Apr 2016 17:55:51 +0200 Subject: build: allow to set a consumer proguard file This allow to specify a proguard file by defining LOCAL_CONSUMER_PROGUARD_FILE that will inserted in the root directory of the aar and to be consumed by another apk via gradle plugin Change-Id: Ia3c11e5ea8e694800fb262b835432f86a6777f86 Signed-off-by: Jorge Ruesga --- core/static_java_library.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/static_java_library.mk b/core/static_java_library.mk index 764ab89..f4da963 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -140,6 +140,7 @@ $(built_aar): PRIVATE_ANDROID_MANIFEST := $(full_android_manifest) $(built_aar): PRIVATE_CLASSES_JAR := $(LOCAL_BUILT_MODULE) $(built_aar): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR) $(built_aar): PRIVATE_R_TXT := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/R.txt +$(built_aar): PRIVATE_CONSUMER_PROGUARD_FILE := $(LOCAL_CONSUMER_PROGUARD_FILE) $(built_aar) : $(LOCAL_BUILT_MODULE) @echo "target AAR: $(PRIVATE_MODULE) ($@)" $(hide) rm -rf $(dir $@)aar && mkdir -p $(dir $@)aar/res @@ -148,6 +149,9 @@ $(built_aar) : $(LOCAL_BUILT_MODULE) # Note: Use "cp -n" to honor the resource overlay rules, if multiple res dirs exist. $(hide) $(foreach res,$(PRIVATE_RESOURCE_DIR),cp -Rfn $(res)/* $(dir $@)aar/res;) $(hide) cp $(PRIVATE_R_TXT) $(dir $@)aar/R.txt +ifneq ($(PRIVATE_CONSUMER_PROGUARD_FILE),) + $(hide) cp $(PRIVATE_CONSUMER_PROGUARD_FILE) $(dir $@)aar/proguard.txt +endif $(hide) jar -cMf $@ \ -C $(dir $@)aar . -- cgit v1.1 From b5332f95968d7115a46ade1f163528e5bdd31b9f Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Mon, 2 May 2016 15:22:30 -0700 Subject: build: Make sure to check for variable definition during execution. TICKET: RM-232 Change-Id: Ic5b3850a81b959b05a218cd967dcec71c15a4cd5 --- core/static_java_library.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/static_java_library.mk b/core/static_java_library.mk index f4da963..5abb673 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -149,9 +149,9 @@ $(built_aar) : $(LOCAL_BUILT_MODULE) # Note: Use "cp -n" to honor the resource overlay rules, if multiple res dirs exist. $(hide) $(foreach res,$(PRIVATE_RESOURCE_DIR),cp -Rfn $(res)/* $(dir $@)aar/res;) $(hide) cp $(PRIVATE_R_TXT) $(dir $@)aar/R.txt -ifneq ($(PRIVATE_CONSUMER_PROGUARD_FILE),) - $(hide) cp $(PRIVATE_CONSUMER_PROGUARD_FILE) $(dir $@)aar/proguard.txt -endif + $(hide) if [ ! -z "$(PRIVATE_CONSUMER_PROGUARD_FILE)" ]; then \ + echo "Including '$(PRIVATE_CONSUMER_PROGUARD_FILE)'"; \ + $(hide) cp $(PRIVATE_CONSUMER_PROGUARD_FILE) $(dir $@)aar/proguard.txt; fi $(hide) jar -cMf $@ \ -C $(dir $@)aar . -- cgit v1.1 From 457da7b65d39e23353551f98a3ee84dbbfdd5ace Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Mon, 2 May 2016 15:53:56 -0700 Subject: build: Fix manual invocation of aar targets. Change-Id: Ic5a4980d1d45df24f6242e31fdfd86543f56e19c TICKET: RM-232 --- core/static_java_library.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/static_java_library.mk b/core/static_java_library.mk index 5abb673..99f4455 100644 --- a/core/static_java_library.mk +++ b/core/static_java_library.mk @@ -150,8 +150,8 @@ $(built_aar) : $(LOCAL_BUILT_MODULE) $(hide) $(foreach res,$(PRIVATE_RESOURCE_DIR),cp -Rfn $(res)/* $(dir $@)aar/res;) $(hide) cp $(PRIVATE_R_TXT) $(dir $@)aar/R.txt $(hide) if [ ! -z "$(PRIVATE_CONSUMER_PROGUARD_FILE)" ]; then \ - echo "Including '$(PRIVATE_CONSUMER_PROGUARD_FILE)'"; \ - $(hide) cp $(PRIVATE_CONSUMER_PROGUARD_FILE) $(dir $@)aar/proguard.txt; fi + echo "Including '$(PRIVATE_CONSUMER_PROGUARD_FILE)'"; \ + cp $(PRIVATE_CONSUMER_PROGUARD_FILE) $(dir $@)aar/proguard.txt; fi $(hide) jar -cMf $@ \ -C $(dir $@)aar . -- cgit v1.1 From b9d4958265cd66967f508f555ee448c903aba5fb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 4 May 2016 11:53:00 -0700 Subject: "MOB30L" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 1591832..79c827d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30K +export BUILD_ID=MOB30L -- cgit v1.1 From 0c03d1e623e77bab4825da899e52b4ffc849a3af Mon Sep 17 00:00:00 2001 From: Gary Kipnis Date: Thu, 5 May 2016 15:25:00 -0700 Subject: Added DataUsageProvider to the build Change-Id: Ia167198b82a9b41ed93e59048a55d0e1da7f0512 --- target/product/core.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/core.mk b/target/product/core.mk index c340acd..0911bce 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -28,6 +28,7 @@ PRODUCT_PACKAGES += \ CaptivePortalLogin \ CertInstaller \ Contacts \ + DataUsageProvider \ DeskClock \ DocumentsUI \ DownloadProviderUi \ -- cgit v1.1 From 0407535c99cfd534461568438eecfefd977b27f3 Mon Sep 17 00:00:00 2001 From: luca020400 Date: Thu, 5 May 2016 21:53:40 +0200 Subject: envsetup: Fix aosp & caf remote Fixes: sed: -e expression #1, char 9: unknown option to `s' * Return if .git directory is missing and move it on the top * Update cmremote strings ( match caf/aosp remote ) Change-Id: Ifb606a20f308e7317e9ce519d682a3fdb8bfe9bf --- envsetup.sh | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index 00dfbf1..23012ce 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1685,13 +1685,13 @@ function godir () { function cmremote() { - git remote rm cmremote 2> /dev/null - GERRIT_REMOTE=$(git config --get remote.github.projectname) - if [ -z "$GERRIT_REMOTE" ] + if ! git rev-parse --git-dir &> /dev/null then - echo Unable to set up the git remote, are you under a git repo? - return 0 + echo ".git directory not found. Please run this from the root directory of the Android repository you wish to set up." + return 1 fi + git remote rm cmremote 2> /dev/null + GERRIT_REMOTE=$(git config --get remote.github.projectname) CMUSER=$(git config --get review.review.cyanogenmod.org.username) if [ -z "$CMUSER" ] then @@ -1699,17 +1699,18 @@ function cmremote() else git remote add cmremote ssh://$CMUSER@review.cyanogenmod.org:29418/$GERRIT_REMOTE fi - echo You can now push to "cmremote". + echo "Remote 'cmremote' created" } function aospremote() { - git remote rm aosp 2> /dev/null - if [ ! -d .git ] + if ! git rev-parse --git-dir &> /dev/null then - echo .git directory not found. Please run this from the root directory of the Android repository you wish to set up. + echo ".git directory not found. Please run this from the root directory of the Android repository you wish to set up." + return 1 fi - PROJECT=`pwd -P | sed s#$ANDROID_BUILD_TOP/##g` + git remote rm aosp 2> /dev/null + PROJECT=${$(pwd -P)#$ANDROID_BUILD_TOP/} if (echo $PROJECT | grep -qv "^device") then PFX="platform/" @@ -1720,12 +1721,13 @@ function aospremote() function cafremote() { - git remote rm caf 2> /dev/null - if [ ! -d .git ] + if ! git rev-parse --git-dir &> /dev/null then - echo .git directory not found. Please run this from the root directory of the Android repository you wish to set up. + echo ".git directory not found. Please run this from the root directory of the Android repository you wish to set up." + return 1 fi - PROJECT=`pwd -P | sed s#$ANDROID_BUILD_TOP/##g` + git remote rm caf 2> /dev/null + PROJECT=${$(pwd -P)#$ANDROID_BUILD_TOP/} if (echo $PROJECT | grep -qv "^device") then PFX="platform/" -- cgit v1.1 From 692ca94eeacaaee85489e50b8704b58c15cc1595 Mon Sep 17 00:00:00 2001 From: Luca Stefani Date: Tue, 10 May 2016 11:05:01 -0700 Subject: Revert "Added DataUsageProvider to the build" * CM specific packages should go into vendor/cm This reverts commit 0c03d1e623e77bab4825da899e52b4ffc849a3af. Change-Id: I5810111672a4566def56df80e9cdc9bd1e158c70 --- target/product/core.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/target/product/core.mk b/target/product/core.mk index 0911bce..c340acd 100644 --- a/target/product/core.mk +++ b/target/product/core.mk @@ -28,7 +28,6 @@ PRODUCT_PACKAGES += \ CaptivePortalLogin \ CertInstaller \ Contacts \ - DataUsageProvider \ DeskClock \ DocumentsUI \ DownloadProviderUi \ -- cgit v1.1 From 624ba2e5b510f024c2a2243f2c780085da6c7502 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Thu, 18 Sep 2014 19:29:00 -0500 Subject: repopick: support specifying a range of commits to pick * for example: repopick 12345-12350 Change-Id: I3b8f2c331a6ac5488032432e133bd4b44d0bf007 --- tools/repopick.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/repopick.py b/tools/repopick.py index 1840a56..a53c043 100755 --- a/tools/repopick.py +++ b/tools/repopick.py @@ -235,8 +235,14 @@ if __name__ == '__main__': reviews = fetch_query(args.gerrit, args.query) change_numbers = sorted([str(r['number']) for r in reviews]) if args.change_number: - reviews = fetch_query(args.gerrit, ' OR '.join('change:{0}'.format(x.split('/')[0]) for x in args.change_number)) - change_numbers = args.change_number + for c in args.change_number: + if '-' in c: + templist = c.split('-') + for i in range(int(templist[0]), int(templist[1]) + 1): + change_numbers.append(str(i)) + else: + change_numbers.append(c) + reviews = fetch_query(args.gerrit, ' OR '.join('change:{0}'.format(x.split('/')[0]) for x in change_numbers)) # make list of things to actually merge mergables = [] -- cgit v1.1 From bbe9b53a4861616ad984382c3826defc58b995ae Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 12 May 2016 13:52:10 -0700 Subject: MOB30M --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 79c827d..db41f98 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30L +export BUILD_ID=MOB30M -- cgit v1.1 From ef1f045521a07a2901529b76a20575aff5769e60 Mon Sep 17 00:00:00 2001 From: Alistair Strachan Date: Thu, 5 May 2016 16:29:08 -0700 Subject: 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/clang/HOST_x86_common.mk b/core/clang/HOST_x86_common.mk index 74b5a69..7b3d6b5 100644 --- a/core/clang/HOST_x86_common.mk +++ b/core/clang/HOST_x86_common.mk @@ -11,7 +11,8 @@ endif 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 + --sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \ + -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \ --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) @@ -51,4 +52,4 @@ endif # Linux ifeq ($(HOST_OS),windows) # nothing required here yet -endif +endif \ No newline at end of file -- cgit v1.1 From fbd7c1cdb0b361cf35f7b3323019806e149c6c00 Mon Sep 17 00:00:00 2001 From: "Brint E. Kriebel" Date: Mon, 16 May 2016 18:53:19 -0700 Subject: ereleasetools: Allow for custom boot image signing tools Some boot images will need to be signed using specific tools. Allow passing the path to this tool through an environment variable. Change-Id: I958726fdae8d63fe99d639dfa361046b528a087c Ticket: CYNGNOS-2868 --- tools/releasetools/common.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index ac4cdf7..6e49629 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -339,6 +339,7 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): ramdisk_img = tempfile.NamedTemporaryFile() img = tempfile.NamedTemporaryFile() bootimg_key = os.getenv("PRODUCT_PRIVATE_KEY", None) + custom_boot_signer = os.getenv("PRODUCT_BOOT_SIGNER", None) if os.access(fs_config_file, os.F_OK): cmd = ["mkbootfs", "-f", fs_config_file, os.path.join(sourcedir, "RAMDISK")] @@ -427,7 +428,15 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): assert p.returncode == 0, "mkbootimg of %s image failed" % ( os.path.basename(sourcedir),) - if bootimg_key and os.path.exists(bootimg_key) and kernel_pagesize > 0: + if custom_boot_signer and bootimg_key and os.path.exists(bootimg_key): + print("Signing bootable image with custom boot signer...") + img_secure = tempfile.NamedTemporaryFile() + p = Run([custom_boot_signer, img.name, img_secure.name], stdout=subprocess.PIPE) + p.communicate() + assert p.returncode == 0, "signing of bootable image failed" + shutil.copyfile(img_secure.name, img.name) + img_secure.close() + elif bootimg_key and os.path.exists(bootimg_key) and kernel_pagesize > 0: print("Signing bootable image...") bootimg_key_passwords = {} bootimg_key_passwords.update(PasswordManager().GetPasswords(bootimg_key.split())) -- cgit v1.1 From 68301b2b87e5f485093089a56a0025c2b5d0e8b2 Mon Sep 17 00:00:00 2001 From: luca020400 Date: Thu, 19 May 2016 21:02:51 +0200 Subject: build: Fix caf and aospremote Change-Id: I8ad28d71254941c0aacb91b1c6c702f9f13caf5f --- envsetup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index 23012ce..03a6424 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1710,7 +1710,7 @@ function aospremote() return 1 fi git remote rm aosp 2> /dev/null - PROJECT=${$(pwd -P)#$ANDROID_BUILD_TOP/} + PROJECT=$(pwd -P | sed "s#$ANDROID_BUILD_TOP\/##") if (echo $PROJECT | grep -qv "^device") then PFX="platform/" @@ -1727,7 +1727,7 @@ function cafremote() return 1 fi git remote rm caf 2> /dev/null - PROJECT=${$(pwd -P)#$ANDROID_BUILD_TOP/} + PROJECT=$(pwd -P | sed "s#$ANDROID_BUILD_TOP\/##") if (echo $PROJECT | grep -qv "^device") then PFX="platform/" -- cgit v1.1 From 96170ade9b7c48d7241e9a8b0d975c835dd961a1 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Mon, 23 May 2016 16:39:40 +0100 Subject: qcom: Support 8937/8953 Change-Id: I84b1807e88d5be1230eab64bd1275a0677ce510f --- core/qcom_target.mk | 4 ++++ core/qcom_utils.mk | 2 ++ 2 files changed, 6 insertions(+) diff --git a/core/qcom_target.mk b/core/qcom_target.mk index 9fda1ff..3c8e68b 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -60,6 +60,9 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) ifneq ($(filter msm8909 msm8916,$(TARGET_BOARD_PLATFORM)),) QCOM_HARDWARE_VARIANT := msm8916 else + ifneq ($(filter msm8953 msm8937,$(TARGET_BOARD_PLATFORM)),) + QCOM_HARDWARE_VARIANT := msm8937 + else ifneq ($(filter msm8992 msm8994,$(TARGET_BOARD_PLATFORM)),) QCOM_HARDWARE_VARIANT := msm8994 else @@ -67,6 +70,7 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) endif endif endif + endif endif # HACK: check to see if build uses standard QC HAL paths by checking for CM path structure diff --git a/core/qcom_utils.mk b/core/qcom_utils.mk index 5e8a4a2..d63ed4a 100755 --- a/core/qcom_utils.mk +++ b/core/qcom_utils.mk @@ -9,7 +9,9 @@ QCOM_BOARD_PLATFORMS += msm8916 QCOM_BOARD_PLATFORMS += msm8960 QCOM_BOARD_PLATFORMS += msm8974 QCOM_BOARD_PLATFORMS += mpq8092 +QCOM_BOARD_PLATFORMS += msm8937 QCOM_BOARD_PLATFORMS += msm8952 +QCOM_BOARD_PLATFORMS += msm8953 QCOM_BOARD_PLATFORMS += msm8992 QCOM_BOARD_PLATFORMS += msm8994 QCOM_BOARD_PLATFORMS += msm8996 -- cgit v1.1 From 4f182df7602f4486d1594ab0f547954c25cbf616 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 26 May 2016 13:53:24 -0700 Subject: "MOB30N" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index db41f98..3f45e70 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30M +export BUILD_ID=MOB30N -- cgit v1.1 From 592c3a46e6b112fe820acc67630d656ba7b50ccb Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Thu, 26 May 2016 16:00:38 -0700 Subject: Updating security string to 2016-07-05 to release branches b/28912173 Change-Id: I60b28f3859f7ee006841ed4308e15404590b60bf --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index e0c68cf..cb8ba51 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-06-01 + PLATFORM_SECURITY_PATCH := 2016-07-05 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From d0663585f9cee5718782eef8b4e6cdb7f1f922b7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 27 May 2016 11:34:22 -0700 Subject: "MOB30O" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3f45e70..b8cfd9c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30N +export BUILD_ID=MOB30O -- cgit v1.1 From 0bf14034d6d724cd426f65a8917988b5459251c8 Mon Sep 17 00:00:00 2001 From: Scott Mertz Date: Wed, 1 Jun 2016 13:40:25 -0700 Subject: build: add kernel header dependency if module uses kernel headers Many of the QCOM components use kernel headers, but don't declare the dependency on them. This is fine in CAF because of the way they build the boot.img before anything else. In CM, we don't build the boot.img the same, so we run into a race between the kernel build & these modules... and the modules lose. Warn about modules that have this missing dependency, and add it for them so we don't have to modify each Android.mk. Change-Id: I95f1e47b5ef440f6f5d8f64a0c3f38d9572e839e --- core/binary.mk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/binary.mk b/core/binary.mk index 77612ad..7610dce 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -30,6 +30,15 @@ else endif endif +# Many qcom modules don't correctly set a dependency on the kernel headers. Fix it for them, +# but warn the user. +ifneq (,$(findstring $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include,$(LOCAL_C_INCLUDES))) + ifeq (,$(findstring $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr,$(LOCAL_ADDITIONAL_DEPENDENCIES))) + $(warning $(LOCAL_MODULE) uses kernel headers, but does not depend on them!) + LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr + endif +endif + # The following LOCAL_ variables will be modified in this file. # Because the same LOCAL_ variables may be used to define modules for both 1st arch and 2nd arch, # we can't modify them in place. -- cgit v1.1 From 931561f91650d685b3c1639f56429587a6b5d65b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Jun 2016 13:29:54 -0700 Subject: "MOB30P" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b8cfd9c..df6c9c4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30O +export BUILD_ID=MOB30P -- cgit v1.1 From f66583549b4d8c936b606602ecca9a35f5118dd4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Jun 2016 16:54:18 -0700 Subject: MOB30Q --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index df6c9c4..7885fcc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30P +export BUILD_ID=MOB30Q -- cgit v1.1 From 801912641f9a7b0026198daf0b0d0de336d47f7f Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Wed, 15 Jun 2016 22:35:15 +0100 Subject: Conditionally skip dex-preopting specific prebuilts. Extend change I13f10e2a9c251366f29606158f8c2fb54f8ee8b so that it optionally applies to a specific list of modules. Change-Id: Id56aeadfb8d2581a2c7b7045725419bf4f6b8faa --- core/prebuilt_internal.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index b5ff3a1..2a4b716 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -190,6 +190,11 @@ ifeq ($(DONT_DEXPREOPT_PREBUILTS),true) LOCAL_DEX_PREOPT := false endif +# Disable dex-preopt of specific prebuilts to save space, if requested. +ifneq ($(filter $(DEXPREOPT_BLACKLIST),$(LOCAL_MODULE)),) +LOCAL_DEX_PREOPT := false +endif + ####################################### # defines built_odex along with rule to install odex include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk -- cgit v1.1 From 067d200d42fd8193c1110818825a87cf736092b8 Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Wed, 22 Jun 2016 14:04:26 -0700 Subject: Updating security string to 2016-08-05 - directly to mnc-mr2-release b/29513589 Change-Id: I10fbee9cda55e28e7d7b6b5f7889a1935a885470 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index cb8ba51..d90f3dc 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-07-05 + PLATFORM_SECURITY_PATCH := 2016-08-05 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 20dde104397573039b43f7b03e85f60a53c0e575 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Jun 2016 10:45:10 -0700 Subject: "MOB30R" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7885fcc..07d978b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30Q +export BUILD_ID=MOB30R -- cgit v1.1 From 01e92039e3335db66b55564650f50f48cf982706 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 17 May 2016 00:40:52 -0400 Subject: disable unpriv perf by default in user{,debug} builds (Cherry picked from commit f2ac912b19ccbcc15d5176ec52c99744810adce7) Bug: 29054680 Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6 --- core/main.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/main.mk b/core/main.mk index 5b6e1e9..a6f829a 100644 --- a/core/main.mk +++ b/core/main.mk @@ -316,6 +316,7 @@ tags_to_install := ifneq (,$(user_variant)) # Target is secure in user builds. ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1 + ADDITIONAL_DEFAULT_PROPERTIES += security.perf_harden=1 ifeq ($(user_variant),userdebug) # Pick up some extra useful tools -- cgit v1.1 From 6d81a4ad2a4b91c4032e580a7ee3a4957766f588 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Jun 2016 15:08:50 -0700 Subject: "MOB30S" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 07d978b..fe34c26 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30R +export BUILD_ID=MOB30S -- cgit v1.1 From 82d53be4f0b23707d4470e2966a3a7be4065914c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Jun 2016 18:09:11 -0700 Subject: "MOB30T" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fe34c26..ca5bd55 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30S +export BUILD_ID=MOB30T -- cgit v1.1 From 914361a3ddba1d2ff2e631d4990098e9b21844db Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Jun 2016 15:14:36 -0700 Subject: "M4B30Q" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index df6c9c4..fb70c8d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30P +export BUILD_ID=M4B30Q -- cgit v1.1 From 36e2d00cdfba9fad6d9a2ee8ba2dd66c5ac33311 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Jun 2016 16:59:10 -0700 Subject: MOB30U --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ca5bd55..992c6fe 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30T +export BUILD_ID=MOB30U -- cgit v1.1 From 2f9b1a7a02ab5b28ba7c378374399284cdff66ee Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Jun 2016 14:06:07 -0700 Subject: "MOB30V" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 992c6fe..eb18d3b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30U +export BUILD_ID=MOB30V -- cgit v1.1 From c5f5bf332eba81688b9bc8cd37097b16f6155418 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 1 Jul 2016 13:59:24 -0700 Subject: "MOB30W" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index eb18d3b..7150011 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30V +export BUILD_ID=MOB30W -- cgit v1.1 From a68d79c1ef9ae6cb9dae6acfe7115ad47597376f Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Mon, 4 Jul 2016 16:34:19 +0100 Subject: build: Let the verity signer and metadata builders ask for a password Don't grab stdin/out for these tools. We want to know when a password is being requested (and be able to actually provide one) if the corresponding key needs it Change-Id: I8dd439322b7d8942adc9ce7ce0912fb20c69654f Ref: CYNGNOS-3156 --- tools/releasetools/build_image.py | 10 +++++++--- tools/releasetools/common.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index efaf7eb..81ab64f 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -111,10 +111,14 @@ def BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt, cmd = cmd_template % (image_size, verity_metadata_path, root_hash, salt, block_device, signer_path, key) print(cmd) - status, output = getstatusoutput(cmd) - if status: - print("Could not build verity metadata! Error: %s" % output) + runcmd = ["system/extras/verity/build_verity_metadata.py", image_size, verity_metadata_path, root_hash, salt, block_device, signer_path, key]; + sp = subprocess.Popen(runcmd) + sp.wait() + + if sp.returncode != 0: + print("Could not build verity metadata!") return False + return True def Append2Simg(sparse_image_path, unsparse_image_path, error_message): diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 6e49629..df06b15 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -480,7 +480,7 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): cmd.extend([path, img.name, info_dict["verity_key"] + ".pk8", info_dict["verity_key"] + ".x509.pem", img.name]) - p = Run(cmd, stdout=subprocess.PIPE) + p = Run(cmd) p.communicate() assert p.returncode == 0, "boot_signer of %s image failed" % path -- cgit v1.1 From 7441560692f9e57349664d9634b88c20f3f6072f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 6 Jul 2016 13:37:33 -0700 Subject: "MOB30X" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 7150011..8834399 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30W +export BUILD_ID=MOB30X -- cgit v1.1 From d6a079f7e317358e4527fc27948d5b2f6621a22b Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Mon, 11 Jul 2016 11:17:56 +0100 Subject: build: Use the password manager for the verity key if possible If we're operating with a password dict, try to use it for verity Change-Id: Ie0e8e33c873fc9f1ae9bd6da559f9cbbced183e9 Ref: CYNGNOS-3156 --- tools/releasetools/build_image.py | 15 ++++++++++++++- tools/releasetools/common.py | 18 ++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index 81ab64f..d712083 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -106,13 +106,26 @@ def BuildVerityTree(sparse_image_path, verity_image_path, prop_dict): def BuildVerityMetadata(image_size, verity_metadata_path, root_hash, salt, block_device, signer_path, key): + verity_key = os.getenv("PRODUCT_VERITY_KEY", None) + verity_key_password = None + + if verity_key and os.path.exists(verity_key+".pk8"): + verity_key_passwords = {} + verity_key_passwords.update(common.PasswordManager().GetPasswords(verity_key.split())) + verity_key_password = verity_key_passwords[verity_key] + cmd_template = ( "system/extras/verity/build_verity_metadata.py %s %s %s %s %s %s %s") cmd = cmd_template % (image_size, verity_metadata_path, root_hash, salt, block_device, signer_path, key) print(cmd) runcmd = ["system/extras/verity/build_verity_metadata.py", image_size, verity_metadata_path, root_hash, salt, block_device, signer_path, key]; - sp = subprocess.Popen(runcmd) + if verity_key_password is not None: + sp = subprocess.Popen(runcmd, stdin=subprocess.PIPE) + sp.communicate(verity_key_password) + else: + sp = subprocess.Popen(runcmd) + sp.wait() if sp.returncode != 0: diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index df06b15..32bbc68 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -339,6 +339,7 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): ramdisk_img = tempfile.NamedTemporaryFile() img = tempfile.NamedTemporaryFile() bootimg_key = os.getenv("PRODUCT_PRIVATE_KEY", None) + verity_key = os.getenv("PRODUCT_VERITY_KEY", None) custom_boot_signer = os.getenv("PRODUCT_BOOT_SIGNER", None) if os.access(fs_config_file, os.F_OK): @@ -480,8 +481,21 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None): cmd.extend([path, img.name, info_dict["verity_key"] + ".pk8", info_dict["verity_key"] + ".x509.pem", img.name]) - p = Run(cmd) - p.communicate() + verity_key_password = None + + if verity_key and os.path.exists(verity_key+".pk8") and kernel_pagesize > 0: + verity_key_passwords = {} + verity_key_passwords.update(PasswordManager().GetPasswords(verity_key.split())) + verity_key_password = verity_key_passwords[verity_key] + + if verity_key_password is not None: + verity_key_password += "\n" + p = Run(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE) + p.communicate(verity_key_password) + else: + p = Run(cmd) + p.communicate() + assert p.returncode == 0, "boot_signer of %s image failed" % path # Sign the image if vboot is non-empty. -- cgit v1.1 From 06e04529841134d3cfe2287553bf73b0ebca9f17 Mon Sep 17 00:00:00 2001 From: Luis Vidal Date: Wed, 13 Jul 2016 15:16:08 -0700 Subject: Add LOCAL_AIDL_FLAGS Allow modules to define custom AIDL flags Change-Id: I5609e6eb0a10d441cea2556179c8496293116dcf --- core/base_rules.mk | 2 +- core/clear_vars.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/base_rules.mk b/core/base_rules.mk index 202398a..8ed6dcf 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -219,7 +219,7 @@ else # build against the platform. LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) endif # LOCAL_SDK_VERSION -$(aidl_java_sources): PRIVATE_AIDL_FLAGS := -b $(addprefix -p,$(aidl_preprocess_import)) -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src $(addprefix -I,$(LOCAL_AIDL_INCLUDES)) +$(aidl_java_sources): PRIVATE_AIDL_FLAGS := -b $(addprefix -p,$(aidl_preprocess_import)) -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src $(addprefix -I,$(LOCAL_AIDL_INCLUDES)) $(LOCAL_AIDL_FLAGS) $(aidl_java_sources): $(intermediates.COMMON)/src/%.java: \ $(TOPDIR)$(LOCAL_PATH)/%.aidl \ diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 5c53c9f..1a3ce19 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -103,6 +103,7 @@ LOCAL_APK_LIBRARIES:= LOCAL_RES_LIBRARIES:= LOCAL_MANIFEST_INSTRUMENTATION_FOR:= LOCAL_AIDL_INCLUDES:= +LOCAL_AIDL_FLAGS:= LOCAL_JARJAR_RULES:= LOCAL_ADDITIONAL_JAVA_DIR:= LOCAL_ALLOW_UNDEFINED_SYMBOLS:= -- cgit v1.1 From a8994a2e9b3e3954042c8136d686ee91cb28541e Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Fri, 15 Jul 2016 16:40:08 -0700 Subject: "MOB30Y" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8834399..8797351 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30X +export BUILD_ID=MOB30Y -- cgit v1.1 From 5d5a58e58f603605d869afd24339641b91c1019e Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Thu, 21 Jul 2016 14:26:13 -0700 Subject: "MOB30Z" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8797351..811f270 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30Y +export BUILD_ID=MOB30Z -- cgit v1.1 From f4607de197ec247db21f6da4c16d1a526bfe764c Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Tue, 19 Jul 2016 13:20:45 -0700 Subject: Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA b/30224278 Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index d90f3dc..ac017a2 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-08-05 + PLATFORM_SECURITY_PATCH := 2016-09-01 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 92212a91dd63890adb2915d45fc1f5e3c510bfdd Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Thu, 21 Jul 2016 17:36:48 -0700 Subject: "MOB31B" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 811f270..3897741 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30Z +export BUILD_ID=MOB31B -- cgit v1.1 From 827f04b0376dcd587e5a3b772c835947905ce67b Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 28 Jul 2016 14:16:34 -0700 Subject: Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev b/30224278 Change-Id: I0f0591b7f0f033320de422c4019e056231228539 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index ac017a2..4f7dbca 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-09-01 + PLATFORM_SECURITY_PATCH := 2016-09-05 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From b24a529a253bfea16b55762d95174a85689a8dfa Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Mon, 1 Aug 2016 14:25:25 -0700 Subject: "MOB31C" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3897741..38a070a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB31B +export BUILD_ID=MOB31C -- cgit v1.1 From 7143cae26b4001d8e14ef3e565c568cf164fc7ce Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Wed, 11 May 2016 21:22:57 -0300 Subject: build: Readd msm7x27a to QCOM Targets Change-Id: I87db6ee43059c256d338babbdfe414030a06b53e Signed-off-by: Caio Oliveira --- core/qcom_target.mk | 2 +- core/qcom_utils.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/qcom_target.mk b/core/qcom_target.mk index 3c8e68b..2dde2d9 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -32,7 +32,7 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) # Tell HALs that we're compiling an AOSP build with an in-line kernel TARGET_COMPILE_WITH_MSM_KERNEL := true - ifneq ($(filter msm7x30 msm8660 msm8960,$(TARGET_BOARD_PLATFORM)),) + ifneq ($(filter msm7x27a msm7x30 msm8660 msm8960,$(TARGET_BOARD_PLATFORM)),) # Enable legacy graphics functions qcom_flags += -DQCOM_BSP_LEGACY # Enable legacy audio functions diff --git a/core/qcom_utils.mk b/core/qcom_utils.mk index d63ed4a..50e0b4e 100755 --- a/core/qcom_utils.mk +++ b/core/qcom_utils.mk @@ -1,5 +1,6 @@ # Board platforms lists to be used for # TARGET_BOARD_PLATFORM specific featurization +QCOM_BOARD_PLATFORMS += msm7x27a QCOM_BOARD_PLATFORMS += msm7x30 QCOM_BOARD_PLATFORMS += msm8226 QCOM_BOARD_PLATFORMS += msm8610 -- cgit v1.1 From a097018341040759bbb0e4bdb11e5288d2e536f1 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Sun, 7 Aug 2016 23:02:34 -0700 Subject: build: Allow building with Oracle JDK 8 * The script is currently limiting JDK 8 builds to OpenJDK. Remove this political stuff. The Oracle JDK works just fine, performs better than OpenJDK in many cases, and there is no reason to require switching around just to build Android. Change-Id: I8200624ca7ccd0624a1aad6ccdb889b433d528d6 --- core/main.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/main.mk b/core/main.mk index 04be6e6..fbc4fc8 100644 --- a/core/main.mk +++ b/core/main.mk @@ -158,7 +158,7 @@ javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1) ifneq ($(EXPERIMENTAL_USE_JAVA8),) required_version := "1.8.x" required_javac_version := "1.8" -java_version := $(shell echo '$(java_version_str)' | grep 'openjdk .*[ "]1\.8[\. "$$]') +java_version := $(shell echo '$(java_version_str)' | grep '.*[ "]1\.8[\. "$$]') javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.8[\. "$$]') else # default required_version := "1.7.x" @@ -185,9 +185,6 @@ endif # # For Java 1.7, we require OpenJDK on linux and Oracle JDK on Mac OS. requires_openjdk := false -ifeq ($(HOST_OS), linux) -requires_openjdk := true -endif # Check for the current jdk -- cgit v1.1 From cbecec6813272a6207d2f065acf4bb83cdc4a2ea Mon Sep 17 00:00:00 2001 From: Tom Powell Date: Mon, 8 Aug 2016 10:18:16 -0700 Subject: Revert "build: Allow building with Oracle JDK 8" Breaks build servers - See DONUTS-13 This reverts commit a097018341040759bbb0e4bdb11e5288d2e536f1. Change-Id: I54269dd783e94621de1ff6fa40db2f582aa90334 --- core/main.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/main.mk b/core/main.mk index fbc4fc8..04be6e6 100644 --- a/core/main.mk +++ b/core/main.mk @@ -158,7 +158,7 @@ javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1) ifneq ($(EXPERIMENTAL_USE_JAVA8),) required_version := "1.8.x" required_javac_version := "1.8" -java_version := $(shell echo '$(java_version_str)' | grep '.*[ "]1\.8[\. "$$]') +java_version := $(shell echo '$(java_version_str)' | grep 'openjdk .*[ "]1\.8[\. "$$]') javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.8[\. "$$]') else # default required_version := "1.7.x" @@ -185,6 +185,9 @@ endif # # For Java 1.7, we require OpenJDK on linux and Oracle JDK on Mac OS. requires_openjdk := false +ifeq ($(HOST_OS), linux) +requires_openjdk := true +endif # Check for the current jdk -- cgit v1.1 From 2f6515c498fbab4dc00f94965a8fce1910618840 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Mon, 8 Aug 2016 15:08:45 -0700 Subject: Update Security String to 2016-09-07 to platform and CTS for September respin Change-Id: I6ec8efad5b8e45bcf9df79fb54824acc92755a3b --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 4f7dbca..bd4ac90 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-09-05 + PLATFORM_SECURITY_PATCH := 2016-09-07 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 52f12c72d2dfad26a18b7050e86604046b3994ac Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Tue, 9 Aug 2016 16:48:27 -0700 Subject: "MOB31D" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 38a070a..80349f4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB31C +export BUILD_ID=MOB31D -- cgit v1.1 From df03dd15694e16d79c4d49ca3fc65be681a53cdb Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Tue, 9 Aug 2016 07:24:10 +0800 Subject: build: Allow all possible JDK editions by default JDK 7 or JDK 8? Oracle JDK or OpenJDK? Who cares? CM builds and works just fine with any one of them! Drop EXPERIMENTAL_USE_JAVA8 and OpenJDK checks to allow all of them. Change-Id: I64d7887c2fab4dd301b07d7df0d19f28e97d80ab --- core/main.mk | 51 +++++---------------------------------------------- 1 file changed, 5 insertions(+), 46 deletions(-) diff --git a/core/main.mk b/core/main.mk index 04be6e6..6560375 100644 --- a/core/main.mk +++ b/core/main.mk @@ -153,19 +153,11 @@ endif java_version_str := $(shell unset _JAVA_OPTIONS && java -version 2>&1) 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.8 if EXPERIMENTAL_USE_JAVA8 is set -ifneq ($(EXPERIMENTAL_USE_JAVA8),) -required_version := "1.8.x" -required_javac_version := "1.8" -java_version := $(shell echo '$(java_version_str)' | grep 'openjdk .*[ "]1\.8[\. "$$]') -javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.8[\. "$$]') -else # default -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[\. "$$]') -endif # if EXPERIMENTAL_USE_JAVA8 +# Check for the correct version of java, should be 1.7 or 1.8 +required_version := "1.7.x or 1.8.x" +required_javac_version := "1.7 or 1.8" +java_version := $(shell echo '$(java_version_str)' | grep '[ "]1\.[78][\. "$$]') +javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.[78][\. "$$]') ifeq ($(strip $(java_version)),) $(info ************************************************************) @@ -181,39 +173,6 @@ $(info ************************************************************) $(error stop) endif -# Check for the current JDK. -# -# For Java 1.7, we require OpenJDK on linux and Oracle JDK on Mac OS. -requires_openjdk := false -ifeq ($(HOST_OS), linux) -requires_openjdk := true -endif - - -# Check for the current jdk -ifeq ($(requires_openjdk), true) -# The user asked for java7 openjdk, so check that the host -# java version is really openjdk -ifeq ($(shell echo '$(java_version_str)' | grep -i openjdk),) -$(info ************************************************************) -$(info You asked for an OpenJDK 7 build but your version is) -$(info $(java_version_str).) -$(info ************************************************************) -$(error stop) -endif # java version is not OpenJdk -else # if requires_openjdk -ifneq ($(shell echo '$(java_version_str)' | grep -i openjdk),) -$(info ************************************************************) -$(info You are attempting to build with an unsupported JDK.) -$(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 ************************************************************) -$(error stop) -endif # java version is not Sun Oracle JDK -endif # if requires_openjdk - # Check for the correct version of javac ifeq ($(strip $(javac_version)),) $(info ************************************************************) -- cgit v1.1 From a65a6c47e513335ec6a301e85590a14577245089 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 11 Aug 2016 12:39:25 -0700 Subject: Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) Change-Id: I248efb2cbd877b4954994077df0f90adcf332f4a --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index bd4ac90..e6cd11b 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-09-07 + PLATFORM_SECURITY_PATCH := 2016-09-06 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 633dd52df80c38b16a55e070f69d6dc2f2714ca1 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Thu, 11 Aug 2016 18:21:51 -0700 Subject: "MOB31E" --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 80349f4..8ae4c9c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB31D +export BUILD_ID=MOB31E -- cgit v1.1 From f63b6427d7c14b0ec92082b0ec9c77bafa17877c Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Sun, 7 Aug 2016 23:07:32 -0700 Subject: build: Source a CM-specific global BoardConfig * Read vendor/cm/config/BoardConfigCM.mk. Kind of surprised we haven't needed this until now. Change-Id: I91cd89b14f6a5975e91f15dcfce1070502aa3861 --- core/config.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/config.mk b/core/config.mk index 4fd5bda..ab60701 100644 --- a/core/config.mk +++ b/core/config.mk @@ -187,6 +187,8 @@ FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(OUT_DIR) $(SCAN_EXCLUDE_DIRS) .r $(call project-set-path-variant,recovery,RECOVERY_VARIANT,bootable/recovery) -include vendor/extra/BoardConfigExtra.mk +-include vendor/cm/config/BoardConfigCM.mk + # The build system exposes several variables for where to find the kernel # headers: # TARGET_DEVICE_KERNEL_HEADERS is automatically created for the current -- cgit v1.1 From 2d1cc1933c123230550bab62e2ce8a8b32bc07f3 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Tue, 16 Aug 2016 15:52:48 -0700 Subject: M4B30R --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index fb70c8d..2c6ea87 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=M4B30Q +export BUILD_ID=M4B30R -- cgit v1.1 From d302afe3bb69cd24b8a0eefec6a6d0fd3ab97b85 Mon Sep 17 00:00:00 2001 From: Elektroschmock Date: Wed, 17 Aug 2016 20:30:50 +0200 Subject: core_minimal.mk: Remove duplicate packages Change-Id: Iaf7833334985450576ffb0a8d1b1babf39fcb63a --- target/product/core_minimal.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index ecd42b0..e8f2620 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -104,10 +104,8 @@ PRODUCT_SYSTEM_SERVER_JARS := \ ethernet-service \ wifi-service -# Adoptable external storage supports both ext4 and f2fs +# Adoptable external storage f2fs support PRODUCT_PACKAGES += \ - e2fsck \ - make_ext4fs \ fsck.f2fs \ mkfs.f2fs \ -- cgit v1.1 From 91fb2481daa0e6b7becd005b9e8d0e0786d4d568 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Wed, 17 Aug 2016 15:02:49 -0700 Subject: M4B30S --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2c6ea87..0fe0dc7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=M4B30R +export BUILD_ID=M4B30S -- cgit v1.1 From 6f76f6b54d9386f5f639da4817f3631e2b96cd06 Mon Sep 17 00:00:00 2001 From: luca020400 Date: Mon, 9 May 2016 16:56:59 +0200 Subject: generate_extra_images: Rename targets and add 'sec' prefix Change-Id: Ie7debfb33349d16d9a457ff817072af2f3a10c0f --- core/generate_extra_images.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/generate_extra_images.mk b/core/generate_extra_images.mk index 8ac9867..f7fb0c5 100644 --- a/core/generate_extra_images.mk +++ b/core/generate_extra_images.mk @@ -108,11 +108,11 @@ endif .PHONY: aboot aboot: $(INSTALLED_BOOTLOADER_MODULE) -.PHONY: kernel -kernel: $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_SEC_BOOTIMAGE_TARGET) +.PHONY: sec_bootimage +sec_bootimage: $(INSTALLED_BOOTIMAGE_TARGET) $(INSTALLED_SEC_BOOTIMAGE_TARGET) -.PHONY: recoveryimage -recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(INSTALLED_SEC_RECOVERYIMAGE_TARGET) +.PHONY: sec_recoveryimage +sec_recoveryimage: $(INSTALLED_RECOVERYIMAGE_TARGET) $(INSTALLED_SEC_RECOVERYIMAGE_TARGET) .PHONY: persistimage persistimage: $(INSTALLED_PERSISTIMAGE_TARGET) -- cgit v1.1 From 0e39dd276709d99d49f86d245f1254b4a328d5e8 Mon Sep 17 00:00:00 2001 From: luca020400 Date: Mon, 9 May 2016 16:34:18 +0200 Subject: build: Add dt.img and kernel target Change-Id: I4a266d8bd2b01ec4ec696f10f0cc7e912f25a38a --- core/tasks/dt_image.mk | 4 ++++ core/tasks/kernel.mk | 3 +++ 2 files changed, 7 insertions(+) diff --git a/core/tasks/dt_image.mk b/core/tasks/dt_image.mk index a1e8ee7..4fbec7c 100644 --- a/core/tasks/dt_image.mk +++ b/core/tasks/dt_image.mk @@ -39,6 +39,10 @@ $(INSTALLED_DTIMAGE_TARGET): $(DTBTOOL) $(INSTALLED_KERNEL_TARGET) ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DTIMAGE_TARGET) ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_DTIMAGE_TARGET) + +.PHONY: dt.img +dt.img: $(INSTALLED_DTIMAGE_TARGET) + endif endif endif diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index fab7722..eedf6ca 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -362,3 +362,6 @@ $(file) : $(KERNEL_BIN) | $(ACP) ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET) endif + +.PHONY: kernel +kernel: $(INSTALLED_KERNEL_TARGET) -- cgit v1.1 From 3fa03d082e93a819e1f3226c02c3d4a8f7ea025a Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Fri, 19 Aug 2016 12:37:55 -0400 Subject: dt_image: Rename target Change-Id: I2fbe952b55296b6e1a533d071c769788ab3f14ae Signed-off-by: Brandon McAnsh --- core/tasks/dt_image.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tasks/dt_image.mk b/core/tasks/dt_image.mk index 4fbec7c..60d45cc 100644 --- a/core/tasks/dt_image.mk +++ b/core/tasks/dt_image.mk @@ -40,8 +40,8 @@ $(INSTALLED_DTIMAGE_TARGET): $(DTBTOOL) $(INSTALLED_KERNEL_TARGET) ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_DTIMAGE_TARGET) ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_DTIMAGE_TARGET) -.PHONY: dt.img -dt.img: $(INSTALLED_DTIMAGE_TARGET) +.PHONY: dtimage +dtimage: $(INSTALLED_DTIMAGE_TARGET) endif endif -- cgit v1.1 From a9e57f615c6c13b6d6f97e2a927356b06dfe9d56 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 18 Aug 2016 10:33:30 -0700 Subject: Update Security String to 2016-10-01 to platform and CTS for October Security Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684 (cherry picked from commit cb60b2dedbf6a346f3affc66a2e89a8068c530e2) --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index e6cd11b..1b3c7d8 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-09-06 + PLATFORM_SECURITY_PATCH := 2016-10-01 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From f03c12b78f1a3fb67a9c71fd77fc890de52e07b7 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 18 Aug 2016 14:11:04 -0700 Subject: Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) b/30946906 Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d (cherry picked from commit bb45bd20e97be07ec92facf411aae91d90490a5b) --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 1b3c7d8..558a035 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-10-01 + PLATFORM_SECURITY_PATCH := 2016-10-05 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 7d3077c1332115bd5fe7b2f220f103d63bc658b0 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 25 Aug 2016 15:24:56 -0700 Subject: Update comments around PLATFORM_SECURITY_LEVEL Bug: 29881091 Change-Id: Ib30aac55540513e43af147914f4470a78f368ef6 (cherry picked from commit f45494279a4f46c51ce26935e221a121262f49ee) --- core/version_defaults.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 558a035..068ed0e 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -100,9 +100,11 @@ 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. + # It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin. + # It must be of the form "YYYY-MM-DD" on production devices. + # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. + # + # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. PLATFORM_SECURITY_PATCH := 2016-10-05 endif -- cgit v1.1 From c49265a2c0548395c5113d4c12ca7ef541e19dea Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Thu, 25 Aug 2016 21:56:35 -0700 Subject: MOB31F --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8ae4c9c..72b2472 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB31E +export BUILD_ID=MOB31F -- cgit v1.1 From 51e569ca1b84d9c9a2349f87fc28ff1650b69950 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Fri, 26 Aug 2016 16:16:38 -0700 Subject: MOB31G --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 72b2472..6f37177 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB31F +export BUILD_ID=MOB31G -- cgit v1.1 From 83290b9720d01bbda5230a86e6072064d04f0b37 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Fri, 26 Aug 2016 16:22:11 -0700 Subject: M4B30T --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0fe0dc7..e9b9179 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=M4B30S +export BUILD_ID=M4B30T -- cgit v1.1 From 146e3a5c48b60c3b95e6052e8f5728a763d8a862 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 18 Aug 2016 10:33:30 -0700 Subject: Update Security String to 2016-10-01 to platform and CTS for October Security Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684 (cherry picked from commit cb60b2dedbf6a346f3affc66a2e89a8068c530e2) --- core/build_id.mk | 2 +- core/version_defaults.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index e9b9179..336f112 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=M4B30T +export BUILD_ID=M4B30U diff --git a/core/version_defaults.mk b/core/version_defaults.mk index cb8ba51..1b3c7d8 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-07-05 + PLATFORM_SECURITY_PATCH := 2016-10-01 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From cad4c75affe36c9d8b7f89f947759789f2e96620 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 18 Aug 2016 14:11:04 -0700 Subject: Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) b/30946906 Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 1b3c7d8..558a035 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-10-01 + PLATFORM_SECURITY_PATCH := 2016-10-05 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From c952e8f818c153f2db42da642e1ab57bd466c668 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 25 Aug 2016 15:24:56 -0700 Subject: Update comments around PLATFORM_SECURITY_LEVEL Bug: 29881091 Change-Id: Ib30aac55540513e43af147914f4470a78f368ef6 --- core/version_defaults.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 558a035..068ed0e 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -100,9 +100,11 @@ 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. + # It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin. + # It must be of the form "YYYY-MM-DD" on production devices. + # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. + # + # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. PLATFORM_SECURITY_PATCH := 2016-10-05 endif -- cgit v1.1 From fac97b6812d671d9dee800cf8bde3ea4714835af Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Tue, 30 Aug 2016 17:49:20 -0700 Subject: M4E61 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e9b9179..361f7ce 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=M4B30T +export BUILD_ID=M4E61 -- cgit v1.1 From cf4d1c7d32d3d93866fecc780d8d6740d24bd425 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Tue, 30 Aug 2016 17:52:09 -0700 Subject: M4B30V --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 361f7ce..8800b51 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=M4E61 +export BUILD_ID=M4B30V -- cgit v1.1 From f26f9285cec838c5aac0e8a564a316893711d8a5 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Tue, 30 Aug 2016 18:05:24 -0700 Subject: MOB31H --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6f37177..3a56d04 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB31G +export BUILD_ID=MOB31H -- cgit v1.1 From 312b8987f310db204df67d1c71b0890d8b618bea Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 18 Aug 2016 10:33:30 -0700 Subject: Update Security String to 2016-10-01 to platform and CTS for October Security Fix merge conflict into mmr3 Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index cb8ba51..1b3c7d8 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-07-05 + PLATFORM_SECURITY_PATCH := 2016-10-01 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From e3ab148bd9cf2c542ed1869d13e718a9c0f10ab8 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 18 Aug 2016 14:11:04 -0700 Subject: Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) b/30946906 Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d (cherry picked from commit bb45bd20e97be07ec92facf411aae91d90490a5b) --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 1b3c7d8..558a035 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-10-01 + PLATFORM_SECURITY_PATCH := 2016-10-05 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 8f69770b6b59af6f5e1f297155c0ecc561e33790 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Thu, 25 Aug 2016 15:24:56 -0700 Subject: Update comments around PLATFORM_SECURITY_LEVEL Bug: 29881091 Change-Id: Ib30aac55540513e43af147914f4470a78f368ef6 (cherry picked from commit f45494279a4f46c51ce26935e221a121262f49ee) --- core/version_defaults.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 558a035..068ed0e 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -100,9 +100,11 @@ 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. + # It must signify that the build includes all security patches issued up through the designated Android Public Security Bulletin. + # It must be of the form "YYYY-MM-DD" on production devices. + # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. + # + # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. PLATFORM_SECURITY_PATCH := 2016-10-05 endif -- cgit v1.1 From ce897e21470ee791f15b4790342ceea3efdca405 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Wed, 31 Aug 2016 11:18:24 -0700 Subject: M4B30W --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8800b51..f31e797 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=M4B30V +export BUILD_ID=M4B30W -- cgit v1.1 From c00b2e72aa21fd862c814c33722674113e0c6d9b Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Wed, 31 Aug 2016 16:48:30 -0700 Subject: M4B30X --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f31e797..e6bb0d7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=M4B30W +export BUILD_ID=M4B30X -- cgit v1.1 From a696488556264965cbd17afce46c6b0fffa5dfc6 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Tue, 20 Sep 2016 10:03:47 -0700 Subject: Updating Security String to 2016-11-01 on mnc-dev b/31618336 Change-Id: I18b3a0d690ab238fcd3cafa65b873ce7432c9c25 (cherry picked from commit 62b28398ba157b65a4825bea59806c060503500c) --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 068ed0e..fa2b767 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -105,7 +105,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-10-05 + PLATFORM_SECURITY_PATCH := 2016-11-01 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 54e0e325e5b4f3ba3bdcad42256de452a10bed56 Mon Sep 17 00:00:00 2001 From: Adam Seaton Date: Tue, 20 Sep 2016 10:06:50 -0700 Subject: Updating Security String to 2016-11-05 on mnc-dev b/31618336 Change-Id: I3c9459553fdc89cacdf74d5e5801871b7192bc51 (cherry picked from commit dcfd738833ea0c6d271b45d50a652191e6c345f0) --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index fa2b767..03b9011 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -105,7 +105,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # It must match one of the Android Security Patch Level strings of the Public Security Bulletins. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-11-01 + PLATFORM_SECURITY_PATCH := 2016-11-05 endif ifeq "" "$(PLATFORM_BASE_OS)" -- cgit v1.1 From 9dd3e0186da183dd1605dbfbfb3c371ec2f02e98 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Tue, 27 Sep 2016 16:08:52 -0700 Subject: MOB31I --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3a56d04..61d4730 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB31H +export BUILD_ID=MOB31I -- cgit v1.1 From 9f360cd1250cf36633efd4fc88ddf4b5fdbdc4a6 Mon Sep 17 00:00:00 2001 From: Keith Mok Date: Fri, 16 Sep 2016 14:30:19 -0700 Subject: Revert "envsetup: Always look up JAVA_HOME path" This breaks, if we have both jdk7 and jdk8 installed on same machine. This reverts commit bc9ae3d5c21915c165b2b2cb41d07e1573814254. Change-Id: Id0482d130d5306e797adfeeaeb2efbd1e25aa3ee --- envsetup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envsetup.sh b/envsetup.sh index 03a6424..c93db03 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -2406,7 +2406,7 @@ function set_java_home() { export JAVA_HOME=$(/usr/libexec/java_home -v 1.7) ;; *) - export JAVA_HOME=$(dirname $(dirname $(dirname $(readlink -f $(which java))))) + export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 ;; esac -- cgit v1.1 From ba31c2695aa7c81a930059976f2dacffb84f1cb0 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Thu, 19 Nov 2015 15:51:47 +0000 Subject: Use sensible default locations for Java Use sensible default locations for Java based on the EXPERIMENTAL_USE_JAVA8 flag. Bug: 25786468 Change-Id: I7ec035b5329785efc41b3f971d5e3ae202293576 --- envsetup.sh | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index c93db03..3efd683 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -2384,11 +2384,7 @@ function fixup_common_out_dir() { fi } -# Force JAVA_HOME to point to java 1.7 if it isn't already set. -# -# Note that the MacOS path for java 1.7 includes a minor revision number (sigh). -# For some reason, installing the JDK doesn't make it show up in the -# JavaVM.framework/Versions/1.7/ folder. +# Force JAVA_HOME to point to java 1.7/1.8 if it isn't already set. function set_java_home() { # Clear the existing JAVA_HOME value if we set it ourselves, so that # we can reset it later, depending on the version of java the build @@ -2401,14 +2397,25 @@ function set_java_home() { fi if [ ! "$JAVA_HOME" ]; then - case `uname -s` in - Darwin) - export JAVA_HOME=$(/usr/libexec/java_home -v 1.7) - ;; - *) - export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 - ;; - esac + if [ ! "$EXPERIMENTAL_USE_JAVA8" ]; then + case `uname -s` in + Darwin) + export JAVA_HOME=$(/usr/libexec/java_home -v 1.7) + ;; + *) + export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 + ;; + esac + else + case `uname -s` in + Darwin) + export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) + ;; + *) + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 + ;; + esac + fi # Keep track of the fact that we set JAVA_HOME ourselves, so that # we can change it on the next envsetup.sh, if required. -- cgit v1.1 From 93b6278c7d5a1d673c771702acc6a886c838847c Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Fri, 30 Sep 2016 12:03:14 -0700 Subject: MOB31J --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 61d4730..f21a55c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB31I +export BUILD_ID=MOB31J -- cgit v1.1 From c3c1d432d3df98ed71da643ad3bee557106d6890 Mon Sep 17 00:00:00 2001 From: gitbuildkicker Date: Tue, 11 Oct 2016 16:23:06 -0700 Subject: MOB31K --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index f21a55c..8928324 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB31J +export BUILD_ID=MOB31K -- cgit v1.1 From 5bf9b09f6420bd494702ce1b7eb8d502e2d33963 Mon Sep 17 00:00:00 2001 From: Adrian DC Date: Thu, 6 Oct 2016 13:42:43 +0200 Subject: build: Support a fallback to java 8 if java 7 is not found * In the case of a host installed only with java 8, the build starts correctly but on use of JAVA_HOME binaries, the java references are missing * Allow the java 7 to be tested and try to use java 8 Change-Id: Ie50892edb54feb8608a0ef80a1c2a8667703e8ee --- envsetup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/envsetup.sh b/envsetup.sh index 3efd683..3c11a22 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -2406,7 +2406,8 @@ function set_java_home() { export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 ;; esac - else + fi + if [ ! "$JAVA_HOME" ] || [ ! -d "$JAVA_HOME" ]; then case `uname -s` in Darwin) export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) -- cgit v1.1 From 6fd080e10615f641ad3b60f38d5753aec4a6b5be Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Thu, 20 Oct 2016 23:25:40 +0300 Subject: envsetup: Fix cafremote/aospremote for projects with non-standard paths * Fix -caf and -caf- projects * Fix AOSP HALs that are synced in "/default" subfolder Change-Id: I33cc344a3234de6698676c32035622acbec03dd1 --- envsetup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/envsetup.sh b/envsetup.sh index 3c11a22..6715419 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1710,7 +1710,7 @@ function aospremote() return 1 fi git remote rm aosp 2> /dev/null - PROJECT=$(pwd -P | sed "s#$ANDROID_BUILD_TOP\/##") + PROJECT=$(pwd -P | sed -e "s#$ANDROID_BUILD_TOP\/##; s#-caf.*##; s#\/default##") if (echo $PROJECT | grep -qv "^device") then PFX="platform/" @@ -1727,7 +1727,7 @@ function cafremote() return 1 fi git remote rm caf 2> /dev/null - PROJECT=$(pwd -P | sed "s#$ANDROID_BUILD_TOP\/##") + PROJECT=$(pwd -P | sed -e "s#$ANDROID_BUILD_TOP\/##; s#-caf.*##; s#\/default##") if (echo $PROJECT | grep -qv "^device") then PFX="platform/" -- cgit v1.1 From 5a8b10690354027b83b382b3ba6e856bbd9fc011 Mon Sep 17 00:00:00 2001 From: Diogo Ferreira Date: Wed, 9 Nov 2016 17:55:31 +0000 Subject: releasetools: Rebuild recovery when signing target images When signing a build, the recovery can be built twice, once when signing and again when adding the image to target files. This is usally not a problem for deterministic signatures but a custom signing method might include a time-based component which affects checksums of the generated images. This means that the recovery patches (i.e. install-recovery) will fail to checksum. This patch makes adding images to target files, when invoked from sign_target_files_apks, always rebuild the recovery patch with the newly generated images so that the checksums are consistent irrespective of potential time components. Change-Id: I575c69dc96a6d4d69b3ea9d037f5f13c97afa87e --- tools/releasetools/add_img_to_target_files.py | 14 ++++++++------ tools/releasetools/sign_target_files_apks.py | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py index b699135..51d64b8 100755 --- a/tools/releasetools/add_img_to_target_files.py +++ b/tools/releasetools/add_img_to_target_files.py @@ -47,7 +47,8 @@ OPTIONS.replace_verity_public_key = False OPTIONS.replace_verity_private_key = False OPTIONS.verity_signer_path = None -def AddSystem(output_zip, prefix="IMAGES/", recovery_img=None, boot_img=None): +def AddSystem(output_zip, prefix="IMAGES/", recovery_img=None, boot_img=None, + rebuild_recovery=OPTIONS.rebuild_recovery): """Turn the contents of SYSTEM into a system image and store it in output_zip.""" @@ -61,7 +62,7 @@ def AddSystem(output_zip, prefix="IMAGES/", recovery_img=None, boot_img=None): ofile.write(data) ofile.close() - if OPTIONS.rebuild_recovery: + if rebuild_recovery: print("Building new recovery patch") common.MakeRecoveryPatch(OPTIONS.input_tmp, output_sink, recovery_img, boot_img, info_dict=OPTIONS.info_dict) @@ -322,7 +323,7 @@ def AddCache(output_zip, prefix="IMAGES/"): os.rmdir(temp_dir) -def AddImagesToTargetFiles(filename): +def AddImagesToTargetFiles(filename, rebuild_recovery=OPTIONS.rebuild_recovery): OPTIONS.input_tmp, input_zip = common.UnzipTemp(filename) if not OPTIONS.add_missing: @@ -360,7 +361,7 @@ def AddImagesToTargetFiles(filename): boot_image = None if os.path.exists(prebuilt_path): print("boot.img already exists in IMAGES/, no need to rebuild...") - if OPTIONS.rebuild_recovery: + if rebuild_recovery: boot_image = common.GetBootableImage( "IMAGES/boot.img", "boot.img", OPTIONS.input_tmp, "BOOT") else: @@ -374,7 +375,7 @@ def AddImagesToTargetFiles(filename): prebuilt_path = os.path.join(OPTIONS.input_tmp, "IMAGES", "recovery.img") if os.path.exists(prebuilt_path): print("recovery.img already exists in IMAGES/, no need to rebuild...") - if OPTIONS.rebuild_recovery: + if rebuild_recovery: recovery_image = common.GetBootableImage( "IMAGES/recovery.img", "recovery.img", OPTIONS.input_tmp, "RECOVERY") else: @@ -384,7 +385,8 @@ def AddImagesToTargetFiles(filename): recovery_image.AddToZip(output_zip) banner("system") - AddSystem(output_zip, recovery_img=recovery_image, boot_img=boot_image) + AddSystem(output_zip, recovery_img=recovery_image, boot_img=boot_image, + rebuild_recovery = rebuild_recovery) if has_vendor: banner("vendor") AddVendor(output_zip) diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index abdb845..54460e6 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -518,7 +518,7 @@ def main(argv): common.ZipClose(input_zip) common.ZipClose(output_zip) - add_img_to_target_files.AddImagesToTargetFiles(args[1]) + add_img_to_target_files.AddImagesToTargetFiles(args[1], rebuild_recovery=True) print("done.") -- cgit v1.1 From c5ac5475738b6e74692c731c5ed9aa22d80915ca Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Wed, 9 Nov 2016 13:28:30 +0800 Subject: build: qcom_target: Enable BOARD_USES_ADRENO Newer QCOM HALs use this flag for libc2dcolorconvert, examples being msm8937 and msm8996 media HALs. Change-Id: I28e8a42b58b4f5f71126df7ad97c377724da5bab --- core/qcom_target.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/qcom_target.mk b/core/qcom_target.mk index 2dde2d9..02ab698 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -27,6 +27,8 @@ ifeq ($(BOARD_USES_QCOM_HARDWARE),true) qcom_flags += -DQCOM_BSP qcom_flags += -DQTI_BSP + BOARD_USES_ADRENO := true + TARGET_USES_QCOM_BSP := true # Tell HALs that we're compiling an AOSP build with an in-line kernel -- cgit v1.1 From 00e9db581fa3eece6784a8fd1dfcbd1bfc280c71 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Mon, 29 Aug 2016 08:37:10 -0500 Subject: kernel: Auto-set prefix based on KERNEL_ARCH Change-Id: I5c83e7de97b75ece9a1306cb20b058d9fd30e288 --- core/tasks/kernel.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index eedf6ca..f5a27c0 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -32,7 +32,9 @@ # TARGET_USES_UNCOMPRESSED_KERNEL = 'true' if Kernel is uncompressed, # optional, defaults to false # TARGET_KERNEL_CROSS_COMPILE_PREFIX = Compiler prefix (e.g. aarch64-linux-android-) -# defaults to arm-eabi- +# defaults to arm-eabi- for arm +# aarch64-linux-android- for arm64 +# x86_64-linux-android- for x86 # # BOARD_KERNEL_IMAGE_NAME = Built image name, optional, # defaults to Image.gz on arm64 @@ -210,10 +212,14 @@ KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules endif TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREFIX)) -ifeq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),) -KERNEL_TOOLCHAIN_PREFIX ?= arm-eabi- -else +ifneq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),) KERNEL_TOOLCHAIN_PREFIX ?= $(TARGET_KERNEL_CROSS_COMPILE_PREFIX) +else ifeq ($(KERNEL_ARCH),arm64) +KERNEL_TOOLCHAIN_PREFIX ?= aarch64-linux-android- +else ifeq ($(KERNEL_ARCH),arm) +KERNEL_TOOLCHAIN_PREFIX ?= arm-eabi- +else ifeq ($(KERNEL_ARCH),x86) +KERNEL_TOOLCHAIN_PREFIX ?= x86_64-linux-android- endif ifeq ($(KERNEL_TOOLCHAIN),) -- cgit v1.1 From e06132cf62d6e7686e43bc9ad82fb8f0dc126f6f Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Wed, 9 Nov 2016 13:54:24 +0800 Subject: Revert "qcom: Select Sony display/media variants for Sony devices" 1. The Sony kernel is no longer BF64-based. 2. There is no reason for Sony devices to set the BOARD_USES_QCOM_HARDWARE flag, since they are meant to be using AOSP code + select patches. Revert for now until a better solution is decided upon. This reverts commit be202afa17314f84ce69ee33a6936ca9abbf499b. Change-Id: I94749d116340e9eb4a2fcc88a2b4514719e2279d --- core/qcom_target.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/qcom_target.mk b/core/qcom_target.mk index 02ab698..9b8d6bb 100644 --- a/core/qcom_target.mk +++ b/core/qcom_target.mk @@ -91,14 +91,8 @@ $(call project-set-path,wlan,hardware/qcom/wlan) $(call project-set-path,bt-vendor,hardware/qcom/bt) else $(call project-set-path,qcom-audio,hardware/qcom/audio-caf/$(QCOM_HARDWARE_VARIANT)) - -ifeq ($(SONY_BF64_KERNEL_VARIANT),true) -$(call project-set-path,qcom-display,hardware/qcom/display-caf/sony) -$(call project-set-path,qcom-media,hardware/qcom/media-caf/sony) -else $(call project-set-path,qcom-display,hardware/qcom/display-caf/$(QCOM_HARDWARE_VARIANT)) $(call project-set-path,qcom-media,hardware/qcom/media-caf/$(QCOM_HARDWARE_VARIANT)) -endif $(call set-device-specific-path,CAMERA,camera,hardware/qcom/camera) $(call set-device-specific-path,GPS,gps,hardware/qcom/gps) -- cgit v1.1 From 9aa34c95a61c57512cc7973740c34ab3e61983c5 Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Thu, 25 Aug 2016 09:39:27 -0500 Subject: repopick: try to use remote's default revision * If the project doesn't have a revision specified, try to see if it's remote has one specified before falling back to the global default. RM-290 Change-Id: I05129413b154e5d08d0fa9ef0ce853631b7e1562 --- tools/repopick.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/repopick.py b/tools/repopick.py index a53c043..2b0aab4 100755 --- a/tools/repopick.py +++ b/tools/repopick.py @@ -209,6 +209,7 @@ if __name__ == '__main__': manifest = subprocess.check_output(['repo', 'manifest']) xml_root = ElementTree.fromstring(manifest) projects = xml_root.findall('project') + remotes = xml_root.findall('remote') default_revision = xml_root.findall('default')[0].get('revision').split('/')[-1] #dump project data into the a list of dicts with the following data: @@ -219,7 +220,11 @@ if __name__ == '__main__': path = project.get('path') revision = project.get('revision') if revision is None: - revision = default_revision + for remote in remotes: + if remote.get('name') == project.get('remote'): + revision = remote.get('revision') + if revision is None: + revision = default_revision if not name in project_name_to_data: project_name_to_data[name] = {} -- cgit v1.1 From e5be2a0b233ff0482ba36894de5da57b663dc683 Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Sat, 27 Aug 2016 01:49:14 +1000 Subject: repopick: don't re-pick duplicate changes check the last 10 commits to HEAD for a dupe change id. RM-290 Change-Id: Icfbf8b4eae165cf84ef4a82f54f792e9c9acd67b --- tools/repopick.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/repopick.py b/tools/repopick.py index 2b0aab4..6e40f38 100755 --- a/tools/repopick.py +++ b/tools/repopick.py @@ -275,6 +275,7 @@ if __name__ == '__main__': 'subject': review['subject'], 'project': review['project'], 'branch': review['branch'], + 'change_id': review['change_id'], 'change_number': review['number'], 'status': review['status'], 'fetch': None @@ -317,6 +318,19 @@ if __name__ == '__main__': if args.start_branch: subprocess.check_output(['repo', 'start', args.start_branch[0], project_path]) + # Check if change is already picked to HEAD...HEAD~10 + found_change = False + for i in range(0, 10): + output = subprocess.check_output(['git', 'show', '-q', 'HEAD~{0}'.format(i)], cwd=project_path).split() + if 'Change-Id:' in output: + head_change_id = output[output.index('Change-Id:')+1] + if head_change_id.strip() == item['change_id']: + print('Skipping {0} - already picked in {1} as HEAD~{2}'.format(item['id'], project_path, i)) + found_change = True + break + if found_change: + continue + # Print out some useful info if not args.quiet: print('--> Subject: "{0}"'.format(item['subject'])) -- cgit v1.1 From b7831759763be0c30d1762f63db0010225957bca Mon Sep 17 00:00:00 2001 From: Dan Pasanen Date: Wed, 31 Aug 2016 16:30:19 +0200 Subject: repopick: handle revisions with slashes RM-290 Change-Id: I6f7891a52fb1538e88f5a68dd28ef1c603ee7067 --- tools/repopick.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/repopick.py b/tools/repopick.py index 6e40f38..2b436ef 100755 --- a/tools/repopick.py +++ b/tools/repopick.py @@ -210,7 +210,7 @@ if __name__ == '__main__': xml_root = ElementTree.fromstring(manifest) projects = xml_root.findall('project') remotes = xml_root.findall('remote') - default_revision = xml_root.findall('default')[0].get('revision').split('/')[-1] + default_revision = xml_root.findall('default')[0].get('revision') #dump project data into the a list of dicts with the following data: #{project: {path, revision}} @@ -228,6 +228,7 @@ if __name__ == '__main__': if not name in project_name_to_data: project_name_to_data[name] = {} + revision = revision.split('refs/heads/')[-1] project_name_to_data[name][revision] = path # get data on requested changes -- cgit v1.1 From 0730edceb5b5454b84260856e064a701276b2c8b Mon Sep 17 00:00:00 2001 From: Adrian DC Date: Thu, 8 Sep 2016 17:11:11 +0200 Subject: build: repopick: Support projects with less than 10 commits * Verify that the project has at least 10 commits to verify, if not check only the amount of existing commits RM-290 Change-Id: Ic95212510d8f5b980c9a94af8d5ac1e0dfd94b3e --- tools/repopick.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/repopick.py b/tools/repopick.py index 2b436ef..8031a6a 100755 --- a/tools/repopick.py +++ b/tools/repopick.py @@ -319,9 +319,15 @@ if __name__ == '__main__': if args.start_branch: subprocess.check_output(['repo', 'start', args.start_branch[0], project_path]) - # Check if change is already picked to HEAD...HEAD~10 + # Determine the maximum commits to check already picked changes + check_picked_count = 10 + branch_commits_count = int(subprocess.check_output(['git', 'rev-list', '--count', 'HEAD'], cwd=project_path)) + if branch_commits_count <= check_picked_count: + check_picked_count = branch_commits_count - 1 + + # Check if change is already picked to HEAD...HEAD~check_picked_count found_change = False - for i in range(0, 10): + for i in range(0, check_picked_count): output = subprocess.check_output(['git', 'show', '-q', 'HEAD~{0}'.format(i)], cwd=project_path).split() if 'Change-Id:' in output: head_change_id = output[output.index('Change-Id:')+1] -- cgit v1.1 From 86152e68a701195a2269892561e67133961e51ac Mon Sep 17 00:00:00 2001 From: Adrian DC Date: Thu, 8 Sep 2016 18:25:02 +0200 Subject: build: repopick: Support squashed commits for Change-Id detection * Commits are identified by their last Change-Id, but the parser only considers the first one found * Reverse the list to find the last Change-Id and avoid multiple repopick attempts on the same commit RM-290 Change-Id: Ie0204245a47799f8ead21148e0b4e9356cf271eb --- tools/repopick.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/repopick.py b/tools/repopick.py index 8031a6a..9bf26bd 100755 --- a/tools/repopick.py +++ b/tools/repopick.py @@ -330,7 +330,11 @@ if __name__ == '__main__': for i in range(0, check_picked_count): output = subprocess.check_output(['git', 'show', '-q', 'HEAD~{0}'.format(i)], cwd=project_path).split() if 'Change-Id:' in output: - head_change_id = output[output.index('Change-Id:')+1] + head_change_id = '' + for j,t in enumerate(reversed(output)): + if t == 'Change-Id:': + head_change_id = output[len(output) - j] + break if head_change_id.strip() == item['change_id']: print('Skipping {0} - already picked in {1} as HEAD~{2}'.format(item['id'], project_path, i)) found_change = True -- cgit v1.1 From ea2aaaeee4322b13eb1fd48342fc8f4a8109a83f Mon Sep 17 00:00:00 2001 From: Adrian DC Date: Sun, 4 Dec 2016 12:30:26 +0100 Subject: build: repopick: Avoid failing on commits lookup * Some projects with multiple merges and discountinuous histories could trigger an error here when the HEAD~{?} does not exist, hence avoid this by ignoring the commit and continue the search Change-Id: Ice28c87d1bf8897da52236b637bbb0c5d349f848 --- tools/repopick.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/repopick.py b/tools/repopick.py index 9bf26bd..cfbb8a8 100755 --- a/tools/repopick.py +++ b/tools/repopick.py @@ -328,6 +328,8 @@ if __name__ == '__main__': # Check if change is already picked to HEAD...HEAD~check_picked_count found_change = False for i in range(0, check_picked_count): + if subprocess.call(['git', 'cat-file', '-e', 'HEAD~{0}'.format(i)], cwd=project_path, stderr=open(os.devnull, 'wb')): + continue output = subprocess.check_output(['git', 'show', '-q', 'HEAD~{0}'.format(i)], cwd=project_path).split() if 'Change-Id:' in output: head_change_id = '' -- cgit v1.1