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

Commit 2bdb84b7 authored by Bill Yi's avatar Bill Yi
Browse files

Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release 

Change-Id: Idb30b6536f60e6e8f02b84a9866254a22582246b
parents cd2fda4e 929cf3da

core/binary.mk

+3 −5
Original line number Diff line number Diff line
@@ -1587,6 +1587,9 @@ installed_static_library_notice_file_targets := \ 
    $(foreach lib,$(my_static_libraries) $(my_whole_static_libraries), \

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-STATIC_LIBRARIES-$(lib))



$(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
@@ -1783,11 +1786,6 @@ all_libraries := \ 
    $(built_static_libraries) \

    $(built_whole_libraries)



# Also depend on the notice files for any static libraries that

# are linked into this module.  This will force them to be installed

# when this module is.

$(LOCAL_INSTALLED_MODULE): | $(installed_static_library_notice_file_targets)



###########################################################

# Export includes

###########################################################

core/build_id.mk

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
# (like "CRB01").  It must be a single word, and is

# capitalized by convention.



export BUILD_ID=PPRL.181005.003
 
export BUILD_ID=PQ1A.181105.017.A1

core/java_common.mk

+15 −0
Original line number Diff line number Diff line
@@ -422,6 +422,21 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SHARED_JAVA_HEADER_LIBRARIES := $(full_sh 
ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \

    $(ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR) $(LOCAL_INTERMEDIATE_SOURCE_DIR)





##########################################################

# Copy NOTICE files of transitive static dependencies

# Don't do this in mm, since many of the targets won't exist.

ifeq ($(ONE_SHOT_MAKEFILE),)

installed_static_library_notice_file_targets := \

    $(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \

      NOTICE-$(if $(LOCAL_IS_HOST_MODULE),HOST,TARGET)-JAVA_LIBRARIES-$(lib))

else

installed_static_library_notice_file_targets :=

endif



$(notice_target): | $(installed_static_library_notice_file_targets)

$(LOCAL_INSTALLED_MODULE): | $(notice_target)



###########################################################

# Verify that all libraries are safe to use

###########################################################

core/tasks/sdk-addon.mk

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ files_to_copy += \ 
	$(addon_dir_img):$(INSTALLED_QEMU_VENDORIMAGE):images/$(TARGET_CPU_ABI)/vendor.img \

	$(addon_dir_img):$(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \

	$(addon_dir_img):$(PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \

	$(addon_dir_img):device/generic/goldfish/data/etc/userdata.img:images/$(TARGET_CPU_ABI)/userdata.img \

	$(addon_dir_img):$(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt \

	$(addon_dir_img):$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ADDON_SYS_IMG_SOURCE_PROP):images/source.properties

core/version_defaults.mk

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

      PLATFORM_SECURITY_PATCH := 2018-11-05

endif



ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP