p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
SzuWei Lin 2019-02-01 12:44:30 +08:00
parent ce1fdb2f55
commit 323be83a66
14 changed files with 65 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/product/aosp_arm.mk
View File

@ -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)

5
target/product/aosp_arm64.mk
View File

@ -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 \

5
target/product/aosp_arm64_a.mk
View File

@ -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 \

5
target/product/aosp_arm64_ab.mk
View File

@ -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 \

5
target/product/aosp_arm_a.mk
View File

@ -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

5
target/product/aosp_arm_ab.mk
View File

@ -26,6 +26,11 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk)
# Enable mainline checking for excat this product name
ifeq (aosp_arm_ab,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif
PRODUCT_NAME := aosp_arm_ab
PRODUCT_DEVICE := generic_arm_ab
PRODUCT_BRAND := Android

5
target/product/aosp_x86.mk
View File

@ -29,6 +29,11 @@ $(call inherit-product-if-exists, device/generic/goldfish/x86-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
# Enable mainline checking for excat this product name
ifeq (aosp_x86,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif
PRODUCT_NAME := aosp_x86
PRODUCT_DEVICE := generic_x86
PRODUCT_BRAND := Android

5
target/product/aosp_x86_64.mk
View File

@ -35,6 +35,11 @@ $(call inherit-product-if-exists, device/generic/goldfish/x86_64-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
# Enable mainline checking for excat this product name
ifeq (aosp_x86_64,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
root/init.zygote32_64.rc \
root/init.zygote64_32.rc \

5
target/product/aosp_x86_64_a.mk
View File

@ -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_x86_64_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 \

5
target/product/aosp_x86_64_ab.mk
View File

@ -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_x86_64_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 \

5
target/product/aosp_x86_a.mk
View File

@ -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_x86_a,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif
PRODUCT_NAME := aosp_x86_a
PRODUCT_DEVICE := generic_x86_a
PRODUCT_BRAND := Android

5
target/product/aosp_x86_ab.mk
View File

@ -26,6 +26,11 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/legacy_gsi_common.mk)
# Enable mainline checking for excat this product name
ifeq (aosp_x86_ab,$(TARGET_PRODUCT))
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
endif
PRODUCT_NAME := aosp_x86_ab
PRODUCT_DEVICE := generic_x86_ab
PRODUCT_BRAND := Android

3
target/product/gsi_arm64.mk
View File

@ -17,6 +17,8 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_common.mk)
# Enable mainline checking
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
root/init.zygote32_64.rc \
root/init.zygote64_32.rc \
@ -33,4 +35,3 @@ PRODUCT_NAME := gsi_arm64
PRODUCT_DEVICE := gsi_arm64
PRODUCT_BRAND := generic
PRODUCT_MODEL := GSI on ARM64

6
target/product/gsi_common.mk
View File

@ -28,15 +28,15 @@ PRODUCT_PROPERTY_OVERRIDES := \
ro.config.ringtone=Ring_Synth_04.ogg \
ro.config.notification_sound=pixiedust.ogg
# Enable mainline checking and the whitelist for GSI
PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
# The mainline checking whitelist, should be clean up
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST := \
system/app/messaging/messaging.apk \
system/app/PhotoTable/PhotoTable.apk \
system/app/WAPPushManager/WAPPushManager.apk \
system/bin/healthd \
system/etc/init/healthd.rc \
system/etc/seccomp_policy/crash_dump.%.policy \
system/etc/seccomp_policy/mediacodec.policy \
system/etc/vintf/manifest/manifest_healthd.xml \
system/lib/libframesequence.so \
system/lib/libgiftranscode.so \