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

Commit b07338f5 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Make change and version bump to RM1A.200517.001 

Change-Id: Ica89197e6f7878756bddbf95aba254d6a0faf6b4
parents 76110469 e878aa22

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.



BUILD_ID=RM1A.200515.002
 
BUILD_ID=RM1A.200517.001

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ LOCAL_ANNOTATION_PROCESSOR_CLASSES:= 
LOCAL_APIDIFF_NEWAPI:=

LOCAL_APIDIFF_OLDAPI:=

LOCAL_APK_LIBRARIES:=

LOCAL_APK_SET_MASTER_FILE:=

LOCAL_ARM_MODE:=

LOCAL_ASFLAGS:=

LOCAL_ASSET_DIR:=

core/install_jni_libs_internal.mk

+7 −9
Original line number Diff line number Diff line
@@ -124,18 +124,16 @@ ifneq ($(strip $(LOCAL_JNI_SHARED_LIBRARIES)),) 
    my_allowed_types := $(my_allowed_ndk_types) native:platform native:product native:vendor native:vndk native:vndk_private native:platform_vndk

  endif



  ifneq (,$(LOCAL_SDK_VERSION))

  ifeq ($(SOONG_ANDROID_MK),$(LOCAL_MODULE_MAKEFILE))

    # SOONG_SDK_VARIANT_MODULES isn't complete yet while parsing Soong modules, and Soong has

      # already ensured that apps link against the correct SDK variants, rewrite all JNI libraries

      # to the SDK variant.

      my_link_deps := $(addprefix SHARED_LIBRARIES:,$(addsuffix .sdk,$(LOCAL_JNI_SHARED_LIBRARIES)))

    # already ensured that apps link against the correct SDK variants, don't check them.

  else

    ifneq (,$(LOCAL_SDK_VERSION))

      my_link_deps := $(addprefix SHARED_LIBRARIES:,$(call use_soong_sdk_libraries,$(LOCAL_JNI_SHARED_LIBRARIES)))

    endif

    else

      my_link_deps := $(addprefix SHARED_LIBRARIES:,$(LOCAL_JNI_SHARED_LIBRARIES))

    endif

  endif



  my_common :=

  include $(BUILD_SYSTEM)/link_type.mk

core/soong_android_app_set.mk

0 → 100644
+32 −0
Original line number Diff line number Diff line 
# App prebuilt coming from Soong.

# Extra inputs:

# LOCAL_APK_SET_MASTER_FILE



ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

  $(call pretty-error,soong_apk_set.mk may only be used from Soong)

endif



LOCAL_BUILT_MODULE_STEM := $(LOCAL_APK_SET_MASTER_FILE)

LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_APK_SET_MASTER_FILE)



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

include $(BUILD_SYSTEM)/base_rules.mk

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



## Extract master APK from APK set into given directory

# $(1) APK set

# $(2) master APK entry (e.g., splits/base-master.apk



define extract-master-from-apk-set

$(LOCAL_BUILT_MODULE): $(1)

	@echo "Extracting $$@"

	unzip -pq $$< $(2) >$$@

endef



$(eval $(call extract-master-from-apk-set,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_APK_SET_MASTER_FILE)))

LOCAL_POST_INSTALL_CMD := unzip -qo -j -d $(dir $(LOCAL_INSTALLED_MODULE)) \

	$(LOCAL_PREBUILT_MODULE_FILE) -x $(LOCAL_APK_SET_MASTER_FILE)

$(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)

PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))



SOONG_ALREADY_CONV := $(SOONG_ALREADY_CONV) $(LOCAL_MODULE)

core/version_defaults.mk

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,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 := 2020-06-05

      PLATFORM_SECURITY_PATCH := 2020-07-01

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH