From 2ccc153d42ee7c5588910fa16b3e288e5fd1e77c Mon Sep 17 00:00:00 2001 From: Yo Chiang Date: Thu, 31 Oct 2019 14:57:35 +0800 Subject: [PATCH] Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI Bug: 141972143 Test: lunch mainline_system_arm64-userdebug ; m Test: TH build_test Change-Id: Iee2ac89586d71d9ab3bb257f2b3b1073710554d5 --- target/product/mainline_arm64.mk | 14 ++++++++------ target/product/mainline_system_arm64.mk | 6 ++++-- target/product/mainline_system_x86.mk | 6 ++++-- target/product/mainline_system_x86_arm.mk | 6 ++++-- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk index 666ce4189b..52b3222958 100644 --- a/target/product/mainline_arm64.mk +++ b/target/product/mainline_arm64.mk @@ -19,12 +19,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline.mk) whitelist := product_manifest.xml $(call enforce-product-packages-exist,$(whitelist)) -PRODUCT_NAME := mainline_arm64 -PRODUCT_DEVICE := mainline_arm64 -PRODUCT_BRAND := generic -PRODUCT_SHIPPING_API_LEVEL := 28 -PRODUCT_RESTRICT_VENDOR_FILES := all - PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed # Modules that should probably be moved to /product @@ -32,3 +26,11 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ system/bin/healthd \ system/etc/init/healthd.rc \ system/etc/vintf/manifest/manifest_healthd.xml \ + +PRODUCT_SHIPPING_API_LEVEL := 29 + +PRODUCT_RESTRICT_VENDOR_FILES := all + +PRODUCT_NAME := mainline_arm64 +PRODUCT_DEVICE := mainline_arm64 +PRODUCT_BRAND := generic diff --git a/target/product/mainline_system_arm64.mk b/target/product/mainline_system_arm64.mk index 6249068b8f..772c687c1b 100644 --- a/target/product/mainline_system_arm64.mk +++ b/target/product/mainline_system_arm64.mk @@ -34,8 +34,10 @@ PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false PRODUCT_BUILD_USERDATA_IMAGE := false PRODUCT_BUILD_VENDOR_IMAGE := false +PRODUCT_SHIPPING_API_LEVEL := 29 + +PRODUCT_RESTRICT_VENDOR_FILES := all + PRODUCT_NAME := mainline_system_arm64 PRODUCT_DEVICE := mainline_arm64 PRODUCT_BRAND := generic -PRODUCT_SHIPPING_API_LEVEL := 28 -PRODUCT_RESTRICT_VENDOR_FILES := all diff --git a/target/product/mainline_system_x86.mk b/target/product/mainline_system_x86.mk index ac330686ee..05e51a9c01 100644 --- a/target/product/mainline_system_x86.mk +++ b/target/product/mainline_system_x86.mk @@ -33,8 +33,10 @@ PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false PRODUCT_BUILD_USERDATA_IMAGE := false PRODUCT_BUILD_VENDOR_IMAGE := false +PRODUCT_SHIPPING_API_LEVEL := 29 + +PRODUCT_RESTRICT_VENDOR_FILES := all + PRODUCT_NAME := mainline_system_x86 PRODUCT_DEVICE := mainline_x86 PRODUCT_BRAND := generic -PRODUCT_SHIPPING_API_LEVEL := 28 -PRODUCT_RESTRICT_VENDOR_FILES := all diff --git a/target/product/mainline_system_x86_arm.mk b/target/product/mainline_system_x86_arm.mk index 0ed86ccc62..cc11c55f2f 100644 --- a/target/product/mainline_system_x86_arm.mk +++ b/target/product/mainline_system_x86_arm.mk @@ -33,8 +33,10 @@ PRODUCT_BUILD_SYSTEM_OTHER_IMAGE := false PRODUCT_BUILD_USERDATA_IMAGE := false PRODUCT_BUILD_VENDOR_IMAGE := false +PRODUCT_SHIPPING_API_LEVEL := 29 + +PRODUCT_RESTRICT_VENDOR_FILES := all + PRODUCT_NAME := mainline_system_x86_arm PRODUCT_DEVICE := mainline_x86_arm PRODUCT_BRAND := generic -PRODUCT_SHIPPING_API_LEVEL := 28 -PRODUCT_RESTRICT_VENDOR_FILES := all