Merge "Non-module targets." am: 143ab4e539 am: d46fd39896 am: 035141cadf am: bf658bc0c9

Original change: https://android-review.googlesource.com/c/platform/prebuilts/misc/+/2052095

Change-Id: I735572eb10b1026ca38dfcd6cd3f33f82f339b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

10 files changed, 30 insertions, 0 deletions

diff --git a/common/robolectric/3.6.1/report-internal.mk b/common/robolectric/3.6.1/report-internal.mk
index 49896327..e8713e71 100644
--- a/common/robolectric/3.6.1/report-internal.mk
+++ b/common/robolectric/3.6.1/report-internal.mk
@@ -40,6 +40,9 @@ $(call dist-for-goals, $(my_report_target), \
     $(my_coverage_output_zip):robotests-coverage/$(LOCAL_MODULE)/robolectric-html-coverage.zip \
     $(my_coverage_output):robotests-coverage/$(LOCAL_MODULE)/robolectric-coverage.xml)
 
+ALL_TARGETS.$(my_coverage_output_zip).META_LIC:=$(module_license_metadata)
+ALL_TARGETS.$(my_coverage_output).META_LIC:=$(module_license_metadata)
+
 # Running the coverage will always generate the report.
 $(my_target): $(my_coverage_output)
 
diff --git a/common/robolectric/3.6.1/robotest-internal.mk b/common/robolectric/3.6.1/robotest-internal.mk
index f8e4470a..9bd9b5d2 100644
--- a/common/robolectric/3.6.1/robotest-internal.mk
+++ b/common/robolectric/3.6.1/robotest-internal.mk
@@ -12,6 +12,9 @@ my_target_xml := $(intermediates)/$(my_filename_stem)-output.xml
 my_target_output := $(intermediates)/$(my_filename_stem)-output.txt
 my_target_retval := $(intermediates)/$(my_filename_stem)-retval.txt
 
+ALL_TARGETS.$(my_target_output).META_LIC:=$(module_license_metadata)
+ALL_TARGETS.$(my_target_xml).META_LIC:=$(module_license_metadata)
+
 # We should always re-run the tests, even if nothing has changed.
 # So until the build system has a dedicated "no cache" option, claim
 # to write a file that is never produced.
diff --git a/common/robolectric/3.6.2/report-internal.mk b/common/robolectric/3.6.2/report-internal.mk
index 49896327..e8713e71 100644
--- a/common/robolectric/3.6.2/report-internal.mk
+++ b/common/robolectric/3.6.2/report-internal.mk
@@ -40,6 +40,9 @@ $(call dist-for-goals, $(my_report_target), \
     $(my_coverage_output_zip):robotests-coverage/$(LOCAL_MODULE)/robolectric-html-coverage.zip \
     $(my_coverage_output):robotests-coverage/$(LOCAL_MODULE)/robolectric-coverage.xml)
 
+ALL_TARGETS.$(my_coverage_output_zip).META_LIC:=$(module_license_metadata)
+ALL_TARGETS.$(my_coverage_output).META_LIC:=$(module_license_metadata)
+
 # Running the coverage will always generate the report.
 $(my_target): $(my_coverage_output)
 
diff --git a/common/robolectric/3.6.2/robotest-internal.mk b/common/robolectric/3.6.2/robotest-internal.mk
index 746d9f47..81eebd0d 100644
--- a/common/robolectric/3.6.2/robotest-internal.mk
+++ b/common/robolectric/3.6.2/robotest-internal.mk
@@ -12,6 +12,9 @@ my_target_xml := $(intermediates)/$(my_filename_stem)-output.xml
 my_target_output := $(intermediates)/$(my_filename_stem)-output.txt
 my_target_retval := $(intermediates)/$(my_filename_stem)-retval.txt
 
+ALL_TARGETS.$(my_target_output).META_LIC:=$(module_license_metadata)
+ALL_TARGETS.$(my_target_xml).META_LIC:=$(module_license_metadata)
+
 # We should always re-run the tests, even if nothing has changed.
 # So until the build system has a dedicated "no cache" option, claim
 # to write a file that is never produced.
diff --git a/common/robolectric/4.3.1/report-internal.mk b/common/robolectric/4.3.1/report-internal.mk
index 49896327..e8713e71 100644
--- a/common/robolectric/4.3.1/report-internal.mk
+++ b/common/robolectric/4.3.1/report-internal.mk
@@ -40,6 +40,9 @@ $(call dist-for-goals, $(my_report_target), \
     $(my_coverage_output_zip):robotests-coverage/$(LOCAL_MODULE)/robolectric-html-coverage.zip \
     $(my_coverage_output):robotests-coverage/$(LOCAL_MODULE)/robolectric-coverage.xml)
 
