commit c4ed36ca3763cfdc0f8e7f7a5734134c3653debd
author Xin Li <delphij@google.com> Wed Jan 25 03:57:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 25 03:57:56 2017 +0000
tree 6f284705b0ba3a89c68c368e16a50b7fc90910ad
parent f0cbfa805a5ad2d3c64fd1d871ce9af9f2ba6675
parent 63eb6759f7a04b7717a47eb48e16b9f04c237749

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

Change-Id: I2023521fc87d74b817006d768eb54eeb785ae690

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)