tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fe372ac6754d03d12fc030bbb3a7e5c55017918
This commit is contained in:
Treehugger Robot 2020-12-17 07:20:59 +00:00 committed by Automerger Merge Worker
commit b972aca960
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/product/base_system.mk
View file

@ -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

2
target/product/core_64_bit.mk
View file

@ -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

2
target/product/core_64_bit_only.mk
View file

@ -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