]> git.eshelyaron.com Git - emacs.git/commit
Fix out-of-tree Android builds
authorPo Lu <luangruo@yahoo.com>
Wed, 1 Mar 2023 11:34:45 +0000 (19:34 +0800)
committerPo Lu <luangruo@yahoo.com>
Wed, 1 Mar 2023 11:35:19 +0000 (19:35 +0800)
commitdaf9c62871af8539044da15028a078905bb9ba06
tree3482cb2d04d137180f369644cbcaf9b858fba580
parenta0c3643abde85567eaf21c0695a7c042be33af11
Fix out-of-tree Android builds

* configure.ac (JAVA_PUSH_LINT): Push to WARN_JAVAFLAGS instead
of JAVAFLAGS.
(cross/lib): Always AS_MKDIR_P.
* cross/Makefile.in (srcdir): New variable.
(LIB_SRCDIR): Take realpath relative to srcdir, not
.:(src/verbose.mk): Depend on verbose.mk.android in srcdir.
(lib/Makefile): Edit srcdir and VPATH to LIB_SRCDIR.
(src/Makefile): Edit -I$$(top_srcdir) to -I../$(srcdir)/lib,
instead of ommitting it.
(clean): Allow ndk-build clean to fail.

* java/Makefile.in (builddir): New variable.
(WARN_JAVAFLAGS): Likewise.
(JAVAFLAGS): Define in terms of WARN_JAVAFLAGS.
(SIGN_EMACS, SIGN_EMACS_V2): Use emacs.keystore relative to
srcdir.  Allow inclusion of ndk-build.mk to fail.
(install_temp, emacs.apk-in)
(../config.status): Depend relative to top_srcdir.
(AndroidManifest.xml, $(APK_NAME)): Likewise.
(RESOURCE_FILE, CLASS_FILES, classes.dex): Output class files
to $(srcdir); these are arch independents, so this is okay.
configure.ac
cross/Makefile.in
java/Makefile.in