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

Commit ff97a435 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 

Bug: 298295554
Merged-In: I689cb6dcf66cd4a23c447bd0d761677f78b0936a
Change-Id: I5912541c93371a9bb0b00916b8c2404b4d96d521
parents f4e7e17d cbceed22

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=AOSP.MAIN
 
BUILD_ID=MAIN

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE)) 
# is made which breaks compatibility with the previous platform sepolicy version,

# not just on every increase in PLATFORM_SDK_VERSION.  The minor version should

# be reset to 0 on every bump of the PLATFORM_SDK_VERSION.

sepolicy_major_vers := 33

sepolicy_major_vers := 34

sepolicy_minor_vers := 0



ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))

core/generate_enforce_rro.mk

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ endif 


LOCAL_FULL_MANIFEST_FILE := $(rro_android_manifest_file)



LOCAL_AAPT_FLAGS += --auto-add-overlay

LOCAL_AAPT_FLAGS += --auto-add-overlay --keep-raw-values

LOCAL_RESOURCE_DIR := $(enforce_rro_source_overlays)



ifeq (product,$(enforce_rro_partition))

core/tasks/automotive-general-tests.mk

0 → 100644
+89 −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.



.PHONY: automotive-general-tests



automotive_general_tests_tools := \

    $(HOST_OUT_JAVA_LIBRARIES)/cts-tradefed.jar \

    $(HOST_OUT_JAVA_LIBRARIES)/compatibility-host-util.jar \

    $(HOST_OUT_JAVA_LIBRARIES)/vts-tradefed.jar \



intermediates_dir := $(call intermediates-dir-for,PACKAGING,automotive-general-tests)

automotive_general_tests_zip := $(PRODUCT_OUT)/automotive-general-tests.zip

# Create an artifact to include a list of test config files in automotive-general-tests.

automotive_general_tests_list_zip := $(PRODUCT_OUT)/automotive-general-tests_list.zip



# Filter shared entries between automotive-general-tests and automotive-tests's HOST_SHARED_LIBRARY.FILES,

# to avoid warning about overriding commands.

my_host_shared_lib_for_automotive_general_tests := \

  $(foreach m,$(filter $(COMPATIBILITY.automotive-tests.HOST_SHARED_LIBRARY.FILES),\

	   $(COMPATIBILITY.automotive-general-tests.HOST_SHARED_LIBRARY.FILES)),$(call word-colon,2,$(m)))

my_automotive_general_tests_shared_lib_files := \

  $(filter-out $(COMPATIBILITY.automotive-tests.HOST_SHARED_LIBRARY.FILES),\

	 $(COMPATIBILITY.automotive-general-tests.HOST_SHARED_LIBRARY.FILES))



my_host_shared_lib_for_automotive_general_tests += $(call copy-many-files,$(my_automotive_general_tests_shared_lib_files))



# Create an artifact to include all test config files in automotive-general-tests.

automotive_general_tests_configs_zip := $(PRODUCT_OUT)/automotive-general-tests_configs.zip

# Create an artifact to include all shared librariy files in automotive-general-tests.

automotive_general_tests_host_shared_libs_zip := $(PRODUCT_OUT)/automotive-general-tests_host-shared-libs.zip



$(automotive_general_tests_zip) : PRIVATE_automotive_general_tests_list_zip := $(automotive_general_tests_list_zip)

$(automotive_general_tests_zip) : .KATI_IMPLICIT_OUTPUTS := $(automotive_general_tests_list_zip) $(automotive_general_tests_configs_zip) $(automotive_general_tests_host_shared_libs_zip)

$(automotive_general_tests_zip) : PRIVATE_TOOLS := $(automotive_general_tests_tools)

$(automotive_general_tests_zip) : PRIVATE_INTERMEDIATES_DIR := $(intermediates_dir)

$(automotive_general_tests_zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_automotive_general_tests)

$(automotive_general_tests_zip) : PRIVATE_automotive_general_tests_configs_zip := $(automotive_general_tests_configs_zip)

$(automotive_general_tests_zip) : PRIVATE_general_host_shared_libs_zip := $(automotive_general_tests_host_shared_libs_zip)

