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.

diff --git a/cross/ndk-build/ndk-build-shared-library.mk b/cross/ndk-build/ndk-build-shared-library.mk
index 2209e94d3590e95814de210ca07a48bafed4cb24..b7a64865e385b265e5473c2ddc048a1425a7e243 100644 (file)
--- 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 04aea49bffe4a0f36e5c0651269f448e51c5428f..a597bc0d691e86d4404b948df4fc2e804984d177 100644 (file)
--- 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))