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

Commit 6687e127 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Non-module targets." am: ff15a27b am: 7c30a61b 

Original change: https://android-review.googlesource.com/c/platform/build/+/2055031



Change-Id: I3ee4934b40b57652945d81dea7a3f63b495ae5ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31d5f5bb 7c30a61b

core/main.mk

+12 −6
Original line number Diff line number Diff line
@@ -935,6 +935,7 @@ $(foreach suite,general-tests device-tests vts tvts art-host-tests host-unit-tes 
          $(eval my_testcases := $(HOST_OUT_TESTCASES)),\

          $(eval my_testcases := $$(COMPATIBILITY_TESTCASES_OUT_$(suite))))\

        $(eval target := $(my_testcases)/$(lastword $(subst /, ,$(dir $(f))))/$(notdir $(f)))\

        $(if $(strip $(ALL_TARGETS.$(target).META_LIC)),,$(eval ALL_TARGETS.$(target).META_LIC:=$(module_license_metadata)))\

        $(eval COMPATIBILITY.$(suite).HOST_SHARED_LIBRARY.FILES := \

          $$(COMPATIBILITY.$(suite).HOST_SHARED_LIBRARY.FILES) $(f):$(target))\

        $(eval COMPATIBILITY.$(suite).HOST_SHARED_LIBRARY.FILES := \
@@ -1459,12 +1460,6 @@ ALL_DEFAULT_INSTALLED_MODULES := 
# fix-notice-deps replaces those unadorned module names with every built variant.

$(call fix-notice-deps)



# Create a license metadata rule per module. Could happen in base_rules.mk or

# notice_files.mk; except, it has to happen after fix-notice-deps to avoid

# missing dependency errors.

$(call build-license-metadata)





# These are additional goals that we build, in order to make sure that there

# is as little code as possible in the tree that doesn't build.

modules_to_check := $(foreach m,$(ALL_MODULES),$(ALL_MODULES.$(m).CHECKED))
@@ -1738,15 +1733,19 @@ else ifneq ($(TARGET_BUILD_APPS),) 


  $(PROGUARD_DICT_ZIP) : $(apps_only_installed_files)

  $(call dist-for-goals,apps_only, $(PROGUARD_DICT_ZIP) $(PROGUARD_DICT_MAPPING))

  $(call declare-container-license-deps,$(PROGUARD_DICT_ZIP),$(apps_only_installed_files),$(PRODUCT_OUT)/:/)



  $(PROGUARD_USAGE_ZIP) : $(apps_only_installed_files)

  $(call dist-for-goals,apps_only, $(PROGUARD_USAGE_ZIP))

  $(call declare-container-license-deps,$(PROGUARD_USAGE_ZIP),$(apps_only_installed_files),$(PRODUCT_OUT)/:/)



  $(SYMBOLS_ZIP) : $(apps_only_installed_files)

  $(call dist-for-goals,apps_only, $(SYMBOLS_ZIP) $(SYMBOLS_MAPPING))

  $(call declare-container-license-deps,$(SYMBOLS_ZIP),$(apps_only_installed_files),$(PRODUCT_OUT)/:/)



  $(COVERAGE_ZIP) : $(apps_only_installed_files)

  $(call dist-for-goals,apps_only, $(COVERAGE_ZIP))

  $(call declare-container-license-deps,$(COVERAGE_ZIP),$(apps_only_installed_files),$(PRODUCT_OUT)/:/)



apps_only: $(unbundled_build_modules)
@@ -1900,6 +1899,8 @@ else ifeq ($(TARGET_BUILD_UNBUNDLED),$(TARGET_BUILD_UNBUNDLED_IMAGE)) 
	$(hide) mkdir -p $(dir $@)

	$(hide) $(APICHECK_COMMAND) --input-api-jar $< --api-xml $@



  $(foreach xml,$(sort $(api_xmls)),$(call declare-1p-target,$(xml),))



  $(call dist-for-goals, dist_files, $(api_xmls))

  api_xmls :=
@@ -2012,6 +2013,11 @@ ifneq ($(UNSAFE_DISABLE_APEX_ALLOWED_DEPS_CHECK),true) 
  droidcore: ${APEX_ALLOWED_DEPS_CHECK}

endif



# Create a license metadata rule per module. Could happen in base_rules.mk or

# notice_files.mk; except, it has to happen after fix-notice-deps to avoid

# missing dependency errors.

$(call build-license-metadata)



$(call dist-write-file,$(KATI_PACKAGE_MK_DIR)/dist.mk)



$(info [$(call inc_and_print,subdir_makefiles_inc)/$(subdir_makefiles_total)] writing build rules ...)

core/tasks/art-host-tests.mk

+3 −0
Original line number Diff line number Diff line
@@ -42,4 +42,7 @@ $(art_host_tests_zip) : $(COMPATIBILITY.art-host-tests.FILES) $(my_host_shared_l 
art-host-tests: $(art_host_tests_zip)

$(call dist-for-goals, art-host-tests, $(art_host_tests_zip))



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

$(call declare-container-license-deps,$(art_host_tests_zip),$(COMPATIBILITY.art-host-tests.FILES) $(my_host_shared_lib_for_art_host_tests),$(PRODUCT_OUT)/:/)



tests: art-host-tests

core/tasks/cts.mk

+7 −0
Original line number Diff line number Diff line
@@ -198,6 +198,13 @@ $(call dist-for-goals, cts-api-coverage, $(cts-verifier-coverage-report):cts-ver 
$(call dist-for-goals, cts-api-coverage, $(cts-combined-coverage-report):cts-combined-coverage-report.html)

$(call dist-for-goals, cts-api-coverage, $(cts-combined-xml-coverage-report):cts-combined-coverage-report.xml)



ALL_TARGETS.$(cts-test-coverage-report).META_LIC:=$(module_license_metadata)

ALL_TARGETS.$(cts-system-api-coverage-report).META_LIC:=$(module_license_metadata)

ALL_TARGETS.$(cts-system-api-xml-coverage-report).META_LIC:=$(module_license_metadata)

ALL_TARGETS.$(cts-verifier-coverage-report).META_LIC:=$(module_license_metadata)

ALL_TARGETS.$(cts-combined-coverage-report).META_LIC:=$(module_license_metadata)

ALL_TARGETS.$(cts-combined-xml-coverage-report).META_LIC:=$(module_license_metadata)



# Arguments;

#  1 - Name of the report printed out on the screen

#  2 - List of apk files that will be scanned to generate the report

core/tasks/device-tests.mk

+3 −0
Original line number Diff line number Diff line
@@ -55,4 +55,7 @@ $(device-tests-zip) : $(COMPATIBILITY.device-tests.FILES) $(my_host_shared_lib_f 
device-tests: $(device-tests-zip)

$(call dist-for-goals, device-tests, $(device-tests-zip) $(device-tests-list-zip) $(device-tests-configs-zip) $(device_tests_host_shared_libs_zip))



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

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



tests: device-tests

core/tasks/general-tests.mk

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ $(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(general_tests_tool 
general-tests: $(general_tests_zip)

$(call dist-for-goals, general-tests, $(general_tests_zip) $(general_tests_list_zip) $(general_tests_configs_zip) $(general_tests_host_shared_libs_zip))



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

$(call declare-container-license-deps,$(general_tests_zip),$(COMPATIBILITY.general-tests.FILES) $(general_tests_tools) $(my_host_shared_lib_for_general_tests),$(PRODUCT_OUT)/:/)



intermediates_dir :=

general_tests_tools :=

general_tests_zip :=