diff options
| author | Justin Yun <justinyun@google.com> | 2019-10-25 09:55:57 +0900 |
|---|---|---|
| committer | Justin Yun <justinyun@google.com> | 2019-10-29 06:40:29 +0000 |
| commit | e000c297a4be2000dfa2b5c9e9127f82c8ad27d7 (patch) | |
| tree | 528931d252cb3679682b88e6dc6e2119049ded41 | |
| parent | c393e614e694a0b11a7fd538667c2355972207cb (diff) | |
| download | common-e000c297a4be2000dfa2b5c9e9127f82c8ad27d7.tar.gz | |
Remove init.zygote*.rc from whitelist
As we included init.zygote*.rc in mainline_system.mk, we may remove
them from the whitelist in the device make file.
Bug: 143121605
Test: build test for all device targets
Change-Id: I864c05716416105c97ea88d811e062e22a39cf83
| -rw-r--r-- | mgsi/mgsi_arm64.mk | 3 | ||||
| -rw-r--r-- | mgsi/mgsi_release.mk | 15 | ||||
| -rw-r--r-- | mgsi/mgsi_x86_64.mk | 3 |
3 files changed, 0 insertions, 21 deletions
diff --git a/mgsi/mgsi_arm64.mk b/mgsi/mgsi_arm64.mk index 1a5411c..7353e63 100644 --- a/mgsi/mgsi_arm64.mk +++ b/mgsi/mgsi_arm64.mk @@ -23,9 +23,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) # Enable mainline checking PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - root/init.zygote64_32.rc \ - # # All components inherited here go to product image # diff --git a/mgsi/mgsi_release.mk b/mgsi/mgsi_release.mk index f776b8d..9169d29 100644 --- a/mgsi/mgsi_release.mk +++ b/mgsi/mgsi_release.mk @@ -50,18 +50,3 @@ PRODUCT_PACKAGES += \ # Support additional P and Q VNDK packages PRODUCT_EXTRA_VNDK_VERSIONS := 28 29 - -# The 64 bits MGSI build targets inhiert core_64_bit.mk to enable 64 bits and -# include the init.zygote64_32.rc. -# 64 bits MGSI needs to include different zygote settings for vendor.img to -# select its preference by setting ro.zygote to zygote64_32 or zygote32_64: -# 1. 64-bit primary, 32-bit secondary, or -# 2. 32-bit primary, 64-bit secondary -# Here includes the init.zygote32_64.rc if it had inhierted core_64_bit.mk. -ifeq (true|true,$(TARGET_SUPPORTS_32_BIT_APPS)|$(TARGET_SUPPORTS_64_BIT_APPS)) -PRODUCT_COPY_FILES += \ - system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc - -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - root/init.zygote32_64.rc -endif diff --git a/mgsi/mgsi_x86_64.mk b/mgsi/mgsi_x86_64.mk index de0bfaa..da8a36e 100644 --- a/mgsi/mgsi_x86_64.mk +++ b/mgsi/mgsi_x86_64.mk @@ -23,9 +23,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) # Enable mainline checking PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed -PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ - root/init.zygote64_32.rc \ - # # All components inherited here go to product image # |