From d8ea139e83dc74336569d71e6969cae269547265 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Fri, 3 Mar 2023 21:13:58 +0800 Subject: 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. --- build-aux/ndk-build-helper.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'build-aux') 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. -- cgit v1.2.3