Handle zygote_32_64 in gsi_release.mk
64 bits GSI expects supporting both zygote_64_32 and zygote_32_64. The patch adds including init.zygote32_64.rc in gsi_release.mk direclty, and also revises all GSI releasing build targets. Bug: 138625977 Test: build aosp_arm64-userdebug and has init.zygote32_64.rc Test: build aosp_arm-userdebug and no init.zygote32_64.rc Change-Id: Ia61db1315321798bae8902b35ddaa5e5f3e7dd3e
This commit is contained in:
parent
58df13daa0
commit
bcd7741e81
|
@ -40,7 +40,6 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
|
|||
endif
|
||||
|
||||
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
|
||||
root/init.zygote32_64.rc \
|
||||
root/init.zygote64_32.rc \
|
||||
|
||||
#
|
||||
|
@ -60,14 +59,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
|
|||
#
|
||||
ifeq (aosp_arm64,$(TARGET_PRODUCT))
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
|
||||
|
||||
# Copy 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
|
||||
# init.zygote64_32.rc is in the core_64_bit.mk below
|
||||
PRODUCT_COPY_FILES += \
|
||||
system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc
|
||||
endif
|
||||
|
||||
|
||||
|
|
|
@ -40,7 +40,6 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
|
|||
endif
|
||||
|
||||
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
|
||||
root/init.zygote32_64.rc \
|
||||
root/init.zygote64_32.rc \
|
||||
|
||||
#
|
||||
|
@ -60,14 +59,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
|
|||
#
|
||||
ifeq (aosp_x86_64,$(TARGET_PRODUCT))
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
|
||||
|
||||
# Copy 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
|
||||
# init.zygote64_32.rc is in the core_64_bit.mk below
|
||||
PRODUCT_COPY_FILES += \
|
||||
system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc
|
||||
endif
|
||||
|
||||
|
||||
|
|
|
@ -24,7 +24,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
|
|||
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
|
||||
|
||||
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
|
||||
root/init.zygote32_64.rc \
|
||||
root/init.zygote64_32.rc \
|
||||
|
||||
#
|
||||
|
@ -37,14 +36,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
|
|||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
|
||||
|
||||
# Copy 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
|
||||
# init.zygote64_32.rc is in the core_64_bit.mk below
|
||||
PRODUCT_COPY_FILES += \
|
||||
system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc
|
||||
|
||||
|
||||
PRODUCT_NAME := gsi_arm64
|
||||
PRODUCT_DEVICE := gsi_arm64
|
||||
|
|
|
@ -56,3 +56,19 @@ PRODUCT_COPY_FILES += \
|
|||
|
||||
# Support addtional P VNDK packages
|
||||
PRODUCT_EXTRA_VNDK_VERSIONS := 28
|
||||
|
||||
# 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
|
||||
|
|
Loading…
Reference in New Issue