Changeset 3d8c0b27 in subsurface


Ignore:
Timestamp:
May 27, 2017, 7:09:27 AM (4 weeks ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
c6bc88b
Parents:
1df4b6c
git-author:
Jan Mulder <jlmulder@…> (05/25/17 10:57:06)
git-committer:
Dirk Hohndel <dirk@…> (05/27/17 07:09:27)
Message:

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@…>

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • android-mobile/AndroidManifest.xml

    r11f7e18 r3d8c0b27  
    6666                android:name="android.app.static_init_classes"
    6767                android:value="-- %%INSERT_INIT_CLASSES%% --" />
    68             <!-- Messages maps -->
    69             <meta-data
    70                 android:name="android.app.ministro_not_found_msg"
    71                 android:value="@string/ministro_not_found_msg" />
    72             <meta-data
    73                 android:name="android.app.ministro_needed_msg"
    74                 android:value="@string/ministro_needed_msg" />
    75             <meta-data
    76                 android:name="android.app.fatal_error_msg"
    77                 android:value="@string/fatal_error_msg" />
    78             <!-- Messages maps -->
    79 
    8068
    8169            <!-- Splash screen -->
  • android-mobile/res/values/strings.xml

    r0aecb12 r3d8c0b27  
    22<resources>
    33    <string name="app_name">Subsurface-mobile</string>
    4 
    5     <string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string>
    6     <string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string>
    7     <string name="fatal_error_msg">Your application encountered a fatal error and cannot continue.</string>
    84</resources>
  • android/AndroidManifest.xml

    r7386d0b r3d8c0b27  
    6464                android:name="android.app.static_init_classes"
    6565                android:value="-- %%INSERT_INIT_CLASSES%% --" />
    66             <!-- Messages maps -->
    67             <meta-data
    68                 android:name="android.app.ministro_not_found_msg"
    69                 android:value="@string/ministro_not_found_msg" />
    70             <meta-data
    71                 android:name="android.app.ministro_needed_msg"
    72                 android:value="@string/ministro_needed_msg" />
    73             <meta-data
    74                 android:name="android.app.fatal_error_msg"
    75                 android:value="@string/fatal_error_msg" />
    76             <!-- Messages maps -->
    77 
    7866
    7967            <!-- Splash screen -->
  • android/res/values/strings.xml

    r41874212 r3d8c0b27  
    22<resources>
    33    <string name="app_name">Subsurface-Divelog</string>
    4 
    5     <string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string>
    6     <string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string>
    7     <string name="fatal_error_msg">Your application encountered a fatal error and cannot continue.</string>
    84</resources>
Note: See TracChangeset for help on using the changeset viewer.