p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add zygote init script to mainline_system.mk" 

am: e8d9df122a

Change-Id: I1592d2c2d93d68bed578de2be7ac5fab3a74af2b
This commit is contained in:
Justin Yun 2019-10-28 23:47:24 -07:00 committed by android-build-merger
parent 6f6811bc7c e8d9df122a
commit 7b33d3bcc0
8 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/product/aosp_arm64.mk
View File

@ -39,9 +39,6 @@ ifeq (aosp_arm64,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif endif
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
root/init.zygote64_32.rc \
# #
# All components inherited here go to product image # All components inherited here go to product image
# #

3
target/product/aosp_x86_64.mk
View File

@ -39,9 +39,6 @@ ifeq (aosp_x86_64,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif endif
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
root/init.zygote64_32.rc \
# #
# All components inherited here go to product image # All components inherited here go to product image
# #

3
target/product/gsi_arm64.mk
View File

@ -23,9 +23,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
# Enable mainline checking # Enable mainline checking
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
root/init.zygote64_32.rc \
# #
# All components inherited here go to product image # All components inherited here go to product image
# #

16
target/product/gsi_release.mk
View File

@ -51,19 +51,3 @@ PRODUCT_PACKAGES += \
# Support addtional P and Q VNDK packages # Support addtional P and Q VNDK packages
PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 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

2
target/product/mainline_arm64.mk
View File

@ -26,8 +26,6 @@ PRODUCT_SHIPPING_API_LEVEL := 28
PRODUCT_RESTRICT_VENDOR_FILES := all PRODUCT_RESTRICT_VENDOR_FILES := all
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
root/init.zygote64_32.rc \
# Modules that should probably be moved to /product # Modules that should probably be moved to /product
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \

7
target/product/mainline_system.mk
View File

@ -110,6 +110,13 @@ PRODUCT_PACKAGES_DEBUG += \
PRODUCT_HOST_PACKAGES += \ PRODUCT_HOST_PACKAGES += \
tinyplay 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 # Enable dynamic partition size
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true

2
target/product/mainline_system_arm64.mk
View File

@ -23,8 +23,6 @@ $(call enforce-product-packages-exist,)
# Enable mainline checking # Enable mainline checking
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
root/init.zygote64_32.rc \
PRODUCT_BUILD_CACHE_IMAGE := false PRODUCT_BUILD_CACHE_IMAGE := false
PRODUCT_BUILD_ODM_IMAGE := false PRODUCT_BUILD_ODM_IMAGE := false

3
target/product/sdk_phone_x86_64.mk
View File

@ -27,9 +27,6 @@ ifeq (sdk_phone_x86_64,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif endif
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
root/init.zygote64_32.rc \
# #
# All components inherited here go to product image # All components inherited here go to product image
# #