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

Commit 3cdf392f authored by Xin Li's avatar Xin Li
Browse files

Merge Android 13 QPR1 

Bug: 261731544
Merged-In: Idccbf36672703b1e9a6b27bf117459284bc7ed26
Change-Id: I3c0651138a35d0ec3289be1b0e6873bba57593b4
parents e4c493a3 4a134c38

core/android_soong_config_vars.mk

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



ifdef PRODUCT_AVF_ENABLED

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-11-05

    PLATFORM_SECURITY_PATCH := 2022-12-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

target/product/base_system.mk

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ PRODUCT_PACKAGES += \ 
    init_system \

    input \

    installd \

    IntentResolver \

    ip \

    iptables \

    ip-up-vpn \