diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-22 08:55:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-12-22 08:55:33 +0000 |
| commit | f6db5bc98a99665e0fe4fa2cb18a0178db251a34 (patch) | |
| tree | 9c58b667ee9b10e6a295586e946ebb72d6c30532 | |
| parent | ce285d52c676c410c4f9fa79cd173581aafae814 (diff) | |
| parent | 01bc366dc49cc121ca648a0117cad7afb4d89baf (diff) | |
| download | build-pie-gsi.tar.gz | |
Merge "Add init.zygote64.rc into GSI" into pie-gsipie-gsi
| -rw-r--r-- | target/product/aosp_arm64.mk | 10 | ||||
| -rw-r--r-- | target/product/aosp_x86_64.mk | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index c839bd5e0b..b784678e1b 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -29,12 +29,14 @@ -include device/generic/goldfish/arm64-vendor.mk # Copy 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 +# ro.zygote=zygote64, ro.zygote=zygote64_32 or ro.zygote=zygote32_64: +# 1. 64-bit only OR +# 2. 64-bit primary, 32-bit secondary OR +# 3. 32-bit primary, 64-bit secondary # init.zygote64_32.rc is in the core_64_bit.mk below PRODUCT_COPY_FILES += \ - system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc + system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc \ + system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc \ # Force both build odex for zygote32_64 DEX_PREOPT_SYSTEM_SERVER_BOTH := true diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index d176d51422..9124885805 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -29,12 +29,14 @@ -include device/generic/goldfish/x86_64-vendor.mk # Copy 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 +# ro.zygote=zygote64, ro.zygote=zygote64_32 or ro.zygote=zygote32_64: +# 1. 64-bit only OR +# 2. 64-bit primary, 32-bit secondary OR +# 3. 32-bit primary, 64-bit secondary # init.zygote64_32.rc is in the core_64_bit.mk below PRODUCT_COPY_FILES += \ - system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc + system/core/rootdir/init.zygote64.rc:root/init.zygote64.rc \ + system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc \ # Force both build odex for zygote32_64 DEX_PREOPT_SYSTEM_SERVER_BOTH := true |