Merge "Also copy init.zygote64.rc for 64-bit primary 32-bit secondary targets." am: 694cb51d7e
am: 375427bd4d
Original change: https://android-review.googlesource.com/c/platform/build/+/2241356 Change-Id: I6769e8d088b1d28f488d4858b753d62162adc8b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -23,7 +23,9 @@
|
|||||||
# for 32-bit only.
|
# for 32-bit only.
|
||||||
|
|
||||||
# Copy the 64-bit primary, 32-bit secondary zygote startup script
|
# Copy the 64-bit primary, 32-bit secondary zygote startup script
|
||||||
PRODUCT_COPY_FILES += system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw/init.zygote64_32.rc
|
PRODUCT_COPY_FILES += \
|
||||||
|
system/core/rootdir/init.zygote64.rc:system/etc/init/hw/init.zygote64.rc \
|
||||||
|
system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw/init.zygote64_32.rc \
|
||||||
|
|
||||||
# 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
|
||||||
|
Reference in New Issue
Block a user