+ALL_TARGETS.$(my_coverage_output_zip).META_LIC:=$(module_license_metadata)
+ALL_TARGETS.$(my_coverage_output).META_LIC:=$(module_license_metadata)
+
 # Running the coverage will always generate the report.
 $(my_target): $(my_coverage_output)
 
diff --git a/common/robolectric/4.3.1/robotest-internal.mk b/common/robolectric/4.3.1/robotest-internal.mk
index f8e4470a..9bd9b5d2 100644
--- a/common/robolectric/4.3.1/robotest-internal.mk
+++ b/common/robolectric/4.3.1/robotest-internal.mk
@@ -12,6 +12,9 @@ my_target_xml := $(intermediates)/$(my_filename_stem)-output.xml
 my_target_output := $(intermediates)/$(my_filename_stem)-output.txt
 my_target_retval := $(intermediates)/$(my_filename_stem)-retval.txt
 
+ALL_TARGETS.$(my_target_output).META_LIC:=$(module_license_metadata)
+ALL_TARGETS.$(my_target_xml).META_LIC:=$(module_license_metadata)
+
 # We should always re-run the tests, even if nothing has changed.
 # So until the build system has a dedicated "no cache" option, claim
 # to write a file that is never produced.
diff --git a/common/robolectric/4.4/report-internal.mk b/common/robolectric/4.4/report-internal.mk
index 49896327..e8713e71 100644
--- a/common/robolectric/4.4/report-internal.mk
+++ b/common/robolectric/4.4/report-internal.mk
@@ -40,6 +40,9 @@ $(call dist-for-goals, $(my_report_target), \
     $(my_coverage_output_zip):robotests-coverage/$(LOCAL_MODULE)/robolectric-html-coverage.zip \
     $(my_coverage_output):robotests-coverage/$(LOCAL_MODULE)/robolectric-coverage.xml)
 
+ALL_TARGETS.$(my_coverage_output_zip).META_LIC:=$(module_license_metadata)
+ALL_TARGETS.$(my_coverage_output).META_LIC:=$(module_license_metadata)
+
 # Running the coverage will always generate the report.
 $(my_target): $(my_coverage_output)
 
diff --git a/common/robolectric/4.4/robotest-internal.mk b/common/robolectric/4.4/robotest-internal.mk
index f8e4470a..9bd9b5d2 100644
--- a/common/robolectric/4.4/robotest-internal.mk
+++ b/common/robolectric/4.4/robotest-internal.mk
@@ -12,6 +12,9 @@ my_target_xml := $(intermediates)/$(my_filename_stem)-output.xml
 my_target_output := $(intermediates)/$(my_filename_stem)-output.txt
 my_target_retval := $(intermediates)/$(my_filename_stem)-retval.txt
 
+ALL_TARGETS.$(my_target_output).META_LIC:=$(module_license_metadata)
+ALL_TARGETS.$(my_target_xml).META_LIC:=$(module_license_metadata)
+
 # We should always re-run the tests, even if nothing has changed.
 # So until the build system has a dedicated "no cache" option, claim
 # to write a file that is never produced.
diff --git a/common/robolectric/4.5.1/report-internal.mk b/common/robolectric/4.5.1/report-internal.mk
index 49896327..e8713e71 100644
--- a/common/robolectric/4.5.1/report-internal.mk
+++ b/common/robolectric/4.5.1/report-internal.mk
@@ -40,6 +40,9 @@ $(call dist-for-goals, $(my_report_target), \
     $(my_coverage_output_zip):robotests-coverage/$(LOCAL_MODULE)/robolectric-html-coverage.zip \
     $(my_coverage_output):robotests-coverage/$(LOCAL_MODULE)/robolectric-coverage.xml)
 
+ALL_TARGETS.$(my_coverage_output_zip).META_LIC:=$(module_license_metadata)
+ALL_TARGETS.$(my_coverage_output).META_LIC:=$(module_license_metadata)
+
 # Running the coverage will always generate the report.
 $(my_target): $(my_coverage_output)
 
diff --git a/common/robolectric/4.5.1/robotest-internal.mk b/common/robolectric/4.5.1/robotest-internal.mk
index 58a206af..a6c89102 100644
--- a/common/robolectric/4.5.1/robotest-internal.mk
+++ b/common/robolectric/4.5.1/robotest-internal.mk
@@ -12,6 +12,9 @@ my_target_xml := $(intermediates)/$(my_filename_stem)-output.xml
 my_target_output := $(intermediates)/$(my_filename_stem)-output.txt
 my_target_retval := $(intermediates)/$(my_filename_stem)-retval.txt
 
+ALL_TARGETS.$(my_target_output).META_LIC:=$(module_license_metadata)
+ALL_TARGETS.$(my_target_xml).META_LIC:=$(module_license_metadata)
+
 # We should always re-run the tests, even if nothing has changed.
 # So until the build system has a dedicated "no cache" option, claim
 # to write a file that is never produced.