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

Commit 24c928cd authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 13 QPR3"

parents 571cd077 7f534ea9

core/android_soong_config_vars.mk

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ endif 
# are controlled by the MODULE_BUILD_FROM_SOURCE environment variable by

# default.

INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \

  bluetooth \

  btservices \

  permission \

  rkpd \

  uwb \

core/tasks/sts-lite.mk

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ $(sts_sdk_zip): $(MERGE_ZIPS) $(ZIP2ZIP) $(compatibility_zip) $(sts_sdk_samples) 
	$(ZIP2ZIP) -i $(STS_LITE_ZIP) -o $(STS_LITE_ZIP)_filtered \

		-x android-sts-lite/tools/sts-tradefed-tests.jar \

		'android-sts-lite/tools/*:sts-test/libs/' \

		'android-sts-lite/testcases/*:sts-test/utils/'

		'android-sts-lite/testcases/*:sts-test/utils/' \

		'android-sts-lite/jdk/**/*:sts-test/jdk/'

	$(MERGE_ZIPS) $@ $(STS_LITE_ZIP)_filtered $(STS_SDK_SAMPLES)

	rm -f $(STS_LITE_ZIP)_filtered

core/version_defaults.mk

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

    PLATFORM_SECURITY_PATCH := 2023-06-05

endif



include $(BUILD_SYSTEM)/version_util.mk

target/product/cfi-common.mk

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ PRODUCT_CFI_INCLUDE_PATHS := \ 
    hardware/broadcom/wlan/bcmdhd/wpa_supplicant_8_lib \

    hardware/synaptics/wlan/synadhd/wpa_supplicant_8_lib \

    hardware/interfaces/nfc \

    hardware/qcom/wlan/qcwcn/wpa_supplicant_8_lib \

    hardware/qcom/wlan/legacy/qcwcn/wpa_supplicant_8_lib \

    hardware/qcom/wlan/wcn6740/qcwcn/wpa_supplicant_8_lib \

    hardware/interfaces/keymaster \

tools/releasetools/common.py

+15 −5
Original line number Diff line number Diff line
@@ -2450,12 +2450,22 @@ def GetMinSdkVersionInt(apk_name, codename_to_api_level_map): 
  try:

    return int(version)

  except ValueError:

    # Not a decimal number. Codename?

    if version in codename_to_api_level_map:

      return codename_to_api_level_map[version]

    # Not a decimal number.

    #

    # It could be either a straight codename, e.g.

    #     UpsideDownCake

    #

    # Or a codename with API fingerprint SHA, e.g.

    #     UpsideDownCake.e7d3947f14eb9dc4fec25ff6c5f8563e

    #

    # Extract the codename and try and map it to a version number.

    split = version.split(".")

    codename = split[0]

    if codename in codename_to_api_level_map:

      return codename_to_api_level_map[codename]

    raise ExternalError(

        "Unknown minSdkVersion: '{}'. Known codenames: {}".format(

            version, codename_to_api_level_map))

        "Unknown codename: '{}' from minSdkVersion: '{}'. Known codenames: {}".format(

            codename, version, codename_to_api_level_map))





def SignFile(input_name, output_name, key, password, min_api_level=None,