diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2017-05-25 19:57:06 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-05-27 07:09:27 -0700 |
| commit | 3d8c0b27719ec6fd180c85608b241a53c123ca4c (patch) | |
| tree | aae20f8ac548db95d7c451c36884bdb7ea665787 | |
| parent | 1df4b6c11b9c3b84f72e3248b08f079d29caba08 (diff) | |
| download | subsurface-3d8c0b27719ec6fd180c85608b241a53c123ca4c.tar.gz | |
Android build: remove references to ministro stuff
First, Ministro (an app to help installing Qt dependencies on
the mobile platform) is not needed in Subsurface context, as all
dependencies are part of the distribution. Secondly, it breaks the
build as the strings (removed here) are also defined in Qt, and
apparently the Gradle build is detecting this double define.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| -rw-r--r-- | android-mobile/AndroidManifest.xml | 12 | ||||
| -rw-r--r-- | android-mobile/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | android/AndroidManifest.xml | 12 | ||||
| -rw-r--r-- | android/res/values/strings.xml | 4 |
4 files changed, 0 insertions, 32 deletions
diff --git a/android-mobile/AndroidManifest.xml b/android-mobile/AndroidManifest.xml index b0fc8dfe7..e00433834 100644 --- a/android-mobile/AndroidManifest.xml +++ b/android-mobile/AndroidManifest.xml @@ -65,18 +65,6 @@ <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --" /> - <!-- Messages maps --> - <meta-data - android:name="android.app.ministro_not_found_msg" - android:value="@string/ministro_not_found_msg" /> - <meta-data - android:name="android.app.ministro_needed_msg" - android:value="@string/ministro_needed_msg" /> - <meta-data - android:name="android.app.fatal_error_msg" - android:value="@string/fatal_error_msg" /> - <!-- Messages maps --> - <!-- Splash screen --> <!-- <meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/subsurface_mobile_splash" /> --> diff --git a/android-mobile/res/values/strings.xml b/android-mobile/res/values/strings.xml index f4871b6e2..96bef52a7 100644 --- a/android-mobile/res/values/strings.xml +++ b/android-mobile/res/values/strings.xml @@ -1,8 +1,4 @@ <?xml version='1.0' encoding='utf-8'?> <resources> <string name="app_name">Subsurface-mobile</string> - - <string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string> - <string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string> - <string name="fatal_error_msg">Your application encountered a fatal error and cannot continue.</string> </resources> diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 83f93ac4d..8c3d8406a 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -63,18 +63,6 @@ <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --" /> - <!-- Messages maps --> - <meta-data - android:name="android.app.ministro_not_found_msg" - android:value="@string/ministro_not_found_msg" /> - <meta-data - android:name="android.app.ministro_needed_msg" - android:value="@string/ministro_needed_msg" /> - <meta-data - android:name="android.app.fatal_error_msg" - android:value="@string/fatal_error_msg" /> - <!-- Messages maps --> - <!-- Splash screen --> <!-- diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 4c5aeddf2..f2d6197fe 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -1,8 +1,4 @@ <?xml version='1.0' encoding='utf-8'?> <resources> <string name="app_name">Subsurface-Divelog</string> - - <string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string> - <string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string> - <string name="fatal_error_msg">Your application encountered a fatal error and cannot continue.</string> </resources> |