Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
This commit is contained in:
commit
f904d0f74e
4 changed files with 6 additions and 2 deletions
|
@ -1571,6 +1571,9 @@ endif
|
|||
$(notice_target): | $(installed_static_library_notice_file_targets)
|
||||
$(LOCAL_INSTALLED_MODULE): | $(notice_target)
|
||||
|
||||
$(notice_target): | $(installed_static_library_notice_file_targets)
|
||||
$(LOCAL_INSTALLED_MODULE): | $(notice_target)
|
||||
|
||||
# Default is -fno-rtti.
|
||||
ifeq ($(strip $(LOCAL_RTTI_FLAG)),)
|
||||
LOCAL_RTTI_FLAG := -fno-rtti
|
||||
|
|
|
@ -252,7 +252,7 @@ ifndef PLATFORM_SECURITY_PATCH
|
|||
# It must be of the form "YYYY-MM-DD" on production devices.
|
||||
# It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
|
||||
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
|
||||
PLATFORM_SECURITY_PATCH := 2018-09-05
|
||||
PLATFORM_SECURITY_PATCH := 2018-12-05
|
||||
endif
|
||||
.KATI_READONLY := PLATFORM_SECURITY_PATCH
|
||||
|
||||
|
|
2
target/product/product_launched_with_k.mk
Normal file
2
target/product/product_launched_with_k.mk
Normal file
|
@ -0,0 +1,2 @@
|
|||
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launched on.
|
||||
PRODUCT_SHIPPING_API_LEVEL := 19
|
|
@ -1,3 +1,2 @@
|
|||
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launched on.
|
||||
PRODUCT_SHIPPING_API_LEVEL := 21
|
||||
|
||||
|
|
Loading…
Reference in a new issue