diff options
| -rw-r--r-- | core/Makefile | 11 | ||||
| -rw-r--r-- | core/config.mk | 2 | ||||
| -rw-r--r-- | core/cxx_stl_setup.mk | 2 | ||||
| -rw-r--r-- | core/definitions.mk | 12 | ||||
| -rw-r--r-- | core/dex_preopt.mk | 58 | ||||
| -rw-r--r-- | core/os_licensing.mk | 7 | ||||
| -rw-r--r-- | core/tasks/cts.mk | 27 | ||||
| -rw-r--r-- | tools/warn/OWNERS | 2 |
8 files changed, 28 insertions, 93 deletions
diff --git a/core/Makefile b/core/Makefile index 0d6b175b54..907ef21b7b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1926,15 +1926,6 @@ kernel_notice_file := $(TARGET_OUT_NOTICE_FILES)/src/kernel.txt # need no associated notice file on the device UI. exclude_target_dirs := apex -# TODO(b/69865032): Make PRODUCT_NOTICE_SPLIT the default behavior. -ifneq ($(PRODUCT_NOTICE_SPLIT),true) -#target_notice_file_html := $(TARGET_OUT_INTERMEDIATES)/NOTICE.html -target_notice_file_html_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE.html.gz -installed_notice_html_or_xml_gz := $(TARGET_OUT)/etc/NOTICE.html.gz - -$(call declare-0p-target,$(target_notice_file_html_gz)) -$(call declare-0p-target,$(installed_notice_html_or_xml_gz)) -else # target_notice_file_xml := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml target_notice_file_xml_gz := $(TARGET_OUT_INTERMEDIATES)/NOTICE.xml.gz installed_notice_html_or_xml_gz := $(TARGET_OUT)/etc/NOTICE.xml.gz @@ -2054,8 +2045,6 @@ system_xml_directories := xml_system system_notice_file_message := "Notices for files contained in the system filesystem image in this directory:" endif -endif # PRODUCT_NOTICE_SPLIT - ALL_DEFAULT_INSTALLED_MODULES += $(installed_notice_html_or_xml_gz) need_vendor_notice:=false diff --git a/core/config.mk b/core/config.mk index b89292400b..47018aaba1 100644 --- a/core/config.mk +++ b/core/config.mk @@ -765,7 +765,6 @@ endif # TODO: remove all code referencing these, and remove override variables PRODUCT_FULL_TREBLE := true -PRODUCT_NOTICE_SPLIT := true PRODUCT_TREBLE_LINKER_NAMESPACES := true PRODUCT_ENFORCE_VINTF_MANIFEST := true @@ -774,7 +773,6 @@ PRODUCT_ENFORCE_VINTF_MANIFEST := true PRODUCT_FULL_TREBLE \ PRODUCT_TREBLE_LINKER_NAMESPACES \ PRODUCT_ENFORCE_VINTF_MANIFEST \ - PRODUCT_NOTICE_SPLIT \ # TODO(b/114488870): remove all sets of these everwhere, and disallow them to be used $(KATI_obsolete_var PRODUCT_TREBLE_LINKER_NAMESPACES_OVERRIDE,Deprecated.) diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index 5e8ca7f643..0d557c7d36 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 libstatic_rustlibs_for_make + my_static_libraries += libm libc libunwind endif endif else ifeq ($(my_cxx_stl),ndk) diff --git a/core/definitions.mk b/core/definitions.mk index 40f5af0f64..60034cd064 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -836,18 +836,6 @@ $(strip \ endef ########################################################### -## Declare that non-module targets copied from project $(1) and -## optionally ending in $(2) are non-copyrightable files. -## -## e.g. an information-only file merely listing other files. -########################################################### -define declare-0p-copy-files -$(strip \ - $(foreach _pair,$(filter $(1)%$(2),$(PRODUCT_COPY_FILES)),$(eval $(call declare-0p-target,$(PRODUCT_OUT)/$(call word-colon,2,$(_pair))))) \ -) -endef - -########################################################### ## Declare non-module target $(1) to have a first-party license ## (Android Apache 2.0) ## diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 9b5e1dbeeb..b78c10cc0a 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -13,34 +13,10 @@ else install-on-system-other = $(filter-out $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(basename $(notdir $(filter $(foreach f,$(SYSTEM_OTHER_ODEX_FILTER),$(TARGET_OUT)/$(f)),$(1))))) endif -# Build the boot.zip which contains the boot jars and their compilation output -# We can do this only if preopt is enabled and if the product uses libart config (which sets the -# default properties for preopting). -# At the time of writing, this is only for ART Cloud. ifeq ($(WITH_DEXPREOPT), true) ifneq ($(WITH_DEXPREOPT_ART_BOOT_IMG_ONLY), true) ifeq ($(PRODUCT_USES_DEFAULT_ART_CONFIG), true) -boot_zip := $(PRODUCT_OUT)/boot.zip -bootclasspath_jars := $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES) - -# TODO remove system_server_jars usages from boot.zip and depend directly on system_server.zip file. - -# Use "/system" path for JARs with "platform:" prefix. -# These JARs counterintuitively use "platform" prefix but they will -# be actually installed to /system partition. -platform_system_server_jars = $(filter platform:%, $(PRODUCT_SYSTEM_SERVER_JARS)) -system_server_jars := \ - $(foreach m,$(platform_system_server_jars),\ - $(PRODUCT_OUT)/system/framework/$(call word-colon,2,$(m)).jar) - -# For the remaining system server JARs use the partition signified by the prefix. -# For example, prefix "system_ext:" will use "/system_ext" path. -other_system_server_jars = $(filter-out $(platform_system_server_jars), $(PRODUCT_SYSTEM_SERVER_JARS)) -system_server_jars += \ - $(foreach m,$(other_system_server_jars),\ - $(PRODUCT_OUT)/$(call word-colon,1,$(m))/framework/$(call word-colon,2,$(m)).jar) - # Infix can be 'art' (ART image for testing), 'boot' (primary), or 'mainline' (mainline extension). # Soong creates a set of variables for Make, one or each boot image. The only reason why the ART # image is exposed to Make is testing (art gtests) and benchmarking (art golem benchmarks). Install @@ -48,40 +24,6 @@ system_server_jars += \ # is always 'boot' or 'mainline'. DEXPREOPT_INFIX := $(if $(filter true,$(DEX_PREOPT_WITH_UPDATABLE_BCP)),mainline,boot) -# The input variables are written by build/soong/java/dexpreopt_bootjars.go. Examples can be found -# at the bottom of build/soong/java/dexpreopt_config_testing.go. -dexpreopt_root_dir := $(dir $(patsubst %/,%,$(dir $(firstword $(bootclasspath_jars))))) -bootclasspath_arg := $(subst $(space),:,$(patsubst $(dexpreopt_root_dir)%,%,$(DEXPREOPT_BOOTCLASSPATH_DEX_FILES))) -bootclasspath_locations_arg := $(subst $(space),:,$(DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS)) -boot_images := $(subst :,$(space),$(DEXPREOPT_IMAGE_LOCATIONS_ON_DEVICE$(DEXPREOPT_INFIX))) -boot_image_arg := $(subst $(space),:,$(patsubst /%,%,$(boot_images))) -uffd_gc_flag_txt := $(OUT_DIR)/soong/dexpreopt/uffd_gc_flag.txt - -boot_zip_metadata_txt := $(dir $(boot_zip))boot_zip/METADATA.txt -$(boot_zip_metadata_txt): $(uffd_gc_flag_txt) -$(boot_zip_metadata_txt): - rm -f $@ - echo "bootclasspath = $(bootclasspath_arg)" >> $@ - echo "bootclasspath-locations = $(bootclasspath_locations_arg)" >> $@ - echo "boot-image = $(boot_image_arg)" >> $@ - echo "extra-args = `cat $(uffd_gc_flag_txt)`" >> $@ - -$(call dist-for-goals, droidcore, $(boot_zip_metadata_txt)) - -$(boot_zip): PRIVATE_BOOTCLASSPATH_JARS := $(bootclasspath_jars) -$(boot_zip): PRIVATE_SYSTEM_SERVER_JARS := $(system_server_jars) -$(boot_zip): $(bootclasspath_jars) $(system_server_jars) $(SOONG_ZIP) $(MERGE_ZIPS) $(DEXPREOPT_IMAGE_ZIP_boot) $(DEXPREOPT_IMAGE_ZIP_art) $(DEXPREOPT_IMAGE_ZIP_mainline) $(boot_zip_metadata_txt) - @echo "Create boot package: $@" - rm -f $@ - $(SOONG_ZIP) -o $@.tmp \ - -C $(dir $(firstword $(PRIVATE_BOOTCLASSPATH_JARS)))/.. $(addprefix -f ,$(PRIVATE_BOOTCLASSPATH_JARS)) \ - -C $(PRODUCT_OUT) $(addprefix -f ,$(PRIVATE_SYSTEM_SERVER_JARS)) \ - -j -f $(boot_zip_metadata_txt) - $(MERGE_ZIPS) $@ $@.tmp $(DEXPREOPT_IMAGE_ZIP_boot) $(DEXPREOPT_IMAGE_ZIP_art) $(DEXPREOPT_IMAGE_ZIP_mainline) - rm -f $@.tmp - -$(call dist-for-goals, droidcore, $(boot_zip)) - endif #PRODUCT_USES_DEFAULT_ART_CONFIG endif #WITH_DEXPREOPT_ART_BOOT_IMG_ONLY endif #WITH_DEXPREOPT diff --git a/core/os_licensing.mk b/core/os_licensing.mk index 97e55a7685..bebaca1c17 100644 --- a/core/os_licensing.mk +++ b/core/os_licensing.mk @@ -7,12 +7,6 @@ ifneq (,$(SYSTEM_NOTICE_DEPS)) SYSTEM_NOTICE_DEPS += $(UNMOUNTED_NOTICE_DEPS) $(UNMOUNTED_NOTICE_VENDOR_DEPS) -ifneq ($(PRODUCT_NOTICE_SPLIT),true) -$(eval $(call html-notice-rule,$(target_notice_file_html_gz),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS))) - -$(installed_notice_html_or_xml_gz): $(target_notice_file_html_gz) - $(copy-file-to-target) -else $(eval $(call xml-notice-rule,$(target_notice_file_xml_gz),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS))) $(eval $(call text-notice-rule,$(target_notice_file_txt),"System image",$(system_notice_file_message),$(SYSTEM_NOTICE_DEPS),$(SYSTEM_NOTICE_DEPS))) @@ -21,7 +15,6 @@ ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true) $(installed_notice_html_or_xml_gz): $(target_notice_file_xml_gz) $(copy-file-to-target) endif -endif $(call declare-1p-target,$(target_notice_file_xml_gz)) ifneq ($(PRODUCT_USE_SOONG_NOTICE_XML),true) diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index 1a55bf480b..1321c692eb 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -151,6 +151,7 @@ cts-api-map-xml-report := $(api_map_out)/cts-api-map.xml cts-v-host-api-map-xml-report := $(api_map_out)/cts-v-host-api-map.xml cts-combined-api-map-xml-report := $(api_map_out)/cts-combined-api-map.xml cts-combined-api-map-html-report := $(api_map_out)/cts-combined-api-map.html +cts-combined-api-inherit-xml-report := $(api_map_out)/cts-combined-api-inherit.xml cts_api_map_dependencies := $(cts_api_map_exe) $(combined_api_xml_description) $(cts_jar_files) cts_v_host_api_map_dependencies := $(cts_api_map_exe) $(combined_api_xml_description) $(cts_v_host_jar_files) @@ -262,6 +263,13 @@ $(cts-combined-api-map-html-report) : $(verifier_zip) $(android_cts_zip) $(cts_c $(call generate-api-map-report-cts,"CTS Combined API MAP Report - HTML",\ $(PRIVATE_JAR_FILES),html) +$(cts-combined-api-inherit-xml-report): PRIVATE_CTS_API_MAP_EXE := $(cts_api_map_exe) +$(cts-combined-api-inherit-xml-report): PRIVATE_API_XML_DESC := $(combined_api_xml_description) +$(cts-combined-api-inherit-xml-report): PRIVATE_JAR_FILES := $(cts_all_jar_files) +$(cts-combined-api-inherit-xml-report) : $(verifier_zip) $(android_cts_zip) $(cts_combined_api_map_dependencies) | $(ACP) + $(call generate-api-inherit-report-cts,"CTS Combined API Inherit Report - XML",\ + $(PRIVATE_JAR_FILES),xml) + .PHONY: cts-api-map-xml cts-api-map-xml : $(cts-api-map-xml-report) @@ -271,6 +279,9 @@ cts-v-host-api-map-xml: $(cts-v-host-api-map-xml-report) .PHONY: cts-combined-api-map-xml cts-combined-api-map-xml : $(cts-combined-api-map-xml-report) +.PHONY: cts-combined-api-inherit-xml +cts-combined-api-inherit-xml : $(cts-combined-api-inherit-xml-report) + .PHONY: cts-api-map-all # Put the test coverage report in the dist dir if "cts-api-coverage" is among the build goals. @@ -291,11 +302,13 @@ ALL_TARGETS.$(cts-combined-xml-coverage-report).META_LIC:=$(module_license_metad # Put the test api map report in the dist dir if "cts-api-map-all" is among the build goals. $(call dist-for-goals, cts-api-map-all, $(cts-combined-api-map-xml-report):cts-api-map-report.xml) $(call dist-for-goals, cts-api-map-all, $(cts-combined-api-map-html-report):cts-api-map-report.html) +$(call dist-for-goals, cts-api-map-all, $(cts-combined-api-inherit-xml-report):cts-api-inherit-report.xml) ALL_TARGETS.$(cts-api-map-xml-report).META_LIC:=$(module_license_metadata) ALL_TARGETS.$(cts-v-host-api-map-xml-report).META_LIC:=$(module_license_metadata) ALL_TARGETS.$(cts-combined-api-map-xml-report).META_LIC:=$(module_license_metadata) ALL_TARGETS.$(cts-combined-api-map-html-report).META_LIC:=$(module_license_metadata) +ALL_TARGETS.$(cts-combined-api-map-inherit-report).META_LIC:=$(module_license_metadata) # Arguments; # 1 - Name of the report printed out on the screen @@ -313,7 +326,18 @@ endef # 3 - Format of the report define generate-api-map-report-cts $(hide) mkdir -p $(dir $@) - $(hide) $(PRIVATE_CTS_API_MAP_EXE) -j 8 -a $(shell echo "$(PRIVATE_API_XML_DESC)" | tr ' ' ',') -i $(2) -f $(3) -o $@ + $(hide) $(PRIVATE_CTS_API_MAP_EXE) -j 8 -m api_map -m xts_annotation -a $(shell echo "$(PRIVATE_API_XML_DESC)" | tr ' ' ',') -i $(2) -f $(3) -o $@ + @ echo $(1): file://$$(cd $(dir $@); pwd)/$(notdir $@) +endef + + +# Arguments; +# 1 - Name of the report printed out on the screen +# 2 - A file containing list of files that to be analyzed +# 3 - Format of the report +define generate-api-inherit-report-cts + $(hide) mkdir -p $(dir $@) + $(hide) $(PRIVATE_CTS_API_MAP_EXE) -j 8 -m xts_api_inherit -a $(shell echo "$(PRIVATE_API_XML_DESC)" | tr ' ' ',') -i $(2) -f $(3) -o $@ @ echo $(1): file://$$(cd $(dir $@); pwd)/$(notdir $@) endef @@ -333,6 +357,7 @@ cts-api-map-xml-report := cts-v-host-api-map-xml-report := cts-combined-api-map-xml-report := cts-combined-api-map-html-report := +cts-combined-api-map-inherit-report := api_xml_description := api_text_description := system_api_xml_description := diff --git a/tools/warn/OWNERS b/tools/warn/OWNERS index 8551802693..93ccd28b1c 100644 --- a/tools/warn/OWNERS +++ b/tools/warn/OWNERS @@ -1 +1 @@ -per-file * = chh@google.com,srhines@google.com +per-file * =srhines@google.com |