Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 474fb554 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Non-module targets." am: 3f0139b1 am: 6dc0c9f7 am: 824f0624 am:... 

Merge "Non-module targets." am: 3f0139b1 am: 6dc0c9f7 am: 824f0624 am: 2cb1c268 am: 29971d5c

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



Change-Id: Ifc4c761e22234fa0cede8d35da25becf5f2688e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1e124439 29971d5c

test-legacy/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -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)

tools/aapt2/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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))