commit 061479c528593ea629584f5c8dce85a80b3c4f0f
author Trevor Radcliffe <tradical@google.com> Tue Aug 16 18:26:32 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 16 18:26:32 2022 +0000
tree 20a5db6cece2a3f4f14f3e4b2c13a398c48f527d
parent 2abfe5f3a356d7e53b561f783c6d9c7d3d468733
parent c9e72668a0c11cca24f79fe116686aa61a1be7de

Merge "Add note to Changes.md about sysprop changes"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index d8400de..bf31125 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -963,6 +963,8 @@
   $(if $(1),--partition_size $(1),--dynamic_partition_size)
 endef
 
+ifndef BOARD_PREBUILT_BOOTIMAGE
+
 ifneq ($(strip $(TARGET_NO_KERNEL)),true)
 INTERNAL_BOOTIMAGE_ARGS := \
 	$(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET))
@@ -1180,7 +1182,10 @@
 endif # BUILDING_BOOT_IMAGE
 
 else # TARGET_NO_KERNEL == "true"
-ifdef BOARD_PREBUILT_BOOTIMAGE
+INSTALLED_BOOTIMAGE_TARGET :=
+endif # TARGET_NO_KERNEL
+
+else # BOARD_PREBUILT_BOOTIMAGE defined
 INTERNAL_PREBUILT_BOOTIMAGE := $(BOARD_PREBUILT_BOOTIMAGE)
 INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img
 
@@ -1202,10 +1207,8 @@
 	cp $(INTERNAL_PREBUILT_BOOTIMAGE) $@
 endif # BOARD_AVB_ENABLE
 
-else # BOARD_PREBUILT_BOOTIMAGE not defined
-INSTALLED_BOOTIMAGE_TARGET :=
 endif # BOARD_PREBUILT_BOOTIMAGE
-endif # TARGET_NO_KERNEL
+
 endif # my_installed_prebuilt_gki_apex not defined
 
 my_apex_extracted_boot_image :=

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index bf3966a..8082831 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -803,6 +803,7 @@
 else
   MAINLINE_SEPOLICY_DEV_CERTIFICATES := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))
 endif
+.KATI_READONLY := MAINLINE_SEPOLICY_DEV_CERTIFICATES
 
 BUILD_NUMBER_FROM_FILE := $$(cat $(SOONG_OUT_DIR)/build_number.txt)
 BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE))

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index e975d8a..28ceebd 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -94,6 +94,7 @@
 $(call add_json_list, AAPTPrebuiltDPI,                   $(PRODUCT_AAPT_PREBUILT_DPI))
 
 $(call add_json_str,  DefaultAppCertificate,             $(PRODUCT_DEFAULT_DEV_CERTIFICATE))
+$(call add_json_str,  MainlineSepolicyDevCertificates,   $(MAINLINE_SEPOLICY_DEV_CERTIFICATES))
 
 $(call add_json_str,  AppsDefaultVersionName,            $(APPS_DEFAULT_VERSION_NAME))
 

tools/releasetools/ota_utils.py

diff --git a/tools/releasetools/ota_utils.py b/tools/releasetools/ota_utils.py
index ef1dca2..12acc13 100644
--- a/tools/releasetools/ota_utils.py
+++ b/tools/releasetools/ota_utils.py
@@ -16,6 +16,7 @@
 import itertools
 import logging
 import os
+import shutil
 import struct
 import zipfile
 
@@ -119,7 +120,7 @@
 
   # Re-sign the package after updating the metadata entry.
   if OPTIONS.no_signing:
-    output_file = prelim_signing
+    shutil.copy(prelim_signing, output_file)
   else:
     SignOutput(prelim_signing, output_file)