diff options
| -rw-r--r-- | core/Makefile | 4 | ||||
| -rw-r--r-- | core/cxx_stl_setup.mk | 2 | ||||
| -rw-r--r-- | core/main.mk | 2 | ||||
| -rw-r--r-- | target/product/build_variables.mk | 3 | ||||
| -rw-r--r-- | tools/sbom/compliance_metadata.py | 4 | ||||
| -rw-r--r-- | tools/sbom/gen_sbom.py | 2 |
6 files changed, 12 insertions, 5 deletions
diff --git a/core/Makefile b/core/Makefile index 9458d7bd2d..5cfd7364c0 100644 --- a/core/Makefile +++ b/core/Makefile @@ -5213,7 +5213,9 @@ APEX_INFO_FILE := $(APEX_OUT)/apex-info-list.xml # apexd_host scans/activates APEX files and writes /apex/apex-info-list.xml # Note that `@echo $(PRIVATE_APEX_FILES)` line is added to trigger the rule when the APEX list is changed. $(APEX_INFO_FILE): PRIVATE_APEX_FILES := $(apex_files) -$(APEX_INFO_FILE): $(HOST_OUT_EXECUTABLES)/apexd_host $(apex_files) +$(APEX_INFO_FILE): $(HOST_OUT_EXECUTABLES)/apexd_host \ + $(HOST_OUT_EXECUTABLES)/deapexer $(HOST_OUT_EXECUTABLES)/debugfs $(HOST_OUT_EXECUTABLES)/fsck.erofs \ + $(apex_files) @echo "Extracting apexes..." @echo $(PRIVATE_APEX_FILES) > /dev/null @rm -rf $(APEX_OUT) diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index 0d557c7d36..5e8ca7f643 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk @@ -78,7 +78,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) my_static_libraries += libc++demangle ifeq ($(my_link_type),static) - my_static_libraries += libm libc libunwind + my_static_libraries += libm libc libunwind libstatic_rustlibs_for_make endif endif else ifeq ($(my_cxx_stl),ndk) diff --git a/core/main.mk b/core/main.mk index e47f773253..447b07a3c0 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1895,7 +1895,7 @@ $(SOONG_OUT_DIR)/compliance-metadata/$(TARGET_PRODUCT)/make-metadata.csv: $(eval _is_partition_compat_symlink := $(if $(findstring $f,$(PARTITION_COMPAT_SYMLINKS)),Y)) \ $(eval _is_flags_file := $(if $(findstring $f, $(ALL_FLAGS_FILES)),Y)) \ $(eval _is_rootdir_symlink := $(if $(findstring $f, $(ALL_ROOTDIR_SYMLINKS)),Y)) \ - $(eval _is_platform_generated := $(_is_build_prop)$(_is_notice_file)$(_is_product_system_other_avbkey)$(_is_event_log_tags_file)$(_is_system_other_odex_marker)$(_is_kernel_modules_blocklist)$(_is_fsverity_build_manifest_apk)$(_is_linker_config)$(_is_partition_compat_symlink)$(_is_flags_file)$(_is_rootdir_symlink)) \ + $(eval _is_platform_generated := $(if $(_is_soong_module),,$(_is_build_prop)$(_is_notice_file)$(_is_product_system_other_avbkey)$(_is_event_log_tags_file)$(_is_system_other_odex_marker)$(_is_kernel_modules_blocklist)$(_is_fsverity_build_manifest_apk)$(_is_linker_config)$(_is_partition_compat_symlink)$(_is_flags_file)$(_is_rootdir_symlink))) \ $(eval _static_libs := $(if $(_is_soong_module),,$(ALL_INSTALLED_FILES.$f.STATIC_LIBRARIES))) \ $(eval _whole_static_libs := $(if $(_is_soong_module),,$(ALL_INSTALLED_FILES.$f.WHOLE_STATIC_LIBRARIES))) \ $(eval _license_text := $(if $(filter $(_build_output_path),$(ALL_NON_MODULES)),$(ALL_NON_MODULES.$(_build_output_path).NOTICES),\ diff --git a/target/product/build_variables.mk b/target/product/build_variables.mk index e99ab0686a..8e1de8f577 100644 --- a/target/product/build_variables.mk +++ b/target/product/build_variables.mk @@ -31,3 +31,6 @@ $(call soong_config_set, libsqlite3, release_package_libsqlite3, $(RELEASE_PACKA # Use the configured MessageQueue implementation $(call soong_config_set, messagequeue, release_package_messagequeue_implementation, $(RELEASE_PACKAGE_MESSAGEQUEUE_IMPLEMENTATION)) + +# Use the configured version of Cronet +$(call soong_config_set,cronet,enable_cronet_tot,$(RELEASE_ENABLE_TOT_CRONET)) diff --git a/tools/sbom/compliance_metadata.py b/tools/sbom/compliance_metadata.py index 502c110154..2f0b180b0d 100644 --- a/tools/sbom/compliance_metadata.py +++ b/tools/sbom/compliance_metadata.py @@ -123,7 +123,7 @@ class MetadataDb: def get_installed_files(self): # Get all records from table make_metadata, which contains all installed files and corresponding make modules' metadata - cursor = self.conn.execute('select installed_file, module_path, is_prebuilt_make_module, product_copy_files, kernel_module_copy_files, is_platform_generated, license_text from make_metadata') + cursor = self.conn.execute('select installed_file, module_path, is_soong_module, is_prebuilt_make_module, product_copy_files, kernel_module_copy_files, is_platform_generated, license_text from make_metadata') rows = cursor.fetchall() cursor.close() installed_files_metadata = [] @@ -135,7 +135,7 @@ class MetadataDb: def get_installed_file_in_dir(self, dir): dir = dir.removesuffix('/') cursor = self.conn.execute( - 'select installed_file, module_path, is_prebuilt_make_module, product_copy_files, ' + 'select installed_file, module_path, is_soong_module, is_prebuilt_make_module, product_copy_files, ' ' kernel_module_copy_files, is_platform_generated, license_text ' 'from make_metadata ' 'where installed_file like ?', (dir + '/%',)) diff --git a/tools/sbom/gen_sbom.py b/tools/sbom/gen_sbom.py index 77bccbb73a..e875ddb6a7 100644 --- a/tools/sbom/gen_sbom.py +++ b/tools/sbom/gen_sbom.py @@ -415,11 +415,13 @@ def save_report(report_file_path, report): def installed_file_has_metadata(installed_file_metadata, report): installed_file = installed_file_metadata['installed_file'] module_path = installed_file_metadata['module_path'] + is_soong_module = installed_file_metadata['is_soong_module'] product_copy_files = installed_file_metadata['product_copy_files'] kernel_module_copy_files = installed_file_metadata['kernel_module_copy_files'] is_platform_generated = installed_file_metadata['is_platform_generated'] if (not module_path and + not is_soong_module and not product_copy_files and not kernel_module_copy_files and not is_platform_generated and |