From c0b883fe77d1f9b0a0d8b02fdf7199b9c730fd28 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Wed, 23 Oct 2019 12:54:09 +0900 Subject: [PATCH] Add zygote init script to mainline_system.mk We may add all possible scripts to "root" to clean up the whitelists of mainline devices. One of the zygote init scripts is selected by "ro.zygote" property. Bug: 143121605 Test: build test for all device targets Change-Id: I4435f1c48a306c3a8d42522ed780d405a32780b4 --- target/product/aosp_arm64.mk | 3 --- target/product/aosp_x86_64.mk | 3 --- target/product/gsi_arm64.mk | 3 --- target/product/gsi_release.mk | 16 ---------------- target/product/mainline_arm64.mk | 2 -- target/product/mainline_system.mk | 7 +++++++ target/product/mainline_system_arm64.mk | 2 -- target/product/sdk_phone_x86_64.mk | 3 --- 8 files changed, 7 insertions(+), 32 deletions(-) diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index cc4785a24..dda805fdd 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -39,9 +39,6 @@ ifeq (aosp_arm64,$(TARGET_PRODUCT)) PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed endif -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - root/init.zygote64_32.rc \ - # # All components inherited here go to product image # diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index a47170207..153f499a6 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -39,9 +39,6 @@ ifeq (aosp_x86_64,$(TARGET_PRODUCT)) PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed endif -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - root/init.zygote64_32.rc \ - # # All components inherited here go to product image # diff --git a/target/product/gsi_arm64.mk b/target/product/gsi_arm64.mk index 09fb633c7..645bc3add 100644 --- a/target/product/gsi_arm64.mk +++ b/target/product/gsi_arm64.mk @@ -23,9 +23,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) # Enable mainline checking PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - root/init.zygote64_32.rc \ - # # All components inherited here go to product image # diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index cab391638..faaa9351c 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -51,19 +51,3 @@ PRODUCT_PACKAGES += \ # Support addtional P and Q VNDK packages PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 - -# The 64 bits GSI build targets inhiert core_64_bit.mk to enable 64 bits and -# include the init.zygote64_32.rc. -# 64 bits GSI for releasing need to includes different zygote settings for -# vendor.img to select by setting property ro.zygote=zygote64_32 or -# ro.zygote=zygote32_64: -# 1. 64-bit primary, 32-bit secondary, or -# 2. 32-bit primary, 64-bit secondary -# Here includes the init.zygote32_64.rc if it had inhierted core_64_bit.mk. -ifeq (true|true,$(TARGET_SUPPORTS_32_BIT_APPS)|$(TARGET_SUPPORTS_64_BIT_APPS)) -PRODUCT_COPY_FILES += \ - system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc - -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - root/init.zygote32_64.rc -endif diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk index 6d998d660..666ce4189 100644 --- a/target/product/mainline_arm64.mk +++ b/target/product/mainline_arm64.mk @@ -26,8 +26,6 @@ PRODUCT_SHIPPING_API_LEVEL := 28 PRODUCT_RESTRICT_VENDOR_FILES := all PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - root/init.zygote64_32.rc \ # Modules that should probably be moved to /product PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk index cd6a0f785..f7eb8ad5b 100644 --- a/target/product/mainline_system.mk +++ b/target/product/mainline_system.mk @@ -110,6 +110,13 @@ PRODUCT_PACKAGES_DEBUG += \ PRODUCT_HOST_PACKAGES += \ tinyplay +# Include all zygote init scripts. "ro.zygote" will select one of them. +PRODUCT_COPY_FILES += \ + system/core/rootdir/init.zygote32.rc:root/init.zygote32.rc \ + system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc \ + system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc \ + system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc + # Enable dynamic partition size PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true diff --git a/target/product/mainline_system_arm64.mk b/target/product/mainline_system_arm64.mk index 403137169..6249068b8 100644 --- a/target/product/mainline_system_arm64.mk +++ b/target/product/mainline_system_arm64.mk @@ -23,8 +23,6 @@ $(call enforce-product-packages-exist,) # Enable mainline checking PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - root/init.zygote64_32.rc \ PRODUCT_BUILD_CACHE_IMAGE := false PRODUCT_BUILD_ODM_IMAGE := false diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index 267796f39..2d0d6e138 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.mk @@ -27,9 +27,6 @@ ifeq (sdk_phone_x86_64,$(TARGET_PRODUCT)) PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed endif -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - root/init.zygote64_32.rc \ - # # All components inherited here go to product image #