diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-22 20:50:41 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-03-22 21:00:44 +0000 |
commit | cf42612f0588671825ece3415ba9b0d9e2c4fa97 (patch) | |
tree | 871161f4b93bc516532302d037e53c1286eaf271 | |
parent | 7f40f97c0857da42285dec347d7062325e31cfc3 (diff) | |
parent | d5448e513ecda039666b33b8f5841cd5aafabe78 (diff) | |
download | build-android-platform-11.0.0_r5.tar.gz |
Make change and version bump to RPM1.210322.001android-platform-11.0.0_r5
Change-Id: Ia8a5fb70894a60faf9132686d3868d08858e893c
-rw-r--r-- | core/Makefile | 14 | ||||
-rw-r--r-- | core/build_id.mk | 2 | ||||
-rw-r--r-- | core/rbe.mk | 2 | ||||
-rw-r--r-- | core/version_defaults.mk | 2 | ||||
-rw-r--r-- | target/product/runtime_libart.mk | 7 | ||||
-rwxr-xr-x | tools/releasetools/validate_target_files.py | 15 |
6 files changed, 29 insertions, 13 deletions
diff --git a/core/Makefile b/core/Makefile index 45ad60f416..3e748eb2dc 100644 --- a/core/Makefile +++ b/core/Makefile @@ -420,13 +420,6 @@ $(intermediate_system_build_prop): $(BUILDINFO_SH) $(BUILDINFO_COMMON_SH) $(INTE @echo Target buildinfo: $@ @mkdir -p $(dir $@) $(hide) echo > $@ -ifneq ($(PRODUCT_OEM_PROPERTIES),) - $(hide) echo "#" >> $@; \ - echo "# PRODUCT_OEM_PROPERTIES" >> $@; \ - echo "#" >> $@; - $(hide) $(foreach prop,$(PRODUCT_OEM_PROPERTIES), \ - echo "import /oem/oem.prop $(prop)" >> $@;) -endif $(hide) PRODUCT_BRAND="$(PRODUCT_SYSTEM_BRAND)" \ PRODUCT_MANUFACTURER="$(PRODUCT_SYSTEM_MANUFACTURER)" \ PRODUCT_MODEL="$(PRODUCT_SYSTEM_MODEL)" \ @@ -605,6 +598,13 @@ $(INSTALLED_PRODUCT_BUILD_PROP_TARGET): $(BUILDINFO_COMMON_SH) $(POST_PROCESS_PR $(hide) $(foreach line,$(FINAL_PRODUCT_PROPERTIES), \ echo "$(line)" >> $@;) $(hide) $(POST_PROCESS_PROPS) $@ +ifneq ($(PRODUCT_OEM_PROPERTIES),) + $(hide) echo "#" >> $@; \ + echo "# PRODUCT_OEM_PROPERTIES" >> $@; \ + echo "#" >> $@; + $(hide) $(foreach prop,$(PRODUCT_OEM_PROPERTIES), \ + echo "import /oem/oem.prop $(prop)" >> $@;) +endif # ---------------------------------------------------------------- # odm build.prop diff --git a/core/build_id.mk b/core/build_id.mk index 32c94476f7..17bfa93e45 100644 --- a/core/build_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=RPM1.210315.001 +BUILD_ID=RPM1.210322.001 diff --git a/core/rbe.mk b/core/rbe.mk index cfad09cf6e..040ac0b19d 100644 --- a/core/rbe.mk +++ b/core/rbe.mk @@ -57,7 +57,7 @@ ifneq ($(filter-out false,$(USE_RBE)),) java_r8_d8_platform := $(platform)",Pool=java16" RBE_WRAPPER := $(rbe_dir)/rewrapper - RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_whitelist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform="$(cxx_platform)" --compare="$(cxx_compare)" + RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_allowlist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform=$(cxx_platform) --compare=$(cxx_compare) # Append rewrapper to existing *_WRAPPER variables so it's possible to # use both ccache and rewrapper. diff --git a/core/version_defaults.mk b/core/version_defaults.mk index e610490f44..e83b8b02be 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -240,7 +240,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 := 2021-02-05 + PLATFORM_SECURITY_PATCH := 2021-04-05 endif .KATI_READONLY := PLATFORM_SECURITY_PATCH diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index ad361dc09e..693b686fbb 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -92,8 +92,9 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ dalvik.vm.minidebuginfo=true \ dalvik.vm.dex2oat-minidebuginfo=true -# Enable iorapd by default +PRODUCT_USES_DEFAULT_ART_CONFIG := true + +# Disable iorapd by default PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - ro.iorapd.enable=true + ro.iorapd.enable=false -PRODUCT_USES_DEFAULT_ART_CONFIG := true diff --git a/tools/releasetools/validate_target_files.py b/tools/releasetools/validate_target_files.py index ac469eb685..c260aced67 100755 --- a/tools/releasetools/validate_target_files.py +++ b/tools/releasetools/validate_target_files.py @@ -236,6 +236,15 @@ def ValidateInstallRecoveryScript(input_tmp, info_dict): logging.info('Done checking %s', script_path) +# Symlink files in `src` to `dst`, if the files do not +# already exists in `dst` directory. +def symlinkIfNotExists(src, dst): + if not os.path.isdir(src): + return + for filename in os.listdir(src): + if os.path.exists(os.path.join(dst, filename)): + continue + os.symlink(os.path.join(src, filename), os.path.join(dst, filename)) def ValidateVerifiedBootImages(input_tmp, info_dict, options): """Validates the Verified Boot related images. @@ -257,6 +266,12 @@ def ValidateVerifiedBootImages(input_tmp, info_dict, options): Raises: AssertionError: On any verification failure. """ + # See bug 159299583 + # After commit 5277d1015, some images (e.g. acpio.img and tos.img) are no + # longer copied from RADIO to the IMAGES folder. But avbtool assumes that + # images are in IMAGES folder. So we symlink them. + symlinkIfNotExists(os.path.join(input_tmp, "RADIO"), + os.path.join(input_tmp, "IMAGES")) # Verified boot 1.0 (images signed with boot_signer and verity_signer). if info_dict.get('boot_signer') == 'true': logging.info('Verifying Verified Boot images...') |