diff options
| -rw-r--r-- | core/tasks/device-platinum-tests.mk | 39 | ||||
| -rw-r--r-- | core/tasks/performance-tests.mk | 32 | ||||
| -rw-r--r-- | target/board/ndk/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | target/product/gsi_release.mk | 9 | ||||
| -rw-r--r-- | tools/compliance/go.mod | 28 | ||||
| -rw-r--r-- | tools/compliance/go.sum | 2 | ||||
| -rw-r--r-- | tools/compliance/go.work | 18 | ||||
| -rw-r--r-- | tools/releasetools/common.py | 9 | ||||
| -rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 2 |
9 files changed, 73 insertions, 68 deletions
diff --git a/core/tasks/device-platinum-tests.mk b/core/tasks/device-platinum-tests.mk index 270248c4b1..75f4c4c29b 100644 --- a/core/tasks/device-platinum-tests.mk +++ b/core/tasks/device-platinum-tests.mk @@ -15,20 +15,23 @@ .PHONY: device-platinum-tests -device-platinum-tests-zip := $(PRODUCT_OUT)/device-platinum-tests.zip +device_platinum_tests_zip := $(PRODUCT_OUT)/device-platinum-tests.zip # Create an artifact to include a list of test config files in device-platinum-tests. -device-platinum-tests-list-zip := $(PRODUCT_OUT)/device-platinum-tests_list.zip +device_platinum_tests_list_zip := $(PRODUCT_OUT)/device-platinum-tests_list.zip # Create an artifact to include all test config files in device-platinum-tests. -device-platinum-tests-configs-zip := $(PRODUCT_OUT)/device-platinum-tests_configs.zip +device_platinum_tests_configs_zip := $(PRODUCT_OUT)/device-platinum-tests_configs.zip my_host_shared_lib_for_device_platinum_tests := $(call copy-many-files,$(COMPATIBILITY.device-platinum-tests.HOST_SHARED_LIBRARY.FILES)) device_platinum_tests_host_shared_libs_zip := $(PRODUCT_OUT)/device-platinum-tests_host-shared-libs.zip -$(device-platinum-tests-zip) : .KATI_IMPLICIT_OUTPUTS := $(device-platinum-tests-list-zip) $(device-platinum-tests-configs-zip) $(device_platinum_tests_host_shared_libs_zip) -$(device-platinum-tests-zip) : PRIVATE_device_platinum_tests_list := $(PRODUCT_OUT)/device-platinum-tests_list -$(device-platinum-tests-zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_device_platinum_tests) -$(device-platinum-tests-zip) : PRIVATE_device_host_shared_libs_zip := $(device_platinum_tests_host_shared_libs_zip) -$(device-platinum-tests-zip) : $(COMPATIBILITY.device-platinum-tests.FILES) $(my_host_shared_lib_for_device_platinum_tests) $(SOONG_ZIP) +$(device_platinum_tests_zip) : .KATI_IMPLICIT_OUTPUTS := $(device_platinum_tests_list_zip) $(device_platinum_tests_configs_zip) $(device_platinum_tests_host_shared_libs_zip) +$(device_platinum_tests_zip) : PRIVATE_device_platinum_tests_list_zip := $(device_platinum_tests_list_zip) +$(device_platinum_tests_zip) : PRIVATE_device_platinum_tests_configs_zip := $(device_platinum_tests_configs_zip) +$(device_platinum_tests_zip) : PRIVATE_device_platinum_tests_list := $(PRODUCT_OUT)/device-platinum-tests_list +$(device_platinum_tests_zip) : PRIVATE_HOST_SHARED_LIBS := $(my_host_shared_lib_for_device_platinum_tests) +$(device_platinum_tests_zip) : PRIVATE_device_host_shared_libs_zip := $(device_platinum_tests_host_shared_libs_zip) +$(device_platinum_tests_zip) : $(COMPATIBILITY.device-platinum-tests.FILES) $(my_host_shared_lib_for_device_platinum_tests) $(SOONG_ZIP) rm -f $@-shared-libs.list + rm -f $(PRIVATE_device_platinum_tests_list_zip) echo $(sort $(COMPATIBILITY.device-platinum-tests.FILES)) | tr " " "\n" > $@.list grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true grep -e .*\\.config$$ $@-host.list > $@-host-test-configs.list || true @@ -40,7 +43,7 @@ $(device-platinum-tests-zip) : $(COMPATIBILITY.device-platinum-tests.FILES) $(my 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 -sha256 - $(hide) $(SOONG_ZIP) -d -o $(device-platinum-tests-configs-zip) \ + $(hide) $(SOONG_ZIP) -d -o $(PRIVATE_device_platinum_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_device_host_shared_libs_zip) \ @@ -48,21 +51,21 @@ $(device-platinum-tests-zip) : $(COMPATIBILITY.device-platinum-tests.FILES) $(my rm -f $(PRIVATE_device_platinum_tests_list) $(hide) grep -e .*\\.config$$ $@-host.list | sed s%$(HOST_OUT)%host%g > $(PRIVATE_device_platinum_tests_list) $(hide) grep -e .*\\.config$$ $@-target.list | sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_device_platinum_tests_list) - $(hide) $(SOONG_ZIP) -d -o $(device-platinum-tests-list-zip) -C $(dir $@) -f $(PRIVATE_device_platinum_tests_list) + $(hide) $(SOONG_ZIP) -d -o $(PRIVATE_device_platinum_tests_list_zip) -C $(dir $@) -f $(PRIVATE_device_platinum_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_device_platinum_tests_list) -device-platinum-tests: $(device-platinum-tests-zip) -$(call dist-for-goals, device-platinum-tests, $(device-platinum-tests-zip) $(device-platinum-tests-list-zip) $(device-platinum-tests-configs-zip) $(device_platinum_tests_host_shared_libs_zip)) +device-platinum-tests: $(device_platinum_tests_zip) +$(call dist-for-goals, device-platinum-tests, $(device_platinum_tests_zip) $(device_platinum_tests_list_zip) $(device_platinum_tests_configs_zip) $(device_platinum_tests_host_shared_libs_zip)) -$(call declare-1p-container,$(device-platinum-tests-zip),) -$(call declare-container-license-deps,$(device-platinum-tests-zip),$(COMPATIBILITY.device-platinum-tests.FILES) $(my_host_shared_lib_for_device_platinum_tests),$(PRODUCT_OUT)/:/) +$(call declare-1p-container,$(device_platinum_tests_zip),) +$(call declare-container-license-deps,$(device_platinum_tests_zip),$(COMPATIBILITY.device-platinum-tests.FILES) $(my_host_shared_lib_for_device_platinum_tests),$(PRODUCT_OUT)/:/) tests: device-platinum-tests # Reset temp vars -device-platinum-tests-zip := -device-platinum-tests-list-zip := -device-platinum-tests-configs-zip := +device_platinum_tests_zip := +device_platinum_tests_list_zip := +device_platinum_tests_configs_zip := my_host_shared_lib_for_device_platinum_tests := -device_platinum_tests_host_shared_libs_zip :=
\ No newline at end of file +device_platinum_tests_host_shared_libs_zip := diff --git a/core/tasks/performance-tests.mk b/core/tasks/performance-tests.mk index 32c156d3c7..8702756f31 100644 --- a/core/tasks/performance-tests.mk +++ b/core/tasks/performance-tests.mk @@ -15,40 +15,42 @@ .PHONY: performance-tests -performance-tests-zip := $(PRODUCT_OUT)/performance-tests.zip +performance_tests_zip := $(PRODUCT_OUT)/performance-tests.zip # Create an artifact to include a list of test config files in performance-tests. -performance-tests-list-zip := $(PRODUCT_OUT)/performance-tests_list.zip +performance_tests_list_zip := $(PRODUCT_OUT)/performance-tests_list.zip # Create an artifact to include all test config files in performance-tests. -performance-tests-configs-zip := $(PRODUCT_OUT)/performance-tests_configs.zip +performance_tests_configs_zip := $(PRODUCT_OUT)/performance-tests_configs.zip -$(performance-tests-zip) : .KATI_IMPLICIT_OUTPUTS := $(performance-tests-list-zip) $(performance-tests-configs-zip) -$(performance-tests-zip) : PRIVATE_performance_tests_list := $(PRODUCT_OUT)/performance-tests_list -$(performance-tests-zip) : $(COMPATIBILITY.performance-tests.FILES) $(SOONG_ZIP) +$(performance_tests_zip) : .KATI_IMPLICIT_OUTPUTS := $(performance_tests_list_zip) $(performance_tests_configs_zip) +$(performance_tests_zip) : PRIVATE_performance_tests_list_zip := $(performance_tests_list_zip) +$(performance_tests_zip) : PRIVATE_performance_tests_configs_zip := $(performance_tests_configs_zip) +$(performance_tests_zip) : PRIVATE_performance_tests_list := $(PRODUCT_OUT)/performance-tests_list +$(performance_tests_zip) : $(COMPATIBILITY.performance-tests.FILES) $(SOONG_ZIP) echo $(sort $(COMPATIBILITY.performance-tests.FILES)) | tr " " "\n" > $@.list grep $(HOST_OUT_TESTCASES) $@.list > $@-host.list || true grep -e .*\\.config$$ $@-host.list > $@-host-test-configs.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 -sha256 - $(hide) $(SOONG_ZIP) -d -o $(performance-tests-configs-zip) \ + $(hide) $(SOONG_ZIP) -d -o $(PRIVATE_performance_tests_configs_zip) \ -P host -C $(HOST_OUT) -l $@-host-test-configs.list \ -P target -C $(PRODUCT_OUT) -l $@-target-test-configs.list rm -f $(PRIVATE_performance_tests_list) $(hide) grep -e .*\\.config$$ $@-host.list | sed s%$(HOST_OUT)%host%g > $(PRIVATE_performance_tests_list) $(hide) grep -e .*\\.config$$ $@-target.list | sed s%$(PRODUCT_OUT)%target%g >> $(PRIVATE_performance_tests_list) - $(hide) $(SOONG_ZIP) -d -o $(performance-tests-list-zip) -C $(dir $@) -f $(PRIVATE_performance_tests_list) + $(hide) $(SOONG_ZIP) -d -o $(PRIVATE_performance_tests_list_zip) -C $(dir $@) -f $(PRIVATE_performance_tests_list) rm -f $@.list $@-host.list $@-target.list $@-host-test-configs.list $@-target-test-configs.list \ $(PRIVATE_performance_tests_list) -performance-tests: $(performance-tests-zip) -$(call dist-for-goals, performance-tests, $(performance-tests-zip) $(performance-tests-list-zip) $(performance-tests-configs-zip)) +performance-tests: $(performance_tests_zip) +$(call dist-for-goals, performance-tests, $(performance_tests_zip) $(performance_tests_list_zip) $(performance_tests_configs_zip)) -$(call declare-1p-container,$(performance-tests-zip),) -$(call declare-container-license-deps,$(performance-tests-zip),$(COMPATIBILITY.performance-tests.FILES),$(PRODUCT_OUT)/:/) +$(call declare-1p-container,$(performance_tests_zip),) +$(call declare-container-license-deps,$(performance_tests_zip),$(COMPATIBILITY.performance-tests.FILES),$(PRODUCT_OUT)/:/) tests: performance-tests # Reset temp vars -performance-tests-zip := -performance-tests-list-zip := -performance-tests-configs-zip := +performance_tests_zip := +performance_tests_list_zip := +performance_tests_configs_zip := diff --git a/target/board/ndk/BoardConfig.mk b/target/board/ndk/BoardConfig.mk index c7d9d4c908..e367918a8d 100644 --- a/target/board/ndk/BoardConfig.mk +++ b/target/board/ndk/BoardConfig.mk @@ -14,5 +14,3 @@ # TARGET_ARCH_SUITE := ndk - -MALLOC_LOW_MEMORY := true diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index 884b419868..5044a39184 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -50,10 +50,13 @@ PRODUCT_PACKAGES += \ init.gsi.rc \ init.vndk-nodef.rc \ + # Overlay the GSI specific SystemUI setting -PRODUCT_PACKAGES += gsi_overlay_systemui -PRODUCT_COPY_FILES += \ - device/generic/common/overlays/overlay-config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/overlay/config/config.xml +ifneq ($(PRODUCT_IS_AUTOMOTIVE),true) + PRODUCT_PACKAGES += gsi_overlay_systemui + PRODUCT_COPY_FILES += \ + device/generic/common/overlays/overlay-config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/overlay/config/config.xml +endif # b/308878144 no more VNDK on 24Q1 and beyond KEEP_VNDK ?= false diff --git a/tools/compliance/go.mod b/tools/compliance/go.mod index bd040774b1..532efd486e 100644 --- a/tools/compliance/go.mod +++ b/tools/compliance/go.mod @@ -1,29 +1,11 @@ -module android/soong/tools/compliance - -require google.golang.org/protobuf v0.0.0 +go 1.22 -replace google.golang.org/protobuf v0.0.0 => ../../../../external/golang-protobuf +module android/soong/tools/compliance require ( - android/soong v0.0.0 github.com/google/blueprint v0.0.0 + android/soong v0.0.0 + google.golang.org/protobuf v0.0.0 github.com/spdx/tools-golang v0.0.0 + github.com/google/go-cmp v0.0.0 ) - -replace github.com/spdx/tools-golang v0.0.0 => ../../../../external/spdx-tools - -require golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect - -replace android/soong v0.0.0 => ../../../soong - -replace github.com/google/blueprint => ../../../blueprint - -// Indirect deps from golang-protobuf -exclude github.com/golang/protobuf v1.5.0 - -replace github.com/google/go-cmp v0.5.5 => ../../../../external/go-cmp - -// Indirect dep from go-cmp -exclude golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 - -go 1.21 diff --git a/tools/compliance/go.sum b/tools/compliance/go.sum deleted file mode 100644 index cbe76d9187..0000000000 --- a/tools/compliance/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= -golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= diff --git a/tools/compliance/go.work b/tools/compliance/go.work new file mode 100644 index 0000000000..a24d2ea541 --- /dev/null +++ b/tools/compliance/go.work @@ -0,0 +1,18 @@ +go 1.22 + +use ( + . + ../../../../build/blueprint + ../../../../build/soong + ../../../../external/go-cmp + ../../../../external/golang-protobuf + ../../../../external/spdx-tools +) + +replace ( + github.com/google/blueprint v0.0.0 => ../../../../build/blueprint + android/soong v0.0.0 => ../../../../build/soong + github.com/google/go-cmp v0.0.0 => ../../../../external/go-cmp + google.golang.org/protobuf v0.0.0 => ../../../../external/golang-protobuf + github.com/spdx/tools-golang v0.0.0 => ../../../../external/spdx-tools +) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 2367691e43..d91a713276 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -1971,7 +1971,7 @@ def GetBootableImage(name, prebuilt_name, unpack_dir, tree_subdir, return None -def _BuildVendorBootImage(sourcedir, partition_name, info_dict=None): +def _BuildVendorBootImage(sourcedir, fs_config_file, partition_name, info_dict=None): """Build a vendor boot image from the specified sourcedir. Take a ramdisk, dtb, and vendor_cmdline from the input (in 'sourcedir'), and @@ -1987,7 +1987,7 @@ def _BuildVendorBootImage(sourcedir, partition_name, info_dict=None): img = tempfile.NamedTemporaryFile() ramdisk_format = GetRamdiskFormat(info_dict) - ramdisk_img = _MakeRamdisk(sourcedir, ramdisk_format=ramdisk_format) + ramdisk_img = _MakeRamdisk(sourcedir, fs_config_file=fs_config_file, ramdisk_format=ramdisk_format) # use MKBOOTIMG from environ, or "mkbootimg" if empty or not set mkbootimg = os.getenv('MKBOOTIMG') or "mkbootimg" @@ -2101,8 +2101,9 @@ def GetVendorBootImage(name, prebuilt_name, unpack_dir, tree_subdir, if info_dict is None: info_dict = OPTIONS.info_dict + fs_config = "META/" + tree_subdir.lower() + "_filesystem_config.txt" data = _BuildVendorBootImage( - os.path.join(unpack_dir, tree_subdir), "vendor_boot", info_dict) + os.path.join(unpack_dir, tree_subdir), os.path.join(unpack_dir, fs_config), "vendor_boot", info_dict) if data: return File(name, data) return None @@ -2126,7 +2127,7 @@ def GetVendorKernelBootImage(name, prebuilt_name, unpack_dir, tree_subdir, info_dict = OPTIONS.info_dict data = _BuildVendorBootImage( - os.path.join(unpack_dir, tree_subdir), "vendor_kernel_boot", info_dict) + os.path.join(unpack_dir, tree_subdir), None, "vendor_kernel_boot", info_dict) if data: return File(name, data) return None diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 5a024cec54..985cd56cb0 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -329,7 +329,7 @@ OPTIONS.vabc_downgrade = False OPTIONS.enable_vabc_xor = True OPTIONS.force_minor_version = None OPTIONS.compressor_types = None -OPTIONS.enable_zucchini = True +OPTIONS.enable_zucchini = False OPTIONS.enable_puffdiff = None OPTIONS.enable_lz4diff = False OPTIONS.vabc_compression_param = None |