$(automotive_general_tests_zip) : $(COMPATIBILITY.automotive-general-tests.FILES) $(automotive_general_tests_tools) $(my_host_shared_lib_for_automotive_general_tests) $(SOONG_ZIP)

	rm -rf $(PRIVATE_INTERMEDIATES_DIR)

	rm -f $@ $(PRIVATE_automotive_general_tests_list_zip)

	mkdir -p $(PRIVATE_INTERMEDIATES_DIR) $(PRIVATE_INTERMEDIATES_DIR)/tools

	echo $(sort $(COMPATIBILITY.automotive-general-tests.FILES)) | tr " " "\n" > $(PRIVATE_INTERMEDIATES_DIR)/list

	grep $(HOST_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/list > $(PRIVATE_INTERMEDIATES_DIR)/host.list || true

	grep $(TARGET_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/list > $(PRIVATE_INTERMEDIATES_DIR)/target.list || true

	grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/host.list > $(PRIVATE_INTERMEDIATES_DIR)/host-test-configs.list || true

	grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/target.list > $(PRIVATE_INTERMEDIATES_DIR)/target-test-configs.list || true

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

	  echo $$shared_lib >> $(PRIVATE_INTERMEDIATES_DIR)/host.list; \

	  echo $$shared_lib >> $(PRIVATE_INTERMEDIATES_DIR)/shared-libs.list; \

	done

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

	cp -fp $(PRIVATE_TOOLS) $(PRIVATE_INTERMEDIATES_DIR)/tools/

	$(SOONG_ZIP) -d -o $@ \

	  -P host -C $(PRIVATE_INTERMEDIATES_DIR) -D $(PRIVATE_INTERMEDIATES_DIR)/tools \

	  -P host -C $(HOST_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/host.list \

	  -P target -C $(PRODUCT_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/target.list

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

	  -P host -C $(HOST_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/host-test-configs.list \

	  -P target -C $(PRODUCT_OUT) -l $(PRIVATE_INTERMEDIATES_DIR)/target-test-configs.list

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

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

	grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/host.list | sed s%$(HOST_OUT)%host%g > $(PRIVATE_INTERMEDIATES_DIR)/automotive-general-tests_list

	grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/target.list | sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_INTERMEDIATES_DIR)/automotive-general-tests_list

	$(SOONG_ZIP) -d -o $(PRIVATE_automotive_general_tests_list_zip) -C $(PRIVATE_INTERMEDIATES_DIR) -f $(PRIVATE_INTERMEDIATES_DIR)/automotive-general-tests_list



automotive-general-tests: $(automotive_general_tests_zip)

$(call dist-for-goals, automotive-general-tests, $(automotive_general_tests_zip) $(automotive_general_tests_list_zip) $(automotive_general_tests_configs_zip) $(automotive_general_tests_host_shared_libs_zip))



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

$(call declare-container-license-deps,$(automotive_general_tests_zip),$(COMPATIBILITY.automotive-general-tests.FILES) $(automotive_general_tests_tools) $(my_host_shared_lib_for_automotive_general_tests),$(PRODUCT_OUT)/:/)



intermediates_dir :=

automotive_general_tests_tools :=

automotive_general_tests_zip :=

automotive_general_tests_list_zip :=

automotive_general_tests_configs_zip :=

automotive_general_tests_host_shared_libs_zip :=

core/tasks/automotive-tests.mk

0 → 100644
+61 −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.





.PHONY: automotive-tests



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

# Create an artifact to include a list of test config files in automotive-tests.

automotive-tests-list-zip := $(PRODUCT_OUT)/automotive-tests_list.zip

# Create an artifact to include all test config files in automotive-tests.

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

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

automotive_tests_host_shared_libs_zip := $(PRODUCT_OUT)/automotive-tests_host-shared-libs.zip



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

$(automotive-tests-zip) : PRIVATE_automotive_tests_list := $(PRODUCT_OUT)/automotive-tests_list

$(automotive-tests-zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_automotive_tests)

$(automotive-tests-zip) : PRIVATE_automotive_host_shared_libs_zip := $(automotive_tests_host_shared_libs_zip)

$(automotive-tests-zip) : $(COMPATIBILITY.automotive-tests.FILES) $(my_host_shared_lib_for_automotive_tests) $(SOONG_ZIP)

	rm -f $@-shared-libs.list

	echo $(sort $(COMPATIBILITY.automotive-tests.FILES)) | tr " " "\n" > $@.list

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

	grep -e .*\\.config$$ $@-host.list > $@-host-test-configs.list || true

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

	  echo $$shared_lib >> $@-host.list; \

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

	done

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

	grep $(TARGET_OUT_TESTCASES) $@.list > $@-target.list || true

	grep -e .*\\.config$$ $@-target.list > $@-target-test-configs.list || true

	$(hide) $(SOONG_ZIP) -d -o $@ -P host -C $(HOST_OUT) -l $@-host.list -P target -C $(PRODUCT_OUT) -l $@-target.list

	$(hide) $(SOONG_ZIP) -d -o $(automotive-tests-configs-zip) \

	  -P host -C $(HOST_OUT) -l $@-host-test-configs.list \

	  -P target -C $(PRODUCT_OUT) -l $@-target-test-configs.list

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

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

	rm -f $(PRIVATE_automotive_tests_list)

	$(hide) grep -e .*\\.config$$ $@-host.list | sed s%$(HOST_OUT)%host%g > $(PRIVATE_automotive_tests_list)

	$(hide) grep -e .*\\.config$$ $@-target.list | sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_automotive_tests_list)

	$(hide) $(SOONG_ZIP) -d -o $(automotive-tests-list-zip) -C $(dir $@) -f $(PRIVATE_automotive_tests_list)

	rm -f $@.list $@-host.list $@-target.list $@-host-test-configs.list $@-target-test-configs.list \

	  $@-shared-libs.list $@-host-shared-libs.list $(PRIVATE_automotive_tests_list)



automotive-tests: $(automotive-tests-zip)

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



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

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



tests: automotive-tests