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

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

Make change and version bump to TQ2A.221004.001 

Change-Id: I999b1a21ee25f01f76ef88ac824710f02abf9505
parents 3431ff8b ee7a6aec

core/Makefile

+13 −13
Original line number Diff line number Diff line
@@ -935,6 +935,7 @@ ifdef my_installed_prebuilt_gki_apex 
  my_apex_extracted_boot_image := $(ALL_MODULES.$(my_installed_prebuilt_gki_apex).EXTRACTED_BOOT_IMAGE)

  INSTALLED_BOOTIMAGE_TARGET := $(PRODUCT_OUT)/boot.img

  $(eval $(call copy-one-file,$(my_apex_extracted_boot_image),$(INSTALLED_BOOTIMAGE_TARGET)))

  $(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot)



  INTERNAL_PREBUILT_BOOTIMAGE := $(my_apex_extracted_boot_image)
@@ -1102,7 +1103,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(AVBTOOL) $(INTERNAL_BOOTIMAGE_FILE 
	$(call pretty,"Target boot image: $@")

	$(call build_boot_board_avb_enabled,$@)



$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),)

$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot)

$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES) $(INTERNAL_GKI_CERTIFICATE_DEPS),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)
@@ -1148,7 +1149,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) $(VBOOT_ 
	$(call pretty,"Target boot image: $@")

	$(call build_boot_supports_vboot,$@)



$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),)

$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot)

$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)
@@ -1170,7 +1171,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) 
	$(call pretty,"Target boot image: $@")

	$(call build_boot_novboot,$@)



$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),)

$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot)

$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_BOOTIMAGE_FILES),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)
@@ -1197,7 +1198,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(INTERNAL_PREBUILT_BOOTIMAGE) $(AVBTOOL) $(BOARD 
	    --partition_name boot $(INTERNAL_AVB_BOOT_SIGNING_ARGS) \

	    $(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS)



$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),)

$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",bool)

$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(INTERNAL_PREBUILT_BOOTIMAGE),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)
@@ -1565,7 +1566,6 @@ ifndef TARGET_BUILD_APPS 
# TARGET_OUT_NOTICE_FILES now that the notice files are gathered from

# the src subdirectory.

kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt

winpthreads_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/winpthreads.txt



# Some targets get included under $(PRODUCT_OUT) for debug symbols or other

# reasons--not to be flashed onto any device. Targets under these directories
@@ -1747,15 +1747,15 @@ endif 


endif  # TARGET_BUILD_APPS



# The kernel isn't really a module, so to get its module file in there, we

# make the target NOTICE files depend on this particular file too, which will

# then be in the right directory for the find in combine-notice-files to work.

# Presently none of the prebuilts etc. comply with policy to have a license text. Fake one here.

$(eval $(call copy-one-file,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,$(kernel_notice_file)))



# No matter where it gets copied from, a copied linux kernel is licensed under "GPL 2.0 only"

$(eval $(call declare-copy-files-license-metadata,,:kernel,SPDX-license-identifier-GPL-2.0-only,notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,))

ifneq (,$(strip $(INSTALLED_KERNEL_TARGET)))

$(call declare-license-metadata,$(INSTALLED_KERNEL_TARGET),SPDX-license-identifier-GPL-2.0-only,restricted,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,"Kernel",kernel)

endif



$(eval $(call copy-one-file,$(BUILD_SYSTEM)/WINPTHREADS_COPYING,$(winpthreads_notice_file)))

# No matter where it gets copied from, a copied linux kernel is licensed under "GPL 2.0 only"

$(eval $(call declare-copy-files-license-metadata,,:kernel,SPDX-license-identifier-GPL-2.0-only,restricted,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,kernel))





# #################################################################
@@ -2553,7 +2553,7 @@ $(INSTALLED_BOOTIMAGE_TARGET): $(recoveryimage-deps) 
	$(call pretty,"Target boot image from recovery: $@")

	$(call build-recoveryimage-target, $@, $(PRODUCT_OUT)/$(subst .img,,$(subst boot,kernel,$(notdir $@))))



$(call declare-1p-container,$(INSTALLED_BOOTIMAGE_TARGET),)

