Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Non-module targets." am: 3f0139b119

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052132

Change-Id: I9d78eb2f88f9ed97a36d6757744b4406435d3853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-04-04 14:01:04 +00:00
committed by Automerger Merge Worker
parent dc815221a7 3f0139b119
commit 6dc0c9f780
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test-legacy/Android.mk
View File

@@ -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)

2
tools/aapt2/Android.mk
View File

@@ -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))