Merge "Remove media_cmd from product packages"
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 3d9a1ef..76bc0c5 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -613,6 +613,8 @@
# Clean up old location of system_other.avbpubkey
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/security/avb/)
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/super.img)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/core/Makefile b/core/Makefile
index 4def109..97bbebe 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2166,7 +2166,7 @@
# libicuuc.so
# libnativehelper.so - cf_x86_phone-userdebug builds get this in system/lib/arm
# libprofile.so
-# libsigchain.so
+# libsigchain.so - cf_x86_phone-userdebug builds get this in system/lib/arm
# libtombstoned_client.so
APEX_MODULE_LIBS= \
libadbconnection.so \
@@ -4427,7 +4427,7 @@
endef
ifneq (true,$(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS))
-INSTALLED_SUPERIMAGE_TARGET := $(PRODUCT_OUT)/super.img
+INSTALLED_SUPERIMAGE_TARGET := $(call intermediates-dir-for,PACKAGING,super.img)/super.img
$(INSTALLED_SUPERIMAGE_TARGET): extracted_input_target_files := $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE))
$(INSTALLED_SUPERIMAGE_TARGET): $(LPMAKE) $(BUILT_TARGET_FILES_PACKAGE) $(BUILD_SUPER_IMAGE)
$(call pretty,"Target super fs image: $@")
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 5adb0e7..ec463f7 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -165,7 +165,6 @@
libradio_metadata \
librtp_jni \
libsensorservice \
- libsigchain \
libskia \
libsonic \
libsonivox \
diff --git a/target/product/gsi_keys.mk b/target/product/gsi_keys.mk
new file mode 100644
index 0000000..5a814db
--- /dev/null
+++ b/target/product/gsi_keys.mk
@@ -0,0 +1,22 @@
+#
+# Copyright (C) 2019 The Android Open-Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Include GSI keys into first-stage ramdisk, so we can enable verified
+# boot when booting a GSI.
+PRODUCT_PACKAGES += \
+ q-gsi.avbpubkey \
+ r-gsi.avbpubkey \
+ s-gsi.avbpubkey \
diff --git a/tools/releasetools/merge_target_files.py b/tools/releasetools/merge_target_files.py
index 3c6bfbf..3b72551 100755
--- a/tools/releasetools/merge_target_files.py
+++ b/tools/releasetools/merge_target_files.py
@@ -47,6 +47,9 @@
--rebuild_recovery
Rebuild the recovery patch used by non-A/B devices and write it to the
system image.
+
+ --keep-tmp
+ Keep tempoary files for debugging purposes.
"""
from __future__ import print_function
@@ -296,6 +299,37 @@
output.write('%s\n' % partition)
+def append_recovery_to_filesystem_config(output_target_files_temp_dir):
+ """Perform special processing for META/filesystem_config.txt
+
+ This function appends recovery information to META/filesystem_config.txt
+ so that recovery patch regeneration will succeed.
+
+ Args:
+ output_target_files_temp_dir: The name of a directory that will be used
+ to create the output target files package after all the special cases
+ are processed. We find filesystem_config.txt here.
+ """
+
+ filesystem_config_txt = os.path.join(
+ output_target_files_temp_dir,
+ 'META',
+ 'filesystem_config.txt')
+
+ with open(filesystem_config_txt, 'a') as f:
+ # TODO(bpeckham) this data is hard coded. It should be generated
+ # programmatically.
+ f.write(
+ 'system/bin/install-recovery.sh 0 0 750 '
+ 'selabel=u:object_r:install_recovery_exec:s0 capabilities=0x0\n')
+ f.write(
+ 'system/recovery-from-boot.p 0 0 644 '
+ 'selabel=u:object_r:system_file:s0 capabilities=0x0\n')
+ f.write(
+ 'system/etc/recovery.img 0 0 440 '
+ 'selabel=u:object_r:install_recovery_exec:s0 capabilities=0x0\n')
+
+
def process_misc_info_txt(
system_target_files_temp_dir,
other_target_files_temp_dir,
@@ -454,7 +488,9 @@
system_target_files_temp_dir,
other_target_files_temp_dir,
output_target_files_temp_dir,
- system_misc_info_keys):
+ system_misc_info_keys,
+ rebuild_recovery
+):
"""Perform special-case processing for certain target files items.
Certain files in the output target files package require special-case
@@ -476,12 +512,20 @@
system_misc_info_keys: A list of keys to obtain from the system instance
of META/misc_info.txt. The remaining keys from the other instance.
+
+ rebuild_recovery: If true, rebuild the recovery patch used by non-A/B
+ devices and write it to the system image.
"""
- process_ab_partitions_txt(
- system_target_files_temp_dir=system_target_files_temp_dir,
- other_target_files_temp_dir=other_target_files_temp_dir,
- output_target_files_temp_dir=output_target_files_temp_dir)
+ if 'ab_update' in system_misc_info_keys:
+ process_ab_partitions_txt(
+ system_target_files_temp_dir=system_target_files_temp_dir,
+ other_target_files_temp_dir=other_target_files_temp_dir,
+ output_target_files_temp_dir=output_target_files_temp_dir)
+
+ if rebuild_recovery:
+ append_recovery_to_filesystem_config(
+ output_target_files_temp_dir=output_target_files_temp_dir)
process_misc_info_txt(
system_target_files_temp_dir=system_target_files_temp_dir,
@@ -599,7 +643,8 @@
system_target_files_temp_dir=system_target_files_temp_dir,
other_target_files_temp_dir=other_target_files_temp_dir,
output_target_files_temp_dir=output_target_files_temp_dir,
- system_misc_info_keys=system_misc_info_keys)
+ system_misc_info_keys=system_misc_info_keys,
+ rebuild_recovery=rebuild_recovery)
# Regenerate IMAGES in the temporary directory.
@@ -704,7 +749,7 @@
OPTIONS.output_target_files = a
elif o == '--rebuild_recovery':
OPTIONS.rebuild_recovery = True
- elif o == '--keep_tmp':
+ elif o == '--keep-tmp':
OPTIONS.keep_tmp = True
else:
return False
@@ -720,7 +765,7 @@
'other-item-list=',
'output-target-files=',
'rebuild_recovery',
- "keep_tmp",
+ 'keep-tmp',
],
extra_option_handler=option_handler)