openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"

This commit is contained in:
Treehugger Robot 2018-12-13 05:45:21 +00:00 committed by Gerrit Code Review
parent 9fb09f1762 3449df5704
commit 93e6c59784
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/binary.mk
View File

@ -1571,6 +1571,9 @@ endif
$(notice_target): | $(installed_static_library_notice_file_targets) $(notice_target): | $(installed_static_library_notice_file_targets)
$(LOCAL_INSTALLED_MODULE): | $(notice_target) $(LOCAL_INSTALLED_MODULE): | $(notice_target)
$(notice_target): | $(installed_static_library_notice_file_targets)
$(LOCAL_INSTALLED_MODULE): | $(notice_target)
# Default is -fno-rtti. # Default is -fno-rtti.
ifeq ($(strip $(LOCAL_RTTI_FLAG)),) ifeq ($(strip $(LOCAL_RTTI_FLAG)),)
LOCAL_RTTI_FLAG := -fno-rtti LOCAL_RTTI_FLAG := -fno-rtti

2
core/version_defaults.mk
View File

@ -252,7 +252,7 @@ ifndef PLATFORM_SECURITY_PATCH
# It must be of the form "YYYY-MM-DD" on production devices. # 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. # 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. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2018-09-05 PLATFORM_SECURITY_PATCH := 2018-12-05
endif endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH .KATI_READONLY := PLATFORM_SECURITY_PATCH

2
target/product/product_launched_with_k.mk Normal file
View 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
target/product/product_launched_with_l.mk
View File

@ -1,3 +1,2 @@
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launched on. #PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launched on.
PRODUCT_SHIPPING_API_LEVEL := 21 PRODUCT_SHIPPING_API_LEVEL := 21