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

Commit 6972e648 authored by Justin Yun's avatar Justin Yun Committed by android-build-merger
Browse files

Merge "Add zygote init script to mainline_system.mk" am: e8d9df12 am: 7b33d3bc 

am: 5f4ae378

Change-Id: Id0eaeb18b16d5f479396770c8784952cb89abe6f
parents 7d4d58b9 5f4ae378

target/product/aosp_arm64.mk

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

#

target/product/aosp_x86_64.mk

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

#

target/product/gsi_arm64.mk

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

#

target/product/gsi_release.mk

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

target/product/mainline_arm64.mk

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ PRODUCT_SHIPPING_API_LEVEL := 28 
PRODUCT_RESTRICT_VENDOR_FILES := owner



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 += \