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

Commit d24005d8 authored by Yi-yo Chiang's avatar Yi-yo Chiang Committed by Android (Google) Code Review
Browse files

Merge "Bump PRODUCT_SHIPPING_API_LEVEL to 29 for CSI" into stage-aosp-master

parents 212c2696 670e6d74

target/product/mainline_arm64.mk

+8 −7
Original line number Diff line number Diff line
@@ -19,13 +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

# TODO(b/137033385): change this back to "all"

PRODUCT_RESTRICT_VENDOR_FILES := owner



PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed



# Modules that should probably be moved to /product
@@ -33,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

target/product/mainline_system_arm64.mk

+4 −3
Original line number Diff line number Diff line
@@ -34,9 +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

# TODO(b/137033385): change this back to "all"

PRODUCT_RESTRICT_VENDOR_FILES := owner

target/product/mainline_system_x86.mk

+4 −2
Original line number Diff line number Diff line
@@ -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

target/product/mainline_system_x86_arm.mk

+4 −2
Original line number Diff line number Diff line
@@ -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