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

Commit 9ad6ab59 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Stop using DIST_DIR directly, use dist-for-goals instead" am: a8f2601d am: 9b767e27 

am: fa5b2040

Change-Id: Ic052f5d1de317c2f271f5a2df83c733c79978679
parents cd75edb8 fa5b2040

tools/aapt2/Android.mk

+12 −3
Original line number Diff line number Diff line
@@ -2,10 +2,19 @@ LOCAL_PATH := $(call my-dir) 


include $(CLEAR_VARS)



aapt2_results := $(call intermediates-dir-for,PACKAGING,aapt2_run_host_unit_tests)/result.xml



# Target for running host unit tests on post/pre-submit.

.PHONY: aapt2_run_host_unit_tests

aapt2_run_host_unit_tests: PRIVATE_GTEST_OPTIONS := --gtest_output=xml:$(DIST_DIR)/gtest/aapt2_host_unit_tests_result.xml

aapt2_run_host_unit_tests: $(HOST_OUT_NATIVE_TESTS)/aapt2_tests/aapt2_tests

	-$(HOST_OUT_NATIVE_TESTS)/aapt2_tests/aapt2_tests $(PRIVATE_GTEST_OPTIONS) > /dev/null 2>&1

aapt2_run_host_unit_tests: $(aapt2_results)



$(call dist-for-goals,aapt2_run_host_unit_tests,$(aapt2_results):gtest/aapt2_host_unit_tests_result.xml)



# Always run the tests again, even if they haven't changed

$(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



aapt2_results :=



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