diff --git a/android/external/MakefileTemplate b/android/external/MakefileTemplate index 4e6bfc9..a4cfff1 100644 --- a/android/external/MakefileTemplate +++ b/android/external/MakefileTemplate @@ -3,6 +3,8 @@ # This file may be used under the terms of the GNU General Public License version 3 # see LICENSE.txt +include ../Makefile.conf + # Build parameters APP_ABI ?= [ARCH] HOST ?= [HOST] @@ -11,7 +13,8 @@ SEQUOIA_ARCH ?= [SEQUOIA_ARCH] OPENSSL_ARCHITECTURE ?= [OPENSSL_ARCHITECTURE] COMPILER_PREFIX ?= [COMPILER_PREFIX] -include ../Makefile.conf +# This include is dependent on the *build parameters* defined above and needs to be declared after them +include ../PerArchMakefile.conf #------------------------------------------------------------------------------# # Makefile to build deps for use with pEpEngine diff --git a/android/external/PerArchMakefile.conf b/android/external/PerArchMakefile.conf new file mode 100644 index 0000000..e395f7b --- /dev/null +++ b/android/external/PerArchMakefile.conf @@ -0,0 +1,9 @@ +# This file holds variables that *should only be accessed from the Makefiles in each architecture*, which are generated from MakefileTemplate. + +# install root for built files +EXTERNAL_ROOT = $(shell pwd) +DESTDIR = $(EXTERNAL_ROOT)/.. +prefix = /output/$(APP_ABI) +LOCAL = $(DESTDIR)$(prefix) +NDK_TOOLCHAIN = $(NDK_TOOLCHAIN_TARGET)-$(NDK_TOOLCHAIN_COMPILER) +TEMP_WORK_PATH = "$(ANDROID_NDK_HOME)/bin:${PATH}:$(NDK_TOOLCHAIN)/bin:$(LOCAL)/bin"