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

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

Make change and version bump to BP2A.250213.001 

Snap for 13054324 from 62bfce2f to 25Q2-release

Change-Id: Icd76c2bd6de2a7f7ea17960f90099da914838691
parents 229ce13a 62bfce2f

core/Makefile

+1 −24
Original line number Diff line number Diff line
@@ -3594,7 +3594,6 @@ ifeq ($(USE_SOONG_DEFINED_SYSTEM_IMAGE),true) 
ifeq ($(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE),)

$(error PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE must be set if USE_SOONG_DEFINED_SYSTEM_IMAGE is true)

endif

SOONG_DEFINED_SYSTEM_IMAGE_PATH := $(call intermediates-dir-for,ETC,$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE))/$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE)

SOONG_DEFINED_SYSTEM_IMAGE_BASE := $(dir $(ALL_MODULES.$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE).FILESYSTEM_FILELIST))

$(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE) $(systemimage_intermediates)/file_list.txt $(SOONG_DEFINED_SYSTEM_IMAGE_PATH)

$(eval $(call copy-one-file, $(SOONG_DEFINED_SYSTEM_IMAGE_PATH), $(BUILT_SYSTEMIMAGE)))
@@ -7319,29 +7318,6 @@ ifeq (true,$(CLANG_COVERAGE)) 
  $(call dist-for-goals,droidcore-unbundled apps_only,$(LLVM_COVERAGE_TOOLS_ZIP))

endif



# -----------------------------------------------------------------

# A zip of the Android Apps. Not keeping full path so that we don't

# include product names when distributing

#

name := $(TARGET_PRODUCT)

ifeq ($(TARGET_BUILD_TYPE),debug)

  name := $(name)_debug

endif

name := $(name)-apps



APPS_ZIP := $(PRODUCT_OUT)/$(name).zip

$(APPS_ZIP): $(FULL_SYSTEMIMAGE_DEPS)

	@echo "Package apps: $@"

	$(hide) rm -rf $@

	$(hide) mkdir -p $(dir $@)

	$(hide) apps_to_zip=`find $(TARGET_OUT_APPS) $(TARGET_OUT_APPS_PRIVILEGED) -mindepth 2 -maxdepth 3 -name "*.apk"`; \

	if [ -z "$$apps_to_zip" ]; then \

	    echo "No apps to zip up. Generating empty apps archive." ; \

	    a=$$(mktemp /tmp/XXXXXXX) && touch $$a && zip $@ $$a && zip -d $@ $$a; \

	else \

	    zip -qjX $@ $$apps_to_zip; \

	fi



ifeq (true,$(EMMA_INSTRUMENT))

#------------------------------------------------------------------

# An archive of classes for use in generating code-coverage reports
@@ -7872,6 +7848,7 @@ $(INTERNAL_SDK_TARGET): $(deps) 
	        -I $(HOST_OUT) \

	        -I $(TARGET_COMMON_OUT_ROOT) \

	        -v "PLATFORM_NAME=$(PRIVATE_PLATFORM_NAME)" \

	        -v "PLATFORM_SDK_API_VERSION=$(PLATFORM_SDK_VERSION_FULL)" \

	        -v "OUT_DIR=$(OUT_DIR)" \

	        -v "HOST_OUT=$(HOST_OUT)" \

	        -v "TARGET_ARCH=$(TARGET_ARCH)" \

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=BP2A.250212.002
 
BUILD_ID=BP2A.250213.001

core/main.mk

+0 −1
Original line number Diff line number Diff line
@@ -1621,7 +1621,6 @@ else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE)) 


  ifneq ($(ANDROID_BUILD_EMBEDDED),true)

    $(call dist-for-goals-with-filenametag, droidcore, \

      $(APPS_ZIP) \

      $(INTERNAL_EMULATOR_PACKAGE_TARGET) \

    )

  endif

core/release_config.mk

