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

Commit 604e6b59 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Make change and version bump to AP2A.240301.001 

Snap for 11517367 from fef8b004 to 24Q2-release

Change-Id: I4ef20ee03089aa8656ed068d554ff94fe85e7052
parents c3fe9664 fef8b004

cogsetup.sh

+9 −6
Original line number Diff line number Diff line
@@ -21,18 +21,21 @@ function _create_out_symlink_for_cog() { 
    OUT_DIR="out"

  fi



  if [[ -L "${OUT_DIR}" ]]; then

  # getoutdir ensures paths are absolute. envsetup could be called from a

  # directory other than the root of the source tree

  local outdir=$(getoutdir)

  if [[ -L "${outdir}" ]]; then

    return

  fi

  if [ -d "${OUT_DIR}" ]; then

    echo -e "\tOutput directory ${OUT_DIR} cannot be present in a Cog workspace."

    echo -e "\tDelete \"${OUT_DIR}\" or create a symlink from \"${OUT_DIR}\" to a directory outside your workspace."

  if [ -d "${outdir}" ]; then

    echo -e "\tOutput directory ${outdir} cannot be present in a Cog workspace."

    echo -e "\tDelete \"${outdir}\" or create a symlink from \"${outdir}\" to a directory outside your workspace."

    return 1

  fi



  DEFAULT_OUTPUT_DIR="${HOME}/.cog/android-build-out"

  mkdir -p ${DEFAULT_OUTPUT_DIR}

  ln -s ${DEFAULT_OUTPUT_DIR} `pwd`/out

  ln -s ${DEFAULT_OUTPUT_DIR} ${outdir}

}



# This function sets up the build environment to be appropriate for Cog.

core/art_config.mk

+4 −1
Original line number Diff line number Diff line
@@ -27,8 +27,11 @@ ADDITIONAL_PRODUCT_PROPERTIES += ro.dalvik.vm.enable_uffd_gc=$(config_enable_uff 
# soong variables indicate whether the prebuilt is enabled:

# - $(m)_module/source_build for art and TOGGLEABLE_PREBUILT_MODULES

# - ANDROID/module_build_from_source for other mainline modules

# Note that RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST is the list of module names

# and library names of jars that need to be removed. We have to keep separated list per

# release config due to possibility of different prebuilt content.

APEX_BOOT_JARS_EXCLUDED :=

$(foreach pair, $(PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY),\

$(foreach pair, $(RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST),\

  $(eval m := $(subst com.android.,,$(call word-colon,1,$(pair)))) \

  $(if $(call soong_config_get,$(m)_module,source_build), \

    $(if $(filter true,$(call soong_config_get,$(m)_module,source_build)),, \

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=AP2A.240229.002
 
BUILD_ID=AP2A.240301.001

core/main.mk

+5 −0
Original line number Diff line number Diff line
@@ -284,6 +284,11 @@ ADDITIONAL_VENDOR_PROPERTIES += \ 
    ro.product.first_api_level=$(PRODUCT_SHIPPING_API_LEVEL)

endif



ifdef PRODUCT_SHIPPING_VENDOR_API_LEVEL

ADDITIONAL_VENDOR_PROPERTIES += \

    ro.vendor.api_level=$(PRODUCT_SHIPPING_VENDOR_API_LEVEL)

endif



ifneq ($(TARGET_BUILD_VARIANT),user)

  ifdef PRODUCT_SET_DEBUGFS_RESTRICTIONS

    ADDITIONAL_VENDOR_PROPERTIES += \

core/packaging/flags.mk

+3 −3
Original line number Diff line number Diff line
@@ -154,9 +154,9 @@ endef 


ifeq ($(RELEASE_CREATE_ACONFIG_STORAGE_FILE),true)

$(foreach partition, $(_FLAG_PARTITIONS), \

	$(eval aconfig_storage_package_map.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/package.map) \

	$(eval aconfig_storage_flag_map.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/flag.map) \

	$(eval aconfig_storage_flag_val.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/flag.val) \

	$(eval aconfig_storage_package_map.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/aconfig/package.map) \

	$(eval aconfig_storage_flag_map.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/aconfig/flag.map) \

	$(eval aconfig_storage_flag_val.$(partition) := $(PRODUCT_OUT)/$(partition)/etc/aconfig/flag.val) \

	$(eval $(call generate-partition-aconfig-storage-file, \

				$(TARGET_OUT_FLAGS)/$(partition)/package.map, \

				$(TARGET_OUT_FLAGS)/$(partition)/flag.map, \