From: Po Lu Date: Fri, 3 Mar 2023 13:22:00 +0000 (+0800) Subject: Fix out-of-tree builds with native dependencies X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ece6d61301268df1ab486d77eacd09ea474a81a4;p=emacs.git 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 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))