+0 −14
Original line number Diff line number Diff line
@@ -156,20 +156,6 @@ ifneq (,$(_use_protobuf)) 
    _used_files :=

    ifeq (,$(_must_protobuf)$(RELEASE_BUILD_FLAGS_IN_PROTOBUF))

        _use_protobuf :=

    else

        _base_all_release := all_release_configs-$(TARGET_PRODUCT)

        $(call dist-for-goals,droid,\

            $(_flags_dir)/$(_base_all_release).pb:build_flags/all_release_configs.pb \

            $(_flags_dir)/$(_base_all_release).textproto:build_flags/all_release_configs.textproto \

            $(_flags_dir)/$(_base_all_release).json:build_flags/all_release_configs.json \

            $(_flags_dir)/inheritance_graph-$(TARGET_PRODUCT).dot:build_flags/inheritance_graph-$(TARGET_PRODUCT).dot \

        )

# These are always created, add an empty rule for them to keep ninja happy.

$(_flags_dir)/inheritance_graph-$(TARGET_PRODUCT).dot:

	: created by $(OUT_DIR)/release-config

$(_flags_dir)/$(_base_all_release).pb $(_flags_dir)/$(_base_all_release).textproto $(_flags_dir)/$(_base_all_release).json:

	: created by $(OUT_DIR)/release-config

        _base_all_release :=

    endif

    _flags_dir:=

    _flags_file:=

core/tasks/device-tests.mk

+1 −16
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 




.PHONY: device-tests

.PHONY: device-tests-host-shared-libs



device-tests-zip := $(PRODUCT_OUT)/device-tests.zip

# Create an artifact to include a list of test config files in device-tests.
@@ -22,7 +21,6 @@ device-tests-list-zip := $(PRODUCT_OUT)/device-tests_list.zip 
# Create an artifact to include all test config files in device-tests.

device-tests-configs-zip := $(PRODUCT_OUT)/device-tests_configs.zip

my_host_shared_lib_for_device_tests := $(call copy-many-files,$(COMPATIBILITY.device-tests.HOST_SHARED_LIBRARY.FILES))

device_tests_host_shared_libs_zip := $(PRODUCT_OUT)/device-tests_host-shared-libs.zip



$(device-tests-zip) : .KATI_IMPLICIT_OUTPUTS := $(device-tests-list-zip) $(device-tests-configs-zip)

$(device-tests-zip) : PRIVATE_device_tests_list := $(PRODUCT_OUT)/device-tests_list
@@ -47,22 +45,9 @@ $(device-tests-zip) : $(COMPATIBILITY.device-tests.FILES) $(COMPATIBILITY.device 
	rm -f $@.list $@-host.list $@-target.list $@-host-test-configs.list $@-target-test-configs.list \

		$(PRIVATE_device_tests_list)



$(device_tests_host_shared_libs_zip) : PRIVATE_device_host_shared_libs_zip := $(device_tests_host_shared_libs_zip)

$(device_tests_host_shared_libs_zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_device_tests)

$(device_tests_host_shared_libs_zip) : $(my_host_shared_lib_for_device_tests) $(SOONG_ZIP)

	rm -f $@-shared-libs.list

	$(hide) for shared_lib in $(PRIVATE_HOST_SHARED_LIBS); do \

	  echo $$shared_lib >> $@-shared-libs.list; \

	done

	grep $(HOST_OUT_TESTCASES) $@-shared-libs.list > $@-host-shared-libs.list || true

	$(SOONG_ZIP) -d -o $(PRIVATE_device_host_shared_libs_zip) \

	  -P host -C $(HOST_OUT) -l $@-host-shared-libs.list



device-tests: $(device-tests-zip)

device-tests-host-shared-libs: $(device_tests_host_shared_libs_zip)



$(call dist-for-goals, device-tests, $(device-tests-zip) $(device-tests-list-zip) $(device-tests-configs-zip) $(device_tests_host_shared_libs_zip))

$(call dist-for-goals, device-tests-host-shared-libs, $(device_tests_host_shared_libs_zip))

$(call dist-for-goals, device-tests, $(device-tests-zip) $(device-tests-list-zip) $(device-tests-configs-zip))



$(call declare-1p-container,$(device-tests-zip),)

$(call declare-container-license-deps,$(device-tests-zip),$(COMPATIBILITY.device-tests.FILES) $(my_host_shared_lib_for_device_tests),$(PRODUCT_OUT)/:/)