diff options
| author | Po Lu | 2023-02-17 21:09:00 +0800 |
|---|---|---|
| committer | Po Lu | 2023-02-17 21:09:00 +0800 |
| commit | d70bb47aeb586bfa5feb29d6f3759604eb93829a (patch) | |
| tree | 38817755116a2ebfa1331cc633ff955eb8a2b4c7 /java/Makefile.in | |
| parent | 1f81186d67b2a86e6a555a7ad3323fcd13f5e257 (diff) | |
| download | emacs-d70bb47aeb586bfa5feb29d6f3759604eb93829a.tar.gz emacs-d70bb47aeb586bfa5feb29d6f3759604eb93829a.zip | |
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/Makefile.in')
| -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),) | |||
| 192 | install_temp/lib/$(ANDROID_ABI) | 192 | install_temp/lib/$(ANDROID_ABI) |
| 193 | endif | 193 | endif |
| 194 | 194 | ||
| 195 | install_temp/assets/directory-tree: $(libsrc)/asset-directory-tool install_temp | 195 | install_temp/assets/directory-tree: $(libsrc)/asset-directory-tool \ |
| 196 | install_temp install_temp/assets/version | ||
| 196 | $(AM_V_GEN) $(libsrc)/asset-directory-tool install_temp/assets \ | 197 | $(AM_V_GEN) $(libsrc)/asset-directory-tool install_temp/assets \ |
| 197 | install_temp/assets/directory-tree | 198 | install_temp/assets/directory-tree |
| 198 | 199 | ||
| 200 | install_temp/assets/version: install_temp | ||
| 201 | $(AM_V_GEN) { (git rev-parse HEAD || echo "Unknown") \ | ||
| 202 | && (git rev-parse --abbrev-ref HEAD \ | ||
| 203 | || echo "Unknown") } 2> /dev/null > $@ | ||
| 204 | |||
| 199 | emacs.apk-in: install_temp install_temp/assets/directory-tree \ | 205 | emacs.apk-in: install_temp install_temp/assets/directory-tree \ |
| 200 | AndroidManifest.xml | 206 | install_temp/assets/version AndroidManifest.xml |
| 201 | # Package everything. Specifying the assets on this command line is | 207 | # Package everything. Specifying the assets on this command line is |
| 202 | # necessary for AAssetManager_getNextFileName to work on old versions | 208 | # necessary for AAssetManager_getNextFileName to work on old versions |
| 203 | # of Android. Make sure not to generate R.java, as it's already been | 209 | # of Android. Make sure not to generate R.java, as it's already been |