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

Unverified Commit 907c8021 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-11.0.0_r38' into staging/lineage-18.1_merge-android-11.0.0_r38 

Android 11.0.0 Release 38 (RQ3A.210605.005)

* tag 'android-11.0.0_r38':
  Version bump to RQ3A.210605.005 [core/build_id.mk]
  Version bump to RQ3A.210605.004 [core/build_id.mk]
  Version bump to RQ3A.210605.003 [core/build_id.mk]
  Version bump to RQ3A.210605.002 [core/build_id.mk]
  Update Security String to 2021-06-05
  Update Security String to 2021-05-01
  DO NOT MERGE Update Security String to 2021-05-05
  Version bump to RQ3A.210310.001 [core/build_id.mk]
  Update Security String to 2021-04-05
  Version bump to RQ3A.210129.002 [core/build_id.mk]
  DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk
  DO NOT MERGE Update OWNERS for SPL changes to version_defaults.mk
  Update Security String to 2021-03-01
  Update Security String to 2021-03-05
  Switch default execution strategy to racing for developer builds
  Use unified cas uploads / downloads
  Source rbesetup.sh from any location inside of a repo directory.
  Version bump to RQ3A.210106.001 [core/build_id.mk]

Conflicts:
	core/build_id.mk
	core/version_defaults.mk

Change-Id: I694da79574b0b096ed23ab286c766ac25b532e09
parents d8dffd87 5f402c60

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=RQ2A.210505.003
 
BUILD_ID=RQ3A.210605.005

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 := 2021-05-05

      PLATFORM_SECURITY_PATCH := 2021-06-05

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH

rbesetup.sh

+34 −3
Original line number Diff line number Diff line 
source build/envsetup.sh

function _source_env_setup_script() {

  local -r ENV_SETUP_SCRIPT="build/make/envsetup.sh"

  local -r TOP_DIR=$(

    while [[ ! -f "${ENV_SETUP_SCRIPT}" ]] && [[ "${PWD}" != "/" ]]; do

      \cd ..

    done

    if [[ -f "${ENV_SETUP_SCRIPT}" ]]; then

      echo "$(PWD= /bin/pwd -P)"

    fi

  )



  local -r FULL_PATH_ENV_SETUP_SCRIPT="${TOP_DIR}/${ENV_SETUP_SCRIPT}"

  if [[ ! -f "${FULL_PATH_ENV_SETUP_SCRIPT}" ]]; then

    echo "ERROR: Unable to source ${ENV_SETUP_SCRIPT}"

    return 1

  fi



  # Need to change directory to the repo root so vendor scripts can be sourced

  # as well.

  local -r CUR_DIR=$PWD

  \cd "${TOP_DIR}"

  source "${FULL_PATH_ENV_SETUP_SCRIPT}"

  \cd "${CUR_DIR}"

}



# This function needs to run first as the remaining defining functions may be

# using the envsetup.sh defined functions.

_source_env_setup_script || return



# This function prefixes the given command with appropriate variables needed

# for the build to be executed with RBE.
@@ -28,7 +55,7 @@ function use_rbe() { 
# ANDROID_ENABLE_METRICS_UPLOAD.

function _export_metrics_uploader() {

  local uploader_path="$(gettop)/vendor/google/misc/metrics_uploader_prebuilt/metrics_uploader.sh"

  if [ -x "${uploader_path}" ]; then

  if [[ -x "${uploader_path}" ]]; then

    export ANDROID_ENABLE_METRICS_UPLOAD="${uploader_path}"

  fi

}
@@ -37,7 +64,11 @@ function _export_metrics_uploader() { 
# executed by RBE. This file should be sourced once per checkout of Android code.

function _set_rbe_vars() {

  export USE_RBE="true"

  export RBE_CXX_EXEC_STRATEGY="remote_local_fallback"

  export RBE_CXX_EXEC_STRATEGY="racing"

  export RBE_JAVAC_EXEC_STRATEGY="racing"

  export RBE_R8_EXEC_STRATEGY="racing"

  export RBE_D8_EXEC_STRATEGY="racing"

  export RBE_use_unified_cas_ops="true"

  export RBE_JAVAC=1

  export RBE_R8=1

  export RBE_D8=1