From a61f3e446f322755d9eb3462b449a29ba30c60e5 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Thu, 31 Mar 2022 14:28:03 -0700 Subject: [PATCH] Non-module targets. Bug: 151177513 Bug: 213388645 Bug: 210912771 Test: m droid dist reportmissinglicenses Change-Id: I1982a50b33924a051d7cfcdf18dd1f0f00fa1c0f --- test-legacy/Android.mk | 4 ++++ tools/aapt2/Android.mk | 2 ++ 2 files changed, 6 insertions(+) diff --git a/test-legacy/Android.mk b/test-legacy/Android.mk index 284008c5be710..da9dc2505805b 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 b165c6bed2205..7b94e718fd0e5 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))