diff options
| author | 2022-04-04 14:17:08 +0000 | |
|---|---|---|
| committer | 2022-04-04 14:17:08 +0000 | |
| commit | 824f0624009e1238bc11dd657145ba36f26f9da4 (patch) | |
| tree | f79eedef58fce1bcef6100fd7f9cb4572c91d3e3 | |
| parent | e615f0d800fb3600b82bb6197db5a55c7cfa8abb (diff) | |
| parent | 6dc0c9f780877eb2009dceff7935e3436ea175a2 (diff) | |
Merge "Non-module targets." am: 3f0139b119 am: 6dc0c9f780
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052132
Change-Id: Ib81164b856a7296bab6f3d18cc95baa93f9f421c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | test-legacy/Android.mk | 4 | ||||
| -rw-r--r-- | tools/aapt2/Android.mk | 2 |
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)) |