From 1151aaf8272c7b1639310702f0af678f5d014144 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 9 Jan 2020 01:06:51 +0000 Subject: [PATCH 01/23] Version bump to QQ3A.200108.001 [core/build_id.mk] Change-Id: Ia20b0015e2947bd7c9d7ac5352901c5f415615f4 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2329288076..ee3c2066fa 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QT +BUILD_ID=QQ3A.200108.001 From 20c6e7dbe1b2c96154613aebce7080ffe2f05d07 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Fri, 10 Jan 2020 11:32:26 -0800 Subject: [PATCH 02/23] Update Security String to 2020-03-05 Bug:147450082 --- 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 98d777d373..1e517c5331 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -250,7 +250,7 @@ ifndef PLATFORM_SECURITY_PATCH # 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 := 2020-03-01 + PLATFORM_SECURITY_PATCH := 2020-03-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 28adc1ddc9459af7d882fc57ecbf3c9ddb9a6276 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 21 Jan 2020 13:35:12 +0900 Subject: [PATCH 03/23] libprotobuf-cpp-lite is removed from VNDK. It is demoted to vendor_available library. Therefore it will be installed to /vendor/lib[64] instead of /system/lib[64]/vndk. Exempt-From-Owner-Approval: cherry-pick Bug: 147780271 Test: m Merged-In: I40a94a3ecf55592b8e2f83f43070fa958c532cef Change-Id: I40a94a3ecf55592b8e2f83f43070fa958c532cef (cherry picked from commit 87889b0d4da71029f2a3154640e59bb71fbcb226) --- target/product/gsi/current.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt index f2415f49c0..a056846eed 100644 --- a/target/product/gsi/current.txt +++ b/target/product/gsi/current.txt @@ -253,7 +253,6 @@ VNDK-core: libpiex.so VNDK-core: libpng.so VNDK-core: libpower.so VNDK-core: libprocinfo.so -VNDK-core: libprotobuf-cpp-lite-3.9.1.so VNDK-core: libpuresoftkeymasterdevice.so VNDK-core: libradio_metadata.so VNDK-core: libselinux.so From 71640a32969b31d290078506917ece652221e304 Mon Sep 17 00:00:00 2001 From: Oliver Nguyen Date: Tue, 30 Apr 2019 15:14:44 -0700 Subject: [PATCH 04/23] Package coverage files as a zip. Bug: 148178774 Test: make NATIVE_COVERAGE=true COVERAGE_PATHS="*" Change-Id: I7ee9253ef47a502a9d29f7e15a4402cbb90e34ae Merged-In: I7ee9253ef47a502a9d29f7e15a4402cbb90e34ae (cherry picked from commit e91ab2397f353c53edb2a3cb6ac2c2f1bbe5462c) --- core/Makefile | 3 +-- core/definitions.mk | 10 ++++++++++ core/executable_internal.mk | 6 +++--- core/shared_library_internal.mk | 6 +++--- core/soong_cc_prebuilt.mk | 11 +++++------ core/static_library_internal.mk | 8 +++----- 6 files changed, 25 insertions(+), 19 deletions(-) diff --git a/core/Makefile b/core/Makefile index 0d5bd90613..bf44788889 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4329,11 +4329,10 @@ $(SYMBOLS_ZIP): $(SOONG_ZIP) # ----------------------------------------------------------------- # A zip of the coverage directory. # -name := $(TARGET_PRODUCT) +name := gcov-report-files-all ifeq ($(TARGET_BUILD_TYPE),debug) name := $(name)_debug endif -name := $(name)-coverage-$(FILE_NAME_TAG) COVERAGE_ZIP := $(PRODUCT_OUT)/$(name).zip ifndef TARGET_BUILD_APPS $(COVERAGE_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \ diff --git a/core/definitions.mk b/core/definitions.mk index 59aeb1663d..85db6dbedf 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1839,6 +1839,16 @@ define transform-host-o-to-executable $(transform-host-o-to-executable-inner) endef +########################################################### +## Commands for packaging native coverage files +########################################################### +define package-coverage-files + @rm -f $@ $@.lst $@.premerged + @touch $@.lst + $(foreach obj,$(strip $(PRIVATE_ALL_OBJECTS)), $(hide) echo $(obj) >> $@.lst$(newline)) + $(hide) $(SOONG_ZIP) -o $@.premerged -C $(OUT_DIR) -l $@.lst + $(hide) $(MERGE_ZIPS) -ignore-duplicates $@ $@.premerged $(strip $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) +endef ########################################################### ## Commands for running javac to make .class files diff --git a/core/executable_internal.mk b/core/executable_internal.mk index c28c144f67..558e49ba37 100644 --- a/core/executable_internal.mk +++ b/core/executable_internal.mk @@ -84,7 +84,7 @@ $(linked_module): $(my_target_crtbegin_dynamic_o) $(all_objects) $(all_libraries endif ifeq ($(my_native_coverage),true) -gcno_suffix := .gcnodir +gcno_suffix := .zip built_whole_gcno_libraries := \ $(foreach lib,$(my_whole_static_libraries), \ @@ -106,11 +106,11 @@ endif GCNO_ARCHIVE := $(my_installed_module_stem)$(gcno_suffix) +$(intermediates)/$(GCNO_ARCHIVE) : $(SOONG_ZIP) $(MERGE_ZIPS) $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS := $(strip $(LOCAL_GCNO_FILES)) $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_WHOLE_STATIC_LIBRARIES := $(strip $(built_whole_gcno_libraries)) $(strip $(built_static_gcno_libraries)) -$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_INTERMEDIATES_DIR := $(intermediates) $(intermediates)/$(GCNO_ARCHIVE) : $(LOCAL_GCNO_FILES) $(built_whole_gcno_libraries) $(built_static_gcno_libraries) - $(transform-o-to-static-lib) + $(package-coverage-files) $(my_coverage_path)/$(GCNO_ARCHIVE) : $(intermediates)/$(GCNO_ARCHIVE) $(copy-file-to-target) diff --git a/core/shared_library_internal.mk b/core/shared_library_internal.mk index 44bb0203bb..858884a436 100644 --- a/core/shared_library_internal.mk +++ b/core/shared_library_internal.mk @@ -77,7 +77,7 @@ $(linked_module): \ $(transform-o-to-shared-lib) ifeq ($(my_native_coverage),true) -gcno_suffix := .gcnodir +gcno_suffix := .zip built_whole_gcno_libraries := \ $(foreach lib,$(my_whole_static_libraries), \ @@ -99,11 +99,11 @@ endif GCNO_ARCHIVE := $(basename $(my_installed_module_stem))$(gcno_suffix) +$(intermediates)/$(GCNO_ARCHIVE) : $(SOONG_ZIP) $(MERGE_ZIPS) $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS := $(strip $(LOCAL_GCNO_FILES)) $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_WHOLE_STATIC_LIBRARIES := $(strip $(built_whole_gcno_libraries)) $(strip $(built_static_gcno_libraries)) -$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_INTERMEDIATES_DIR := $(intermediates) $(intermediates)/$(GCNO_ARCHIVE) : $(LOCAL_GCNO_FILES) $(built_whole_gcno_libraries) $(built_static_gcno_libraries) - $(transform-o-to-static-lib) + $(package-coverage-files) $(my_coverage_path)/$(GCNO_ARCHIVE) : $(intermediates)/$(GCNO_ARCHIVE) $(copy-file-to-target) diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk index 679d5b8bb1..2e7d47794c 100644 --- a/core/soong_cc_prebuilt.mk +++ b/core/soong_cc_prebuilt.mk @@ -177,14 +177,14 @@ endif ifeq ($(NATIVE_COVERAGE),true) ifneq (,$(strip $(LOCAL_PREBUILT_COVERAGE_ARCHIVE))) - $(eval $(call copy-one-file,$(LOCAL_PREBUILT_COVERAGE_ARCHIVE),$(intermediates)/$(LOCAL_MODULE).gcnodir)) + $(eval $(call copy-one-file,$(LOCAL_PREBUILT_COVERAGE_ARCHIVE),$(intermediates)/$(LOCAL_MODULE).zip)) ifneq ($(LOCAL_UNINSTALLABLE_MODULE),true) ifdef LOCAL_IS_HOST_MODULE my_coverage_path := $($(my_prefix)OUT_COVERAGE)/$(patsubst $($(my_prefix)OUT)/%,%,$(my_module_path)) else my_coverage_path := $(TARGET_OUT_COVERAGE)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_module_path)) endif - my_coverage_path := $(my_coverage_path)/$(patsubst %.so,%,$(my_installed_module_stem)).gcnodir + my_coverage_path := $(my_coverage_path)/$(patsubst %.so,%,$(my_installed_module_stem)).zip $(eval $(call copy-one-file,$(LOCAL_PREBUILT_COVERAGE_ARCHIVE),$(my_coverage_path))) $(LOCAL_BUILT_MODULE): $(my_coverage_path) endif @@ -192,13 +192,12 @@ ifeq ($(NATIVE_COVERAGE),true) # Coverage information is needed when static lib is a dependency of another # coverage-enabled module. ifeq (STATIC_LIBRARIES, $(LOCAL_MODULE_CLASS)) - GCNO_ARCHIVE := $(LOCAL_MODULE).gcnodir + GCNO_ARCHIVE := $(LOCAL_MODULE).zip + $(intermediates)/$(GCNO_ARCHIVE) : $(SOONG_ZIP) $(MERGE_ZIPS) $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS := $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_WHOLE_STATIC_LIBRARIES := - $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_PREFIX := $(my_prefix) - $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_2ND_ARCH_VAR_PREFIX := $(LOCAL_2ND_ARCH_VAR_PREFIX) $(intermediates)/$(GCNO_ARCHIVE) : - $(transform-o-to-static-lib) + $(package-coverage-files) endif endif endif diff --git a/core/static_library_internal.mk b/core/static_library_internal.mk index 6b4d22f129..f82e50162c 100644 --- a/core/static_library_internal.mk +++ b/core/static_library_internal.mk @@ -25,7 +25,7 @@ $(LOCAL_BUILT_MODULE) : $(all_objects) $(transform-o-to-static-lib) ifeq ($(NATIVE_COVERAGE),true) -gcno_suffix := .gcnodir +gcno_suffix := .zip built_whole_gcno_libraries := \ $(foreach lib,$(my_whole_static_libraries), \ @@ -35,11 +35,9 @@ built_whole_gcno_libraries := \ GCNO_ARCHIVE := $(LOCAL_MODULE)$(gcno_suffix) +$(intermediates)/$(GCNO_ARCHIVE) : $(SOONG_ZIP) $(MERGE_ZIPS) $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS := $(strip $(LOCAL_GCNO_FILES)) $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_WHOLE_STATIC_LIBRARIES := $(strip $(built_whole_gcno_libraries)) -$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_PREFIX := $(my_prefix) -$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_2ND_ARCH_VAR_PREFIX := $(LOCAL_2ND_ARCH_VAR_PREFIX) -$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_INTERMEDIATES_DIR := $(intermediates) $(intermediates)/$(GCNO_ARCHIVE) : $(LOCAL_GCNO_FILES) $(built_whole_gcno_libraries) - $(transform-o-to-static-lib) + $(package-coverage-files) endif From a21e8527a54e8781e3bb6e85033511adeed4a32f Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Tue, 2 Jul 2019 23:49:19 -0700 Subject: [PATCH 05/23] Add libprofile-extras to all link steps when NATIVE_COVERAGE is enabled. libprofile-extras has a wrapper to getenv() that appends the effective userid (euid) of the current process to GCOV_PREFIX. This avoids conflicts and permissions issues when multiple processes try to create/access the same directories and files under /data/misc/trace. This library needs to be added and the -Wl,--wrap,getenv flag needs to be passed to all link steps. Since Android.mk does not propagate flags and libraries across dependencies, this change just adds the library and flag to all non-static-library Android.mk modules. As a consequence, *ALL* binaries created via Android.mk will have the signal handler and property watcher thread in libprofile-extras but they are no-ops in non-coverage-enabled binaries. The dependency is added early enough in core/binary.mk so that the LOCAL_SOONG_LINK_TYPE resolutions occur correctly. Bug: 148178774 Test: Verify that coverage files are written to /data/misc/trace//proc/... instead of /data/misc/trace/proc/... Change-Id: I4d5f849c15e9a278253f2148185ddf3ab2878e2f Merged-In: I4d5f849c15e9a278253f2148185ddf3ab2878e2f (cherry picked from commit b8f898ef88ab34f3a5914cd3806155c8692ff7db) --- core/binary.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/core/binary.mk b/core/binary.mk index 43063a8cc4..de4f1fc739 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -267,6 +267,20 @@ ifneq ($(LOCAL_SDK_VERSION),) endif endif +ifeq ($(NATIVE_COVERAGE),true) + ifndef LOCAL_IS_HOST_MODULE + my_ldflags += -Wl,--wrap,getenv + + ifneq ($(LOCAL_MODULE_CLASS),STATIC_LIBRARIES) + ifeq ($(LOCAL_SDK_VERSION),) + my_whole_static_libraries += libprofile-extras + else + my_whole_static_libraries += libprofile-extras_ndk + endif + endif + endif +endif + ifneq ($(LOCAL_USE_VNDK),) # Required VNDK version for vendor modules is BOARD_VNDK_VERSION. my_vndk_version := $(BOARD_VNDK_VERSION) From 3ed9021f87171de197f34f938b538ae01e3ed702 Mon Sep 17 00:00:00 2001 From: Kavi Gupta Date: Tue, 11 Jun 2019 10:27:47 -0700 Subject: [PATCH 06/23] Modify build to put dumpcoverage agent into /system/lib This location allows the agent to be attached to arbitrary processes. It only makes sense to include libdumpcoverage.so on coverage builds, as these are the only builds that have any information to be dumped. Bug: 148178774 Test: manual, used examples in README (see other CL) to test whether it works on a userdebug_coverage build on cuttlefish Change-Id: Ib2fece1b41a3b5d16c8a2a444c5486137e475fda Merged-In: Ib2fece1b41a3b5d16c8a2a444c5486137e475fda (cherry picked from commit 7185f8cc2d67f733acb3b597cab100edf8fd1499) --- core/main.mk | 10 ++++++++++ core/product.mk | 2 ++ target/product/base_system.mk | 3 +++ 3 files changed, 15 insertions(+) diff --git a/core/main.mk b/core/main.mk index e9b1bca4a0..a13404a996 100644 --- a/core/main.mk +++ b/core/main.mk @@ -345,6 +345,15 @@ ifneq (,$(filter debug,$(tags_to_install))) endif endif +## java coverage ## +# Install additional tools on java coverage builds +ifeq (true,$(EMMA_INSTRUMENT)) +ifneq (,$(filter debug,$(tags_to_install))) + tags_to_install += java_coverage +endif +endif + + ## sdk ## ifdef is_sdk_build @@ -1139,6 +1148,7 @@ define product-installed-files $(if $(filter debug,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_DEBUG)) \ $(if $(filter tests,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_TESTS)) \ $(if $(filter asan,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_DEBUG_ASAN)) \ + $(if $(filter java_coverage,$(tags_to_install)),$(PRODUCTS.$(_mk).PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE)) \ $(call auto-included-modules) \ ) \ $(eval ### Filter out the overridden packages and executables before doing expansion) \ diff --git a/core/product.mk b/core/product.mk index 4b5c805746..40485638ce 100644 --- a/core/product.mk +++ b/core/product.mk @@ -119,6 +119,8 @@ _product_var_list += PRODUCT_HOST_PACKAGES _product_var_list += PRODUCT_PACKAGES _product_var_list += PRODUCT_PACKAGES_DEBUG _product_var_list += PRODUCT_PACKAGES_DEBUG_ASAN +# Packages included only for eng/userdebug builds, when building with EMMA_INSTRUMENT=true +_product_var_list += PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE _product_var_list += PRODUCT_PACKAGES_ENG _product_var_list += PRODUCT_PACKAGES_TESTS diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 822d2ead8c..ecc217dcd0 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -382,6 +382,9 @@ PRODUCT_PACKAGES_DEBUG_ASAN := \ fuzz \ honggfuzz +PRODUCT_PACKAGES_DEBUG_JAVA_COVERAGE := \ + libdumpcoverage + PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ frameworks/base/config/preloaded-classes:system/etc/preloaded-classes) From 98ae50932e2766e0b7001c7cb1e7ef3bde72a295 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 5 Feb 2020 03:29:13 +0000 Subject: [PATCH 07/23] Version bump to QQ3A.200205.002 [core/build_id.mk] Change-Id: Ia8acb38f94f41695d5c25d616c66d8c224695d9c --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 8dd893089b..630bd573c2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QQ3A.200205.001 +BUILD_ID=QQ3A.200205.002 From f9edfe37149cef8ffe6b8c027f6ab563fdcbbaa6 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Mon, 10 Feb 2020 13:44:20 -0800 Subject: [PATCH 08/23] Update Security String to 2020-04-01 Bug:149240442 --- 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 1e517c5331..aabc98a2a5 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -250,7 +250,7 @@ ifndef PLATFORM_SECURITY_PATCH # 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 := 2020-03-05 + PLATFORM_SECURITY_PATCH := 2020-04-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From d451ad7167dc8dc9f44b35a8dd1f9d3faafa345e Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Mon, 10 Feb 2020 13:44:44 -0800 Subject: [PATCH 09/23] Update Security String to 2020-04-05 Bug:149240442 --- 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 aabc98a2a5..4f8713f282 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -250,7 +250,7 @@ ifndef PLATFORM_SECURITY_PATCH # 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 := 2020-04-01 + PLATFORM_SECURITY_PATCH := 2020-04-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 63321ec3265defaaa50a54e77419fc769c51248c Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 12 Feb 2020 23:48:03 +0000 Subject: [PATCH 10/23] Version bump to QQ3A.200212.002 [core/build_id.mk] Change-Id: If83b229205c642e969df1cf1d05029db1f3cf890 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9c25d9b809..d6772adcdc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QQ3A.200212.001 +BUILD_ID=QQ3A.200212.002 From c3eeaae1d99d6683560809ad91b76f52d70a0115 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 13 Feb 2020 17:29:23 +0000 Subject: [PATCH 11/23] Version bump to QQ3A.200213.002 [core/build_id.mk] Change-Id: I55b77f8c44ce13e8fbd649f1a08f0be7e931b47e --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0ab811aed9..a9686f88d0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QQ3A.200213.001 +BUILD_ID=QQ3A.200213.002 From c6f308b8e4a7c5d7f51bef18b2057398f50b1243 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Wed, 19 Feb 2020 16:38:27 +0800 Subject: [PATCH 12/23] Adding new GSI public keys Adding two new public keys for R-Developer-GSI and S-Developer-GSI, respectively. Bug: 149805495 Test: build then checks $OUT/recovery/root/first_stage_ramdisk/avb/. Change-Id: I69dd00dbb0046c681758068b8bbea0c08b9e2c91 Merged-In: I69dd00dbb0046c681758068b8bbea0c08b9e2c91 (cherry picked from commit 3c739746b3ec63661b736bd47d3889fe4f29fe54) --- target/product/developer_gsi_keys.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/product/developer_gsi_keys.mk b/target/product/developer_gsi_keys.mk index 79451ad912..a7e3d62cb9 100644 --- a/target/product/developer_gsi_keys.mk +++ b/target/product/developer_gsi_keys.mk @@ -27,3 +27,5 @@ # PRODUCT_PACKAGES += \ q-developer-gsi.avbpubkey \ + r-developer-gsi.avbpubkey \ + s-developer-gsi.avbpubkey \ From 10f8d1a54f0d37ef41c4c94e5977fd9abc1f150f Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Tue, 25 Feb 2020 14:13:26 +0000 Subject: [PATCH 13/23] Version bump to QQ3A.200225.002 [core/build_id.mk] Change-Id: Id6f9ba99c0846f35e339b96398e562c8af43e6cc --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index e689d29ea4..0821437adb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QQ3A.200225.001 +BUILD_ID=QQ3A.200225.002 From e5c06de272ee3886120b1f2ed8278004204e8cd8 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 19 Feb 2020 18:06:54 -0800 Subject: [PATCH 14/23] Mark the current BUILD_* warnings as errors by default This switches: BUILD_COPY_HEADERS / LOCAL_COPY_HEADERS BUILD_HOST_EXECUTABLE BUILD_HOST_SHARED_LIBRARY BUILD_HOST_STATIC_LIBRARY to errors by default. Devices can set BUILD_BROKEN_USES_BUILD_HOST_EXECUTABLE (etc) to turn these errors back to warnings. I've done that for all of our internal devices. Bug: 130719878 Bug: 130696912 Bug: 130722971 Bug: 130723227 Test: remove the BUILD_BROKEN_USES_* lines from a device, see errors Change-Id: I1aecf97f64e281df3682ff0a0fb3ac4283790acd Merged-In: I1aecf97f64e281df3682ff0a0fb3ac4283790acd (cherry picked from commit c4bdff5f7e8d0f60e7084cb83abe759fb3b65363) --- Deprecation.md | 8 ++++---- core/board_config.mk | 10 +++++----- core/deprecation.mk | 8 ++++---- core/host_shared_library.mk | 4 +++- core/host_static_library.mk | 4 +++- core/shared_library.mk | 4 +++- core/static_library.mk | 4 +++- 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/Deprecation.md b/Deprecation.md index 5e26492708..2f936e3542 100644 --- a/Deprecation.md +++ b/Deprecation.md @@ -16,13 +16,13 @@ have any problems converting, please contact us via: | -------------------------------- | --------- | | `BUILD_AUX_EXECUTABLE` | Error | | `BUILD_AUX_STATIC_LIBRARY` | Error | -| `BUILD_COPY_HEADERS` | Warning | -| `BUILD_HOST_EXECUTABLE` | Warning | +| `BUILD_COPY_HEADERS` | Error | +| `BUILD_HOST_EXECUTABLE` | Error | | `BUILD_HOST_FUZZ_TEST` | Error | | `BUILD_HOST_NATIVE_TEST` | Error | -| `BUILD_HOST_SHARED_LIBRARY` | Warning | +| `BUILD_HOST_SHARED_LIBRARY` | Error | | `BUILD_HOST_SHARED_TEST_LIBRARY` | Error | -| `BUILD_HOST_STATIC_LIBRARY` | Warning | +| `BUILD_HOST_STATIC_LIBRARY` | Error | | `BUILD_HOST_STATIC_TEST_LIBRARY` | Error | | `BUILD_HOST_TEST_CONFIG` | Error | | `BUILD_NATIVE_BENCHMARK` | Error | diff --git a/core/board_config.mk b/core/board_config.mk index a7879583b4..8ff16e2592 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -624,16 +624,16 @@ endif ########################################### # Handle BUILD_BROKEN_USES_BUILD_* -$(foreach m,$(filter-out BUILD_COPY_HEADERS,$(DEFAULT_WARNING_BUILD_MODULE_TYPES)),\ +$(foreach m,$(DEFAULT_WARNING_BUILD_MODULE_TYPES),\ $(if $(filter false,$(BUILD_BROKEN_USES_$(m))),\ $(KATI_obsolete_var $(m),Please convert to Soong),\ $(KATI_deprecated_var $(m),Please convert to Soong))) -$(if $(filter false,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ - $(KATI_obsolete_var BUILD_COPY_HEADERS,See $(CHANGES_URL)#copy_headers),\ - $(KATI_deprecated_var BUILD_COPY_HEADERS,See $(CHANGES_URL)#copy_headers)) +$(if $(filter true,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ + $(KATI_deprecated_var BUILD_COPY_HEADERS,See $(CHANGES_URL)#copy_headers),\ + $(KATI_obsolete_var BUILD_COPY_HEADERS,See $(CHANGES_URL)#copy_headers)) -$(foreach m,$(DEFAULT_ERROR_BUILD_MODULE_TYPES),\ +$(foreach m,$(filter-out BUILD_COPY_HEADERS,$(DEFAULT_ERROR_BUILD_MODULE_TYPES)),\ $(if $(filter true,$(BUILD_BROKEN_USES_$(m))),\ $(KATI_deprecated_var $(m),Please convert to Soong),\ $(KATI_obsolete_var $(m),Please convert to Soong))) diff --git a/core/deprecation.mk b/core/deprecation.mk index cc620a32d3..19bd4cfb94 100644 --- a/core/deprecation.mk +++ b/core/deprecation.mk @@ -24,10 +24,6 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ # relevant BUILD_BROKEN_USES_BUILD_* variables, then these would move to # DEFAULT_ERROR_BUILD_MODULE_TYPES. DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \ - BUILD_COPY_HEADERS \ - BUILD_HOST_EXECUTABLE \ - BUILD_HOST_SHARED_LIBRARY \ - BUILD_HOST_STATIC_LIBRARY \ # These are BUILD_* variables that are errors to reference, but you can set # BUILD_BROKEN_USES_BUILD_* in your BoardConfig.mk in order to turn them back @@ -35,8 +31,12 @@ DEFAULT_WARNING_BUILD_MODULE_TYPES :=$= \ DEFAULT_ERROR_BUILD_MODULE_TYPES :=$= \ BUILD_AUX_EXECUTABLE \ BUILD_AUX_STATIC_LIBRARY \ + BUILD_COPY_HEADERS \ + BUILD_HOST_EXECUTABLE \ BUILD_HOST_FUZZ_TEST \ BUILD_HOST_NATIVE_TEST \ + BUILD_HOST_SHARED_LIBRARY \ + BUILD_HOST_STATIC_LIBRARY \ BUILD_HOST_STATIC_TEST_LIBRARY \ BUILD_HOST_TEST_CONFIG \ BUILD_NATIVE_BENCHMARK \ diff --git a/core/host_shared_library.mk b/core/host_shared_library.mk index c22af97a27..fbe6442e27 100644 --- a/core/host_shared_library.mk +++ b/core/host_shared_library.mk @@ -38,6 +38,8 @@ my_module_arch_supported := ## Copy headers to the install tree ########################################################### ifdef LOCAL_COPY_HEADERS -$(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers) +$(if $(filter true,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ + $(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers),\ + $(call pretty-error,LOCAL_COPY_HEADERS is obsolete. See $(CHANGES_URL)#copy_headers)) include $(BUILD_SYSTEM)/copy_headers.mk endif diff --git a/core/host_static_library.mk b/core/host_static_library.mk index 3dbd144961..23d809c689 100644 --- a/core/host_static_library.mk +++ b/core/host_static_library.mk @@ -38,6 +38,8 @@ my_module_arch_supported := ## Copy headers to the install tree ########################################################### ifdef LOCAL_COPY_HEADERS -$(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers) +$(if $(filter true,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ + $(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers),\ + $(call pretty-error,LOCAL_COPY_HEADERS is obsolete. See $(CHANGES_URL)#copy_headers)) include $(BUILD_SYSTEM)/copy_headers.mk endif diff --git a/core/shared_library.mk b/core/shared_library.mk index ca17151c41..29d8276a05 100644 --- a/core/shared_library.mk +++ b/core/shared_library.mk @@ -57,6 +57,8 @@ my_module_arch_supported := ## Copy headers to the install tree ########################################################### ifdef LOCAL_COPY_HEADERS -$(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers) +$(if $(filter true,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ + $(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers),\ + $(call pretty-error,LOCAL_COPY_HEADERS is obsolete. See $(CHANGES_URL)#copy_headers)) include $(BUILD_SYSTEM)/copy_headers.mk endif diff --git a/core/static_library.mk b/core/static_library.mk index 78908cf37f..a450092693 100644 --- a/core/static_library.mk +++ b/core/static_library.mk @@ -42,6 +42,8 @@ my_module_arch_supported := ## Copy headers to the install tree ########################################################### ifdef LOCAL_COPY_HEADERS -$(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers) +$(if $(filter true,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ + $(call pretty-warning,LOCAL_COPY_HEADERS is deprecated. See $(CHANGES_URL)#copy_headers),\ + $(call pretty-error,LOCAL_COPY_HEADERS is obsolete. See $(CHANGES_URL)#copy_headers)) include $(BUILD_SYSTEM)/copy_headers.mk endif From acc36ed34805afa1ecc648a98ca2b5bc88b6b65c Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Mon, 16 Mar 2020 02:15:38 +0000 Subject: [PATCH 15/23] Version bump to QQ3A.200316.002 [core/build_id.mk] Change-Id: Ib2db7d2bd0c6c662ba11f85ac4e67d5fb236e699 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index a6fa89e4a8..c76ccaf9f9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QQ3A.200316.001 +BUILD_ID=QQ3A.200316.002 From db9b1bd6fd1ca980aca3df8971124682da9c1beb Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Tue, 17 Mar 2020 20:47:15 +0000 Subject: [PATCH 16/23] Update Security String to 2020-05-01 Bug: 151752725 Change-Id: Ief4b514032bfad1fad1a81c68b4f5e360569f105 --- 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 4f8713f282..5dd68b6dd2 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -250,7 +250,7 @@ ifndef PLATFORM_SECURITY_PATCH # 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 := 2020-04-05 + PLATFORM_SECURITY_PATCH := 2020-05-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From ccf6b9f6b931da6a3ee77479e7e3af4d0f855c85 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Thu, 19 Mar 2020 04:27:17 +0000 Subject: [PATCH 17/23] Version bump to QQ3A.200319.002 [core/build_id.mk] Change-Id: I5a15c5b0c1cf07078529c8acc8bf620e90c42e22 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index ff798adb92..d56d088cef 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QQ3A.200319.001 +BUILD_ID=QQ3A.200319.002 From 776c7293fa68eb18cb6c79137c987a05157e983a Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Thu, 19 Mar 2020 04:40:14 +0000 Subject: [PATCH 18/23] Update Security String to 2020-05-05 Bug: 151752725 Change-Id: I4393eea75a53f90e23a53020b4a551228564e3cc --- 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 5dd68b6dd2..c82307772c 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -250,7 +250,7 @@ ifndef PLATFORM_SECURITY_PATCH # 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 := 2020-05-01 + PLATFORM_SECURITY_PATCH := 2020-05-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From a7e895e5fa3c076f45bf56fae5a3b7d124996a63 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Wed, 18 Mar 2020 14:04:19 -0700 Subject: [PATCH 19/23] Remove crash_dump from PRODUCT_PACKAGES. Was causing build failures now that crash_dump has been moved to an apex. Bug: 151857642 Change-Id: I86ae8a57c68c8928ac954d594f3bef0fea84c56e Merged-In: I86ae8a57c68c8928ac954d594f3bef0fea84c56e --- target/product/base_system.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 9748ef32cf..52a5da6bc0 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -64,7 +64,6 @@ PRODUCT_PACKAGES += \ com.android.tzdata \ ContactsProvider \ content \ - crash_dump \ debuggerd\ device_config \ dmctl \ From 7d3524fbbbe3d0db73170e41ac71e1ad7b841e80 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Fri, 10 Apr 2020 02:37:11 +0000 Subject: [PATCH 20/23] Version bump to QQ3A.200410.002 [core/build_id.mk] Change-Id: I366757506c7187a8339debeb7aa100c5a0083e06 --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 037b461264..aa74e16c68 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QQ3A.200410.001 +BUILD_ID=QQ3A.200410.002 From ae9b194cee8253f8da42ac3cd06f27cafc643d7b Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Mon, 13 Apr 2020 18:48:49 +0000 Subject: [PATCH 21/23] Update Security String to 2020-06-01 Bug: 153882927 Change-Id: Ibae64bd6c82ddb1afc801550fd7c4ac7bceeb4cc (cherry picked from commit 388e6839348f6b4b66e099ab00d0d2f08304e761) --- 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 c82307772c..af9ab6b711 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -250,7 +250,7 @@ ifndef PLATFORM_SECURITY_PATCH # 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 := 2020-05-05 + PLATFORM_SECURITY_PATCH := 2020-06-01 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 609eb2ae7b03385ef2987f9d9011dc7367ed7786 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Mon, 13 Apr 2020 23:40:33 +0000 Subject: [PATCH 22/23] Update Security String to 2020-06-05 Bug: 153882927 Change-Id: I115a68d442f4f3922f0353fae1aae3bf1c057903 (cherry picked from commit a52a320ffd1c74fc87c4d33c367fda8d9224e5a2) --- 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 af9ab6b711..70a8f087e8 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -250,7 +250,7 @@ ifndef PLATFORM_SECURITY_PATCH # 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 := 2020-06-01 + PLATFORM_SECURITY_PATCH := 2020-06-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH From 6c86a509d1d184fdca6a9e0c1eb03a2a0c7e4d57 Mon Sep 17 00:00:00 2001 From: android-build-team Robot Date: Wed, 22 Apr 2020 00:53:22 +0000 Subject: [PATCH 23/23] Version bump to QQ3A.200605.002 [core/build_id.mk] Change-Id: Id42329c0e71a750d7634ac6860c696bb26bacb5b --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0f3ed7b33f..4b840b44cc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QQ3A.200605.001 +BUILD_ID=QQ3A.200605.002