summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2023-03-03 21:13:58 +0800
committerPo Lu <luangruo@yahoo.com>2023-03-03 21:13:58 +0800
commitd8ea139e83dc74336569d71e6969cae269547265 (patch)
tree7d03f5e8c2b742cdb55fd4753cc7d6dbe1c88f9b /build-aux
parent48b5a770f247d8c027d209ce941767ab5a7d139d (diff)
downloademacs-d8ea139e83dc74336569d71e6969cae269547265.tar.gz
Improve ndk-build implementation
* build-aux/ndk-build-helper.mk: Define in terms of BUILD_AUXDIR. * m4/ndk-build.m4 (ndk_INIT): Find right build-aux directory. Remove uses of unportable shell constructs.
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/ndk-build-helper.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/build-aux/ndk-build-helper.mk b/build-aux/ndk-build-helper.mk
index fe8a6a5119c..85ddc5c6330 100644
--- a/build-aux/ndk-build-helper.mk
+++ b/build-aux/ndk-build-helper.mk
@@ -19,7 +19,7 @@
# file and return useful information about its contents.
# See the text under ``NDK BUILD SYSTEM IMPLEMENTATION'' in
-# INSTALL.android for more details.
+# cross/ndk-build/README for more details.
# TARGET_ARCH_ABI is the ABI that is being built for.
TARGET_ARCH_ABI := $(EMACS_ABI)
@@ -60,10 +60,10 @@ import-module = $(eval NDK_IMPORTS += $(1))
# Print out module information every time BUILD_SHARED_LIBRARY is
# called.
-BUILD_SHARED_LIBRARY=$(EMACS_SRCDIR)/build-aux/ndk-build-helper-1.mk
-BUILD_STATIC_LIBRARY=$(EMACS_SRCDIR)/build-aux/ndk-build-helper-2.mk
-BUILD_EXECUTABLE=$(EMACS_SRCDIR)/build-aux/ndk-build-helper-3.mk
-CLEAR_VARS=$(EMACS_SRCDIR)/build-aux/ndk-build-helper-4.mk
+BUILD_SHARED_LIBRARY=$(BUILD_AUXDIR)ndk-build-helper-1.mk
+BUILD_STATIC_LIBRARY=$(BUILD_AUXDIR)ndk-build-helper-2.mk
+BUILD_EXECUTABLE=$(BUILD_AUXDIR)ndk-build-helper-3.mk
+CLEAR_VARS=$(BUILD_AUXDIR)ndk-build-helper-4.mk
# Now include Android.mk.