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

Commit d82c7824 authored Apr 04, 2022 by Treehugger Robot Committed by Automerger Merge Worker Apr 04, 2022

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

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

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

Change-Id: Ib5cf3eff2ecae8c87720b54c4b3ed08a803dfc67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 59924eb8 8297b1ed

test-legacy/Android.mk

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,10 @@ LOCAL_STATIC_JAVA_LIBRARIES := \

	include $(BUILD_STATIC_JAVA_LIBRARY)		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.		# Archive a copy of the classes.jar in SDK build.
	$(call dist-for-goals,sdk,$(full_classes_jar):android.test.legacy.jar)		$(call dist-for-goals,sdk,$(full_classes_jar):android.test.legacy.jar)

tools/aapt2/Android.mk

+2 −0

Original line number	Original line	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		$(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		-$(HOST_OUT_NATIVE_TESTS)/aapt2_tests/aapt2_tests --gtest_output=xml:$@ > /dev/null 2>&1

			$(call declare-0p-target,$(aapt2_results))

	aapt2_results :=		aapt2_results :=

	include $(call all-makefiles-under,$(LOCAL_PATH))		include $(call all-makefiles-under,$(LOCAL_PATH))