diff options
| author | Alex Light <allight@google.com> | 2016-05-25 09:41:28 +0100 |
|---|---|---|
| committer | Alexandre Rames <alexandre.rames@linaro.org> | 2016-05-25 17:24:51 +0100 |
| commit | 95372fcd05dda909b0c2e0e35b3432f874eb7bd1 (patch) | |
| tree | 95f570f6c42ccf735d21f35cb4e97900a8f74206 | |
| parent | b68bacb75c1ab265fc539afa93964c7f51f35589 (diff) | |
Fix the Android makefile.
This is a cherry-pick of https://android-review.googlesource.com/#/c/232680.
Change-Id: If4f6627c08edc7ae6f72177fa9721687fcbc05ec
| -rw-r--r-- | third_party/android/Android.mk.template | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/android/Android.mk.template b/third_party/android/Android.mk.template index db87165e..ca2748de 100644 --- a/third_party/android/Android.mk.template +++ b/third_party/android/Android.mk.template @@ -218,11 +218,13 @@ LOCAL_SANITIZE_RECOVER := shift-exponent LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_EXECUTABLE) +vixl_host_out := $(if $(ANDROID_HOST_OUT), $(ANDROID_HOST_OUT), ../../$(HOST_OUT)) + .PHONY: run-vixl-tests run-vixl-tests: vixl-test-runner $(vixl_root)/third_party/android/check_top_level_android_mk.sh # TODO: Once available, use the appropriate option of vixl-test-runner # to point to the trace files instead of running from the vixl root. - cd $(vixl_root) && ../../$(HOST_OUT)/bin/vixl-test-runner --run_all - cd $(vixl_root) && ../../$(HOST_OUT)/bin/vixl-test-runner --run_all --debugger + cd $(vixl_root) && $(vixl_host_out)/bin/vixl-test-runner --run_all + cd $(vixl_root) && $(vixl_host_out)/bin/vixl-test-runner --run_all --debugger @echo vixl tests PASSED |