Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 323be83a authored Feb 01, 2019 by SzuWei Lin

Enable mainline checking for all GSI targets

There are some makefile inherit from aosp_$arch*.mk. This patch
change to only enable mainline checking on excat GSI targets,
such as aosp_$arch or aosp_$arch_(a|ab), and does not apply on
the child targets.

This patch also add some more whitelist items to gsi_common.mk

Bug: 123613261
Test: aosp_arm64-userdebug build pass
Test: remove some whitelist items and aosp_arm64-userdebug build fail
Test: sdk_phone_arm64-eng build pass
Test: gsi_arm64-userdebug build pass
Change-Id: I1772a55ab823a0312b9f215f0d2c3b0c727c8e4b

parent ce1fdb2f

target/product/aosp_arm.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,11 @@
		# GSI for system/product
		$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_common.mk)

		# Enable mainline checking for excat this product name
		ifeq (aosp_arm,$(TARGET_PRODUCT))
		PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
		endif

		# Emulator for vendor
		$(call inherit-product-if-exists, device/generic/goldfish/arm32-vendor.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)

target/product/aosp_arm64.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,11 @@ $(call inherit-product-if-exists, device/generic/goldfish/arm64-vendor.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)

		# Enable mainline checking for excat this product name
		ifeq (aosp_arm64,$(TARGET_PRODUCT))
		PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
		endif

		PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
		root/init.zygote32_64.rc \
		root/init.zygote64_32.rc \

target/product/aosp_arm64_a.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,11 @@
		$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk)

		# Enable mainline checking for excat this product name
		ifeq (aosp_arm64_a,$(TARGET_PRODUCT))
		PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
		endif

		PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
		root/init.zygote32_64.rc \
		root/init.zygote64_32.rc \

target/product/aosp_arm64_ab.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,11 @@
		$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
		$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk)

		# Enable mainline checking for excat this product name
		ifeq (aosp_arm64_ab,$(TARGET_PRODUCT))
		PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
		endif

		PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
		root/init.zygote32_64.rc \
		root/init.zygote64_32.rc \

target/product/aosp_arm_a.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,11 @@

		$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk)

		# Enable mainline checking for excat this product name
		ifeq (aosp_arm_a,$(TARGET_PRODUCT))
		PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
		endif

		PRODUCT_NAME := aosp_arm_a
		PRODUCT_DEVICE := generic_arm_a
		PRODUCT_BRAND := Android