aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2022-04-20 23:48:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-20 23:48:03 +0000
commit5056fea60efb3f385b8502a650d96a7bff7db3a6 (patch)
tree72ed2f25e63d1696fd49e6d5d8498baa681d1fd1
parentca8878dd72a0a090ad672ea341232d65a0d01c2d (diff)
parent9dee19d729fb2ca970050de5abc761833c238d11 (diff)
downloadrobolectric-shadows-5056fea60efb3f385b8502a650d96a7bff7db3a6.tar.gz
Non-module targets. am: 9357e3d64e am: d03dd67c53 am: 3413bcee1e am: 9dee19d729
Original change: https://android-review.googlesource.com/c/platform/external/robolectric-shadows/+/2070029 Change-Id: I25624d19ab965359beb3d86512ca97331720da80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--report-internal.mk3
-rw-r--r--robotest-internal.mk3
2 files changed, 6 insertions, 0 deletions
diff --git a/report-internal.mk b/report-internal.mk
index a12479c97..4b790c20c 100644
--- a/report-internal.mk
+++ b/report-internal.mk
@@ -49,6 +49,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/robotest-internal.mk b/robotest-internal.mk
index ee0baf683..77e173024 100644
--- a/robotest-internal.mk
+++ b/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.