diff options
| author | 2020-11-25 16:58:52 +0800 | |
|---|---|---|
| committer | 2020-12-07 08:05:27 +0000 | |
| commit | 1b0f9bff9c15820d114c149e16cdaea18fba5764 (patch) | |
| tree | 6130bca04e61235108c6b57d1cec691b01c819d6 | |
| parent | e13277f26e7040cbd20e5d310ccd0e771d9330a3 (diff) | |
Move ro.zygote to vendor
The system property ro.zygote should be define in vendor. It went
to system wrongly when replacing PRODUCT_DEFAULT_PROPERTY_OVERRIDES.
Bug: 173452246
Test: build a Pixel device and check build.prop under system and vendor
Change-Id: I86919f993ae44f3502eb63e728d33acaa14f7088
Merged-In: I86919f993ae44f3502eb63e728d33acaa14f7088
| -rw-r--r-- | target/product/base_system.mk | 2 | ||||
| -rw-r--r-- | target/product/core_64_bit.mk | 2 | ||||
| -rw-r--r-- | target/product/core_64_bit_only.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 1b4c8d9d32..ab744796d5 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -330,7 +330,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 diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk index 7fa6ed2b7f..322fa80530 100644 --- a/target/product/core_64_bit.mk +++ b/target/product/core_64_bit.mk @@ -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 diff --git a/target/product/core_64_bit_only.mk b/target/product/core_64_bit_only.mk index 63beea9943..53c9c74eb5 100644 --- a/target/product/core_64_bit_only.mk +++ b/target/product/core_64_bit_only.mk @@ -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 |