feature/android ece6d613012: Fix out-of-tree builds with native dependencies

[Po Lu]

branch: feature/android
commit ece6d61301268df1ab486d77eacd09ea474a81a4
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Fix out-of-tree builds with native dependencies
    
    * cross/ndk-build/ndk-build-shared-library.mk:
    * cross/ndk-build/ndk-build-static-library.mk: Include
    ndk-resolve.mk in srcdir.
---
 cross/ndk-build/ndk-build-shared-library.mk | 2 +-
 cross/ndk-build/ndk-build-static-library.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cross/ndk-build/ndk-build-shared-library.mk 
b/cross/ndk-build/ndk-build-shared-library.mk
index 2209e94d359..b7a64865e38 100644
--- a/cross/ndk-build/ndk-build-shared-library.mk
+++ b/cross/ndk-build/ndk-build-shared-library.mk
@@ -140,7 +140,7 @@ LOCAL_MODULE_FILENAME := $(LOCAL_MODULE_FILENAME).so
 # Record this module's dependencies and exported includes and CFLAGS,
 # and then add that of its dependencies.
 
-include ndk-resolve.mk
+include $(srcdir)/ndk-resolve.mk
 
 # Then define rules to build all objects.
 ALL_SOURCE_FILES := $(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES_$(NDK_BUILD_ARCH))
diff --git a/cross/ndk-build/ndk-build-static-library.mk 
b/cross/ndk-build/ndk-build-static-library.mk
index 04aea49bffe..a597bc0d691 100644
--- a/cross/ndk-build/ndk-build-static-library.mk
+++ b/cross/ndk-build/ndk-build-static-library.mk
@@ -121,7 +121,7 @@ LOCAL_MODULE_FILENAME := $(LOCAL_MODULE_FILENAME).a
 # Record this module's dependencies and exported includes and CFLAGS,
 # and then add that of its dependencies.
 
-include ndk-resolve.mk
+include $(srcdir)/ndk-resolve.mk
 
 # Then define rules to build all objects.
 ALL_SOURCE_FILES := $(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES_$(NDK_BUILD_ARCH))