summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bob Badour <bbadour@google.com> 2022-03-31 14:28:03 -0700
committer Bob Badour <bbadour@google.com> 2022-03-31 19:37:56 -0700
commita61f3e446f322755d9eb3462b449a29ba30c60e5 (patch)
tree65e456ccb055e20bf2babcd5c99ff48aae951256
parentc207bdcf5f29e7f6c7270ecb7d62074057a4387a (diff)
Non-module targets.
Bug: 151177513 Bug: 213388645 Bug: 210912771 Test: m droid dist reportmissinglicenses Change-Id: I1982a50b33924a051d7cfcdf18dd1f0f00fa1c0f
-rw-r--r--test-legacy/Android.mk4
-rw-r--r--tools/aapt2/Android.mk2
2 files changed, 6 insertions, 0 deletions
diff --git a/test-legacy/Android.mk b/test-legacy/Android.mk
index 284008c5be71..da9dc2505805 100644
--- a/test-legacy/Android.mk
+++ b/test-legacy/Android.mk
@@ -40,6 +40,10 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
include $(BUILD_STATIC_JAVA_LIBRARY)
+$(call declare-license-metadata,$(full_classes_jar),\
+ SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS,\
+ notice,$(LOCAL_PATH)/../NOTICE,Android,frameworks/base)
+
# Archive a copy of the classes.jar in SDK build.
$(call dist-for-goals,sdk,$(full_classes_jar):android.test.legacy.jar)
diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk
index b165c6bed220..7b94e718fd0e 100644
--- a/tools/aapt2/Android.mk
+++ b/tools/aapt2/Android.mk
@@ -15,6 +15,8 @@ $(aapt2_results): .KATI_IMPLICIT_OUTPUTS := $(aapt2_results)-nocache
$(aapt2_results): $(HOST_OUT_NATIVE_TESTS)/aapt2_tests/aapt2_tests
-$(HOST_OUT_NATIVE_TESTS)/aapt2_tests/aapt2_tests --gtest_output=xml:$@ > /dev/null 2>&1
+$(call declare-0p-target,$(aapt2_results))
+
aapt2_results :=
include $(call all-makefiles-under,$(LOCAL_PATH))