aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorPo Lu2023-07-15 09:53:22 +0800
committerPo Lu2023-07-15 09:53:22 +0800
commite9a39fd89831e83708928409ec473b493845196f (patch)
treea3c5f383a390dc2c512419615d1899fff7751e69 /java
parentb6be92ffb69107ee224bd2f883bc621845ce9a33 (diff)
downloademacs-e9a39fd89831e83708928409ec473b493845196f.tar.gz
emacs-e9a39fd89831e83708928409ec473b493845196f.zip
Update Android port
* doc/emacs/android.texi (Android): Add new node to menu. (Android Environment): Add footnote pointing to new node. (Android Software): New node. * doc/emacs/emacs.texi (Top): Add new node to menu. * java/AndroidManifest.xml.in (manifest): Fix location of sharedUserId property. * java/INSTALL: Improve documentation of shared user ID support.
Diffstat (limited to 'java')
-rw-r--r--java/AndroidManifest.xml.in5
-rw-r--r--java/INSTALL15
2 files changed, 15 insertions, 5 deletions
diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in
index 3aae2032fff..895e7f88c57 100644
--- a/java/AndroidManifest.xml.in
+++ b/java/AndroidManifest.xml.in
@@ -25,6 +25,8 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
25 android:targetSandboxVersion="1" 25 android:targetSandboxVersion="1"
26 android:installLocation="auto" 26 android:installLocation="auto"
27 android:requestLegacyExternalStorage="true" 27 android:requestLegacyExternalStorage="true"
28 @ANDROID_SHARED_USER_ID@
29 @ANDROID_SHARED_USER_NAME@
28 android:versionCode="@emacs_major_version@" 30 android:versionCode="@emacs_major_version@"
29 android:versionName="@version@"> 31 android:versionName="@version@">
30 32
@@ -74,8 +76,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. -->
74 android:supportsRtl="true" 76 android:supportsRtl="true"
75 android:theme="@style/EmacsStyle" 77 android:theme="@style/EmacsStyle"
76 android:debuggable="@ANDROID_DEBUGGABLE@" 78 android:debuggable="@ANDROID_DEBUGGABLE@"
77 @ANDROID_SHARED_USER_ID@ 79 android:allowBackup="true"
78 @ANDROID_SHARED_USER_NAME@
79 android:extractNativeLibs="true"> 80 android:extractNativeLibs="true">
80 81
81 <activity android:name="org.gnu.emacs.EmacsActivity" 82 <activity android:name="org.gnu.emacs.EmacsActivity"
diff --git a/java/INSTALL b/java/INSTALL
index 63b99272004..0646db426e0 100644
--- a/java/INSTALL
+++ b/java/INSTALL
@@ -161,15 +161,24 @@ to provide both debug and release versions.
161BUILDING WITH A SHARED USER ID 161BUILDING WITH A SHARED USER ID
162 162
163Sometimes it may be desirable to build Emacs so that it is able to 163Sometimes it may be desirable to build Emacs so that it is able to
164access executables from another program. To achieve this, that other 164access executables and application data from another program. To
165program must have a ``shared user ID'', and be signed with the same 165achieve this, that other program must have a ``shared user ID'', and
166signing key used to sign Emacs (normally `emacs.keystore'.) 166be signed with the same signing key used to sign Emacs (normally
167`emacs.keystore'.)
167 168
168Once you have both that signing key and its ``shared user ID'', you 169Once you have both that signing key and its ``shared user ID'', you
169can give it to configure: 170can give it to configure:
170 171
171 ./configure --with-shared-user-id=MY.SHARED.USER.ID 172 ./configure --with-shared-user-id=MY.SHARED.USER.ID
172 173
174For instance,
175
176 ./configure --with-shared-user-id=com.termux
177
178will result in Termux (https://termux.dev)'s application data being
179accessible to Emacs, within its own application data directory located
180at `/data/data/com.termux/files'.
181
173Don't do this if you already have Emacs installed with a different 182Don't do this if you already have Emacs installed with a different
174shared user ID, as the system does not allow programs to change their 183shared user ID, as the system does not allow programs to change their
175user IDs after being installed. 184user IDs after being installed.