diff options
| author | Po Lu | 2023-07-14 20:30:30 +0800 |
|---|---|---|
| committer | Po Lu | 2023-07-14 20:30:30 +0800 |
| commit | 11c8a2fa87df2b6cc505e670a972552750eab71f (patch) | |
| tree | e2b4fc6fc0dccde7f932596d6e0c1661e8305e29 /java | |
| parent | cb4ea3e7fb36d942dd9d495462fc591f54707b40 (diff) | |
| download | emacs-11c8a2fa87df2b6cc505e670a972552750eab71f.tar.gz emacs-11c8a2fa87df2b6cc505e670a972552750eab71f.zip | |
Make --with-shared-user-id work
* configure.ac (ANDROID_SHARED_USER_NAME): New variable.
Substitute it.
* java/AndroidManifest.xml.in: Set `sharedUserLabel' if a shared
user ID is enabled.
* java/res/values/strings.xml (shared_user_name): New string
resource.
Diffstat (limited to 'java')
| -rw-r--r-- | java/AndroidManifest.xml.in | 1 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/java/AndroidManifest.xml.in b/java/AndroidManifest.xml.in index e79fb4e46e7..3aae2032fff 100644 --- a/java/AndroidManifest.xml.in +++ b/java/AndroidManifest.xml.in | |||
| @@ -75,6 +75,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. --> | |||
| 75 | android:theme="@style/EmacsStyle" | 75 | android:theme="@style/EmacsStyle" |
| 76 | android:debuggable="@ANDROID_DEBUGGABLE@" | 76 | android:debuggable="@ANDROID_DEBUGGABLE@" |
| 77 | @ANDROID_SHARED_USER_ID@ | 77 | @ANDROID_SHARED_USER_ID@ |
| 78 | @ANDROID_SHARED_USER_NAME@ | ||
| 78 | android:extractNativeLibs="true"> | 79 | android:extractNativeLibs="true"> |
| 79 | 80 | ||
| 80 | <activity android:name="org.gnu.emacs.EmacsActivity" | 81 | <activity android:name="org.gnu.emacs.EmacsActivity" |
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 36a47be6c84..8a11cb007ee 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml | |||
| @@ -36,4 +36,10 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. --> | |||
| 36 | <string name="erase_dump_caption"> | 36 | <string name="erase_dump_caption"> |
| 37 | Remove the dumped state created when Emacs was installed. | 37 | Remove the dumped state created when Emacs was installed. |
| 38 | </string> | 38 | </string> |
| 39 | |||
| 40 | <!-- This resource describes the purpose of any `sharedUserId' | ||
| 41 | specified at configure-time. --> | ||
| 42 | <string name="shared_user_name"> | ||
| 43 | Emacs shared user | ||
| 44 | </string> | ||
| 39 | </resources> | 45 | </resources> |