Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c016c281 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Handle zygote_32_64 in gsi_release.mk"

parents 1bc828c9 bcd7741e

target/product/aosp_arm64.mk

+0 −9
Original line number Diff line number Diff line
@@ -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

target/product/aosp_x86_64.mk

+0 −9
Original line number Diff line number Diff line
@@ -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

target/product/gsi_arm64.mk

+0 −9
Original line number Diff line number Diff line
@@ -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

target/product/gsi_release.mk

+16 −0
Original line number Diff line number Diff line
@@ -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