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

Commit 1c3ae206 authored by Xin Li's avatar Xin Li
Browse files

Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 

Bug: 248070379
Merged-In: I592acf9a3868e2a60e203b2201e7fadcbb0e7f04
Change-Id: Ia67b109e76eea8167961bf525ee29957cc7264de
parents 1b3853fb bde9bdce

core/android_soong_config_vars.mk

+2 −2
Original line number Diff line number Diff line
@@ -99,8 +99,8 @@ 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)



# Enable system_server optimizations by default unless explicitly set or if

core/distdir.mk

+25 −89
Original line number Diff line number Diff line
@@ -49,18 +49,21 @@ endef 


define __share-projects-rule

$(1) : PRIVATE_TARGETS := $(2)

$(1) : PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,METAPACKAGING,codesharing)/$(1)/arguments

$(1): $(2) $(COMPLIANCE_LISTSHARE)

	$(hide) rm -f $$@

	mkdir -p $$(dir $$@)

	$$(if $$(strip $$(PRIVATE_TARGETS)),OUT_DIR=$(OUT_DIR) $(COMPLIANCE_LISTSHARE) -o $$@ $$(PRIVATE_TARGETS),touch $$@)

	mkdir -p $$(dir $$(PRIVATE_ARGUMENT_FILE))

	$$(if $$(strip $$(PRIVATE_TARGETS)),$$(call dump-words-to-file,$$(PRIVATE_TARGETS),$$(PRIVATE_ARGUMENT_FILE)))

	$$(if $$(strip $$(PRIVATE_TARGETS)),OUT_DIR=$(OUT_DIR) $(COMPLIANCE_LISTSHARE) -o $$@ @$$(PRIVATE_ARGUMENT_FILE),touch $$@)

endef



# build list of projects to share in $(1) for meta_lic in $(2)

# build list of projects to share in $(1) for dist targets in $(2)

#

# $(1): the intermediate project sharing file

# $(2): the license metadata to base the sharing on

# $(2): the dist files to base the sharing on

define _share-projects-rule

$(eval $(call __share-projects-rule,$(1),$(2)))

$(eval $(call __share-projects-rule,$(1),$(call corresponding-license-metadata,$(2))))

endef



.PHONY: alllicensetexts
@@ -83,99 +86,32 @@ $(2): $(3) $(TEXTNOTICE) 
	$$(if $$(strip $$(PRIVATE_TARGETS)),OUT_DIR=$(OUT_DIR) $(TEXTNOTICE) -o $$@ @$$(PRIVATE_ARGUMENT_FILE),touch $$@)

endef



# build list of projects to share in $(2) for meta_lic in $(3) for dist goals $(1)

# Strip `out/dist/` used as proxy for 'DIST_DIR'

# build list of projects to share in $(2) for dist targets in $(3) for dist goal $(1)

#

# $(1): the name of the dist goals

# $(1): the name of the dist goal

# $(2): the intermediate project sharing file

# $(3): the license metadata to base the sharing on

# $(3): the dist files to base the sharing on

define _license-texts-rule

$(eval $(call __license-texts-rule,$(1),$(2),$(3),out/dist/))

endef



###########################################################

## License metadata build rule for dist target $(1) with meta_lic $(2) copied from $(3)

###########################################################

define _dist-target-license-metadata-rule

$(strip $(eval _meta :=$(2)))

$(strip $(eval _dep:=))

# 0p is the indicator for a non-copyrightable file where no party owns the copyright.

# i.e. pure data with no copyrightable expression.

# If all of the sources are 0p and only 0p, treat the copied file as 0p. Otherwise, all

# of the sources must either be 0p or originate from a single metadata file to copy.

$(strip $(foreach s,$(strip $(3)),\

  $(eval _dmeta:=$(ALL_TARGETS.$(s).META_LIC))\

  $(if $(strip $(_dmeta)),\

    $(if $(filter-out 0p,$(_dep)),\

      $(if $(filter-out $(_dep) 0p,$(_dmeta)),\

        $(error cannot copy target from multiple modules: $(1) from $(_dep) and $(_dmeta)),\

        $(if $(filter 0p,$(_dep)),$(eval _dep:=$(_dmeta)))),\

      $(eval _dep:=$(_dmeta))\

    ),\

    $(eval TARGETS_MISSING_LICENSE_METADATA += $(s) $(1)))))





ifeq (0p,$(strip $(_dep)))

# Not copyrightable. No emcumbrances, no license text, no license kind etc.

$(_meta): PRIVATE_CONDITIONS := unencumbered

$(_meta): PRIVATE_SOURCES := $(3)

$(_meta): PRIVATE_INSTALLED := $(1)

# use `$(1)` which is the unique and relatively short `out/dist/$(target)`

$(_meta): PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,METAPACKAGING,notice)/$(1)/arguments

$(_meta): $(BUILD_LICENSE_METADATA)

$(_meta) :

	rm -f $$@

	mkdir -p $$(dir $$@)

	mkdir -p $$(dir $$(PRIVATE_ARGUMENT_FILE))

	$$(call dump-words-to-file,\

	    $$(addprefix -c ,$$(PRIVATE_CONDITIONS))\

	    $$(addprefix -s ,$$(PRIVATE_SOURCES))\

	    $$(addprefix -t ,$$(PRIVATE_TARGETS))\

	    $$(addprefix -i ,$$(PRIVATE_INSTALLED)),\

	    $$(PRIVATE_ARGUMENT_FILE))

	OUT_DIR=$(OUT_DIR) $(BUILD_LICENSE_METADATA) \

	  @$$(PRIVATE_ARGUMENT_FILE) \

	  -o $$@



