commit 60e58c427c60cf745efe4118a7d4dc5422c7cdc8
author Xin Li <delphij@google.com> Wed Jan 25 04:01:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 04:01:15 2017 +0000
tree 6f284705b0ba3a89c68c368e16a50b7fc90910ad
parent 970293eeb8666e7d55d918d5ba55d52f82061f89
parent c4ed36ca3763cfdc0f8e7f7a5734134c3653debd

Don't assume OUT_DIR is not overridden.  This fixes build when OUT_DIR is outside the toplevel source tree. am: 63eb6759f7
am: c4ed36ca37

Change-Id: Idd3f467fb32f08a826339edcaf52c1394c832597

android/Android.mk

diff --git a/android/Android.mk b/android/Android.mk
index 56118eb..c1391bf 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -58,7 +58,7 @@
 intermediates := $(local-generated-sources-dir)
 GEN := $(intermediates)/linux_syscall_numbers.h
 $(GEN): PRIVATE_INPUT_FILE := $(wildcard $(local_ltp_root)/testcases/kernel/include/*.in)
-$(GEN): PRIVATE_CUSTOM_TOOL = $(regen_sh) out/target/product/$(TARGET_DEVICE)/gen/STATIC_LIBRARIES/ltp_linux_syscall_numbers_intermediates/linux_syscall_numbers.h -o $@
+$(GEN): PRIVATE_CUSTOM_TOOL = $(regen_sh) $(OUT_DIR)/target/product/$(TARGET_DEVICE)/gen/STATIC_LIBRARIES/ltp_linux_syscall_numbers_intermediates/linux_syscall_numbers.h -o $@
 $(GEN): $(regen_sh) $(PRIVATE_INPUT_FILE)
 	$(transform-generated-source)
 LOCAL_GENERATED_SOURCES += $(GEN)