From d70bb47aeb586bfa5feb29d6f3759604eb93829a Mon Sep 17 00:00:00 2001 From: Po Lu Date: Fri, 17 Feb 2023 21:09:00 +0800 Subject: Update emacsbug and version.el for the Android port * java/Makefile.in (install_temp/assets/version): New generated file. * lisp/loadup.el: Set emacs versions appropriately prior to dumping on Android. * lisp/mail/emacsbug.el (emacs-build-description): Insert Android build fingerprint. * lisp/version.el (emacs-repository-version-android) (emacs-repository-get-version, emacs-repository-get-branch): Implement for Android. * src/androidterm.c (android_set_build_fingerprint): New function. (syms_of_androidterm): New variable `android-build-fingerprint'. --- java/Makefile.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'java') diff --git a/java/Makefile.in b/java/Makefile.in index 92c03469c69..f732c9211ee 100644 --- a/java/Makefile.in +++ b/java/Makefile.in @@ -192,12 +192,18 @@ ifneq ($(NDK_BUILD_SHARED),) install_temp/lib/$(ANDROID_ABI) endif -install_temp/assets/directory-tree: $(libsrc)/asset-directory-tool install_temp +install_temp/assets/directory-tree: $(libsrc)/asset-directory-tool \ + install_temp install_temp/assets/version $(AM_V_GEN) $(libsrc)/asset-directory-tool install_temp/assets \ install_temp/assets/directory-tree +install_temp/assets/version: install_temp + $(AM_V_GEN) { (git rev-parse HEAD || echo "Unknown") \ + && (git rev-parse --abbrev-ref HEAD \ + || echo "Unknown") } 2> /dev/null > $@ + emacs.apk-in: install_temp install_temp/assets/directory-tree \ - AndroidManifest.xml + install_temp/assets/version AndroidManifest.xml # Package everything. Specifying the assets on this command line is # necessary for AAssetManager_getNextFileName to work on old versions # of Android. Make sure not to generate R.java, as it's already been -- cgit v1.2.1