else ifneq (,$(strip $(_dep)))

# Not a missing target, copy metadata and `is_container` etc. from license metadata file `$(_dep)`

$(_meta): PRIVATE_DEST_TARGET := $(1)

$(_meta): PRIVATE_SOURCE_TARGETS := $(3)

$(_meta): PRIVATE_SOURCE_METADATA := $(_dep)

# use `$(1)` which is the unique and relatively short `out/dist/$(target)`

$(_meta): PRIVATE_ARGUMENT_FILE := $(call intermediates-dir-for,METAPACKAGING,copynotice)/$(1)/arguments

$(_meta) : $(_dep) $(COPY_LICENSE_METADATA)

	rm -f $$@

	mkdir -p $$(dir $$@)

	mkdir -p $$(dir $$(PRIVATE_ARGUMENT_FILE))

	$$(call dump-words-to-file,\

	    $$(addprefix -i ,$$(PRIVATE_DEST_TARGET))\

	    $$(addprefix -s ,$$(PRIVATE_SOURCE_TARGETS))\

	    $$(addprefix -d ,$$(PRIVATE_SOURCE_METADATA)),\

	    $$(PRIVATE_ARGUMENT_FILE))

	OUT_DIR=$(OUT_DIR) $(COPY_LICENSE_METADATA) \

	  @$$(PRIVATE_ARGUMENT_FILE) \

	  -o $$@



endif

$(eval $(call __license-texts-rule,$(1),$(2),$(call corresponding-license-metadata,$(3)),$(sort $(dir $(3)))))

endef



# use `out/dist/` as a proxy for 'DIST_DIR'

define _add_projects_to_share

$(strip $(eval _mdir := $(call intermediates-dir-for,METAPACKAGING,meta)/out/dist)) \

$(strip $(eval _idir := $(call intermediates-dir-for,METAPACKAGING,shareprojects))) \

$(strip $(eval _tdir := $(call intermediates-dir-for,METAPACKAGING,licensetexts))) \

$(strip $(eval _allt := $(sort $(foreach goal,$(_all_dist_goal_output_pairs),$(call word-colon,2,$(goal)))))) \

$(foreach target,$(_allt), \

  $(eval _goals := $(sort $(foreach dg,$(filter %:$(target),$(_all_dist_goal_output_pairs)),$(call word-colon,1,$(dg))))) \

  $(eval _srcs := $(sort $(foreach sdp,$(filter %:$(target),$(_all_dist_src_dst_pairs)),$(call word-colon,1,$(sdp))))) \

  $(eval $(call _dist-target-license-metadata-rule,out/dist/$(target),$(_mdir)/out/dist/$(target).meta_lic,$(_srcs))) \

  $(eval _f := $(_idir)/$(target).shareprojects) \

  $(eval _n := $(_tdir)/$(target).txt) \

  $(eval $(call dist-for-goals,$(_goals),$(_f):shareprojects/$(target).shareprojects)) \

  $(eval $(call dist-for-goals,$(_goals),$(_n):licensetexts/$(target).txt)) \

  $(eval $(call _share-projects-rule,$(_f),$(foreach t, $(filter-out $(TARGETS_MISSING_LICENSE_METADATA),out/dist/$(target)),$(_mdir)/$(t).meta_lic))) \

  $(eval $(call _license-texts-rule,$(_goals),$(_n),$(foreach t,$(filter-out $(TARGETS_MISSING_LICENSE_METADATA),out/dist/$(target)),$(_mdir)/$(t).meta_lic))) \

$(strip $(eval _goals := $(sort $(_all_dist_goals)))) \

$(strip $(eval _opairs := $(sort $(_all_dist_goal_output_pairs)))) \

$(strip $(eval _dpairs := $(sort $(_all_dist_src_dst_pairs)))) \

$(strip $(eval _allt :=)) \

$(foreach goal,$(_goals), \

  $(eval _f := $(_idir)/$(goal).shareprojects) \

  $(eval _n := $(_tdir)/$(goal).txt) \

  $(call dist-for-goals,$(goal),$(_f):shareprojects/$(basename $(notdir $(_f)))) \

  $(call dist-for-goals,$(goal),$(_n):licensetexts/$(basename $(notdir $(_n)))) \

  $(eval _targets :=) \

  $(foreach op,$(filter $(goal):%,$(_opairs)),$(foreach p,$(filter %:$(call word-colon,2,$(op)),$(_dpairs)),$(eval _targets += $(call word-colon,1,$(p))))) \

  $(eval _allt += $(_targets)) \

  $(eval $(call _share-projects-rule,$(_f),$(_targets))) \

  $(eval $(call _license-texts-rule,$(goal),$(_n),$(_targets))) \

)

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

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 := 2022-10-05

    PLATFORM_SECURITY_PATCH := 2022-11-05

endif



include $(BUILD_SYSTEM)/version_util.mk

target/product/OWNERS

+3 −3
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ per-file gsi_release.mk = file:/target/product/gsi/OWNERS 
per-file developer_gsi_keys.mk = file:/target/product/gsi/OWNERS



# Android Go

per-file go_defaults.mk = gkaiser@google.com, rajekumar@google.com

per-file go_defaults_512.mk = gkaiser@google.com, rajekumar@google.com

per-file go_defaults_common.mk = gkaiser@google.com, rajekumar@google.com
 
per-file go_defaults.mk = gkaiser@google.com, kushg@google.com, rajekumar@google.com

per-file go_defaults_512.mk = gkaiser@google.com, kushg@google.com, rajekumar@google.com

per-file go_defaults_common.mk = gkaiser@google.com, kushg@google.com, rajekumar@google.com
 
 No newline at end of file