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

Commit 3449df57 authored by Xin Li's avatar Xin Li
Browse files

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

Bug: 120502534
Change-Id: Ib1b590fc605b17e3a3901e65f62d5f7ad2257f6a
parents 5e5cf8e1 4a676aaa

core/binary.mk

+3 −0
Original line number Diff line number Diff line
@@ -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

core/version_defaults.mk

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

target/product/product_launched_with_k.mk

0 → 100644
+2 −0
Original line number Diff line number Diff line 
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launched on.

PRODUCT_SHIPPING_API_LEVEL := 19

target/product/product_launched_with_l.mk

+0 −1
Original line number Diff line number Diff line 
#PRODUCT_SHIPPING_API_LEVEL indicates the first api level, device has been commercially launched on.

PRODUCT_SHIPPING_API_LEVEL := 21