diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-22 08:55:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-12-22 08:55:03 +0000 |
| commit | 8a0ba0afbeb8482b6bf488252a0925b7a2320fc4 (patch) | |
| tree | 5e1b83819ab6c96dd4dc4fd130c1bf0f50f06668 | |
| parent | d0c42a62d76b70fb012c562edd824bc49062593f (diff) | |
| parent | 51b9774fdec4b5becab8421985619ddc563cb13a (diff) | |
| download | build-8a0ba0afbeb8482b6bf488252a0925b7a2320fc4.tar.gz | |
Merge "Add init.zygote64.rc into GSI" into android10-gsi
| -rw-r--r-- | target/product/aosp_arm64.mk | 11 | ||||
| -rw-r--r-- | target/product/aosp_x86_64.mk | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index 8ef2023e62..707bb5767d 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -43,16 +43,19 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed endif PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ + root/init.zygote64.rc \ root/init.zygote32_64.rc \ root/init.zygote64_32.rc \ # 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 \ PRODUCT_NAME := aosp_arm64 PRODUCT_DEVICE := generic_arm64 diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index 9dfa2f4804..9dd09a6924 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -43,16 +43,19 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed endif PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ + root/init.zygote64.rc \ root/init.zygote32_64.rc \ root/init.zygote64_32.rc \ # 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 \ PRODUCT_NAME := aosp_x86_64 PRODUCT_DEVICE := generic_x86_64 |