From b65a5ba193d48bce908c7357693e1230fff6f1c6 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 18 Oct 2018 13:40:22 +0100 Subject: [PATCH] Remove PRODUCT_SHIPPING_API_LEVEL in mainline_system Let this be defined in the leaves instead. As is it frequently causes problems where the product inheriting this also inherit another value of PRODUCT_SHIPPING_API_LEVEL, leading to invalid values unless overridden again. Bug: 80410283 Test: lunch mainline_arm64; m nothing Test: lunch mainline_system_arm64; m nothing Change-Id: Id08b6cc0cd8815404e548c521c9e40706ba8ca16 --- target/product/mainline_system.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk index 7677f219c5..3528466cbe 100644 --- a/target/product/mainline_system.mk +++ b/target/product/mainline_system.mk @@ -68,13 +68,12 @@ PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true PRODUCT_NAME := mainline_system PRODUCT_BRAND := generic -PRODUCT_SHIPPING_API_LEVEL := 28 _base_mk_whitelist := _my_whitelist := $(_base_mk_whitelist) -# Both /system and / are in system.img when PRODUCT_SHIPPING_API_LEVEL>=28. +# For mainline, system.img should be mounted at /, so we include ROOT here. _my_paths := \ $(TARGET_COPY_OUT_ROOT) \ $(TARGET_COPY_OUT_SYSTEM) \