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

Commit b972aca9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move ro.zygote to vendor" am: 0de3a8b9 

Original change: https://android-review.googlesource.com/c/platform/build/+/1510909

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fe372ac6754d03d12fc030bbb3a7e5c55017918
parents a88a997a 0de3a8b9

target/product/base_system.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -341,7 +341,7 @@ PRODUCT_COPY_FILES += \ 
    system/core/rootdir/etc/hosts:system/etc/hosts

    system/core/rootdir/etc/hosts:system/etc/hosts





PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc

PRODUCT_COPY_FILES += system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc

PRODUCT_SYSTEM_PROPERTIES += ro.zygote?=zygote32

PRODUCT_VENDOR_PROPERTIES += ro.zygote?=zygote32





PRODUCT_SYSTEM_PROPERTIES += debug.atrace.tags.enableflags=0

PRODUCT_SYSTEM_PROPERTIES += debug.atrace.tags.enableflags=0

PRODUCT_SYSTEM_PROPERTIES += persist.traced.enable=1

PRODUCT_SYSTEM_PROPERTIES += persist.traced.enable=1

target/product/core_64_bit.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw 




# Set the zygote property to select the 64-bit primary, 32-bit secondary script

# Set the zygote property to select the 64-bit primary, 32-bit secondary script

# This line must be parsed before the one in core_minimal.mk

# This line must be parsed before the one in core_minimal.mk

PRODUCT_SYSTEM_PROPERTIES += ro.zygote=zygote64_32

PRODUCT_VENDOR_PROPERTIES += ro.zygote=zygote64_32





TARGET_SUPPORTS_32_BIT_APPS := true

TARGET_SUPPORTS_32_BIT_APPS := true

TARGET_SUPPORTS_64_BIT_APPS := true
 
TARGET_SUPPORTS_64_BIT_APPS := true

target/product/core_64_bit_only.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64.rc:system/etc/init/hw/in 




# Set the zygote property to select the 64-bit script.

# Set the zygote property to select the 64-bit script.

# This line must be parsed before the one in core_minimal.mk

# This line must be parsed before the one in core_minimal.mk

PRODUCT_SYSTEM_PROPERTIES += ro.zygote=zygote64

PRODUCT_VENDOR_PROPERTIES += ro.zygote=zygote64





TARGET_SUPPORTS_32_BIT_APPS := false

TARGET_SUPPORTS_32_BIT_APPS := false

TARGET_SUPPORTS_64_BIT_APPS := true
 
TARGET_SUPPORTS_64_BIT_APPS := true