$(call declare-container-license-metadata,$(INSTALLED_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",bool)

$(call declare-container-license-deps,$(INSTALLED_BOOTIMAGE_TARGET),$(recoveryimage-deps),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_BOOTIMAGE_TARGET)
@@ -2724,7 +2724,7 @@ $(INSTALLED_DEBUG_BOOTIMAGE_TARGET): $(MKBOOTIMG) $(INSTALLED_BOOTIMAGE_TARGET) 
	$(call pretty,"Target boot debug image: $@")

	$(call build-debug-bootimage-target, $@)



$(call declare-1p-container,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),)

$(call declare-container-license-metadata,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),SPDX-license-identifier-GPL-2.0-only SPDX-license-identifier-Apache-2.0,restricted notice,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING build/soong/licenses/LICENSE,"Boot Image",boot)

$(call declare-container-license-deps,$(INSTALLED_DEBUG_BOOTIMAGE_TARGET),$(INSTALLED_BOOTIMAGE_TARGET),$(PRODUCT_OUT)/:/)



UNMOUNTED_NOTICE_DEPS += $(INSTALLED_DEBUG_BOOTIMAGE_TARGET)

core/android_soong_config_vars.mk

+19 −4
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ $(call soong_config_set,art_module,source_build,$(ART_MODULE_BUILD_FROM_SOURCE)) 
# default.

INDIVIDUALLY_TOGGLEABLE_PREBUILT_MODULES := \

  bluetooth \

  permission \

  uwb \

  wifi \
@@ -147,11 +148,25 @@ ifeq (eng,$(TARGET_BUILD_VARIANT)) 
$(call soong_config_set,messaging,build_variant_eng,true)

endif



# TODO(b/203088572): Remove when Java optimizations enabled by default for

# SystemUI.

# Enable SystemUI optimizations by default unless explicitly set.

SYSTEMUI_OPTIMIZE_JAVA ?= true

$(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA)

# TODO(b/196084106): Remove when Java optimizations enabled by default for

# system packages.



# Enable system_server optimizations by default unless explicitly set or if

# there may be dependent runtime jars.

# TODO(b/240588226): Remove the off-by-default exceptions after handling

# system_server jars automatically w/ R8.

ifeq (true,$(PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS))

  # If system_server jar ordering is broken, don't assume services.jar can be

  # safely optimized in isolation, as there may be dependent jars.

  SYSTEM_OPTIMIZE_JAVA ?= false

else ifneq (platform:services,$(lastword $(PRODUCT_SYSTEM_SERVER_JARS)))

  # If services is not the final jar in the dependency ordering, don't assume

  # it can be safely optimized in isolation, as there may be dependent jars.

  SYSTEM_OPTIMIZE_JAVA ?= false

else

  SYSTEM_OPTIMIZE_JAVA ?= true

endif

$(call add_soong_config_var,ANDROID,SYSTEM_OPTIMIZE_JAVA)



# Check for SupplementalApi module.

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=TM
 
BUILD_ID=TQ2A.221004.001

core/product-graph.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ define gather-all-makefiles-for-current-product-inner 
		$(if $(filter $(p),$(_all_products_visited)),, \

			$(p) \

			$(eval _all_products_visited += $(p)) \

			$(call all-products-inner, $(PRODUCTS.$(strip $(p)).INHERITS_FROM))

			$(call gather-all-makefiles-for-current-product-inner, $(PRODUCTS.$(strip $(p)).INHERITS_FROM))

		) \

	)

endef

core/tasks/sts-lite.mk

0 → 100644
+40 −0
Original line number Diff line number Diff line 
# Copyright (C) 2022 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



ifneq ($(wildcard test/sts/README-sts-sdk.md),)

test_suite_name := sts-lite

test_suite_tradefed := sts-tradefed

test_suite_readme := test/sts/README-sts-sdk.md

sts_sdk_zip := $(HOST_OUT)/$(test_suite_name)/sts-sdk.zip



include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk



sts_sdk_samples := $(call intermediates-dir-for,ETC,sts-sdk-samples.zip)/sts-sdk-samples.zip



$(sts_sdk_zip): STS_LITE_ZIP := $(compatibility_zip)

$(sts_sdk_zip): STS_SDK_SAMPLES := $(sts_sdk_samples)

$(sts_sdk_zip): $(MERGE_ZIPS) $(ZIP2ZIP) $(compatibility_zip) $(sts_sdk_samples)

	rm -f $@ $(STS_LITE_ZIP)_filtered

	$(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/'

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

	rm -f $(STS_LITE_ZIP)_filtered



.PHONY: sts-sdk

sts-sdk: $(sts_sdk_zip)

$(call dist-for-goals, sts-sdk, $(sts_sdk_zip))



endif