diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-02-17 21:09:00 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-02-17 21:09:00 +0800 |
| commit | d70bb47aeb586bfa5feb29d6f3759604eb93829a (patch) | |
| tree | 38817755116a2ebfa1331cc633ff955eb8a2b4c7 /java | |
| parent | 1f81186d67b2a86e6a555a7ad3323fcd13f5e257 (diff) | |
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'.
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile.in | 10 |
1 files changed, 8 insertions, 2 deletions
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 |