Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1091357 - Include the strings regardless of whether or not MOZ_ANDROID_SEARCH_ACTIVITY is set. r=nalexander

Browse Source 
Bug 1080326 moved the search activity resources into the main Fennec resources. Those search activity resources require the corresponding strings; this patch makes them unconditionally available.
This commit is contained in:
Nathan Toone 2014-12-03 18:29:00 +01:00
parent 57e70c019f
commit 7278e78cc3
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/base/strings.xml.in
View File

@ -8,9 +8,7 @@
#includesubst @BRANDPATH@
#includesubst @STRINGSPATH@
#includesubst @SYNCSTRINGSPATH@
#ifdef MOZ_ANDROID_SEARCH_ACTIVITY
#includesubst @SEARCHSTRINGSPATH@
#endif
<!-- C-style format strings. -->
<!ENTITY formatI "&#037;I">
@ -33,9 +31,7 @@
<string name="moz_android_shared_fxaccount_type">@MOZ_ANDROID_SHARED_FXACCOUNT_TYPE@</string>
<string name="android_package_name_for_ui">@ANDROID_PACKAGE_NAME@</string>
#ifdef MOZ_ANDROID_SEARCH_ACTIVITY
#include ../search/strings/search_strings.xml.in
#endif
#include ../services/strings.xml.in
<string name="no_space_to_start_error">&no_space_to_start_error;</string>