diff options
| author | Po Lu | 2023-03-03 21:22:00 +0800 |
|---|---|---|
| committer | Po Lu | 2023-03-03 21:22:00 +0800 |
| commit | ece6d61301268df1ab486d77eacd09ea474a81a4 (patch) | |
| tree | e3a44b65b1ff60482e2b7a283f46e356616aed7c /cross | |
| parent | 468e8d7322e4250e68f12cedf88ce4d39193c0e5 (diff) | |
| download | emacs-ece6d61301268df1ab486d77eacd09ea474a81a4.tar.gz emacs-ece6d61301268df1ab486d77eacd09ea474a81a4.zip | |
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.
Diffstat (limited to 'cross')
| -rw-r--r-- | cross/ndk-build/ndk-build-shared-library.mk | 2 | ||||
| -rw-r--r-- | 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 | |||
| 140 | # Record this module's dependencies and exported includes and CFLAGS, | 140 | # Record this module's dependencies and exported includes and CFLAGS, |
| 141 | # and then add that of its dependencies. | 141 | # and then add that of its dependencies. |
| 142 | 142 | ||
| 143 | include ndk-resolve.mk | 143 | include $(srcdir)/ndk-resolve.mk |
| 144 | 144 | ||
| 145 | # Then define rules to build all objects. | 145 | # Then define rules to build all objects. |
| 146 | ALL_SOURCE_FILES := $(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES_$(NDK_BUILD_ARCH)) | 146 | 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 | |||
| 121 | # Record this module's dependencies and exported includes and CFLAGS, | 121 | # Record this module's dependencies and exported includes and CFLAGS, |
| 122 | # and then add that of its dependencies. | 122 | # and then add that of its dependencies. |
| 123 | 123 | ||
| 124 | include ndk-resolve.mk | 124 | include $(srcdir)/ndk-resolve.mk |
| 125 | 125 | ||
| 126 | # Then define rules to build all objects. | 126 | # Then define rules to build all objects. |
| 127 | ALL_SOURCE_FILES := $(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES_$(NDK_BUILD_ARCH)) | 127 | ALL_SOURCE_FILES := $(LOCAL_SRC_FILES) $(LOCAL_SRC_FILES_$(NDK_BUILD_ARCH)) |