Merge "Move ro.zygote to vendor" into rvc-qpr-dev-plus-aosp am: e75f0995de

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia23efbd819c4f33db431a163cd1c938c112b4cb4
This commit is contained in:
TreeHugger Robot 2020-12-14 17:28:52 +00:00 committed by Automerger Merge Worker
commit c4ec682cb2
3 changed files with 3 additions and 3 deletions

View file

@ -335,7 +335,7 @@ PRODUCT_COPY_FILES += \
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_SYSTEM_PROPERTIES += ro.zygote?=zygote32
PRODUCT_VENDOR_PROPERTIES += ro.zygote?=zygote32
PRODUCT_SYSTEM_PROPERTIES += debug.atrace.tags.enableflags=0
PRODUCT_SYSTEM_PROPERTIES += persist.traced.enable=1

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
# 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_64_BIT_APPS := true

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.
# 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_64_BIT_APPS := true