Closed Bug 1091357 Opened 5 years ago Closed 5 years ago

Excluding the search activity from the build fails to properly exclude resources

Categories

(Firefox Build System :: Android Studio and Gradle Integration, defect)

All
Android
defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
mozilla37

People

(Reporter: rnewman, Assigned: toonetown)

Details

Attachments

(1 file, 1 obsolete file)

22:59.56 /Users/rnewman/moz/hg/fx-team/mobile/android/base/resources/layout/search_activity_main.xml:46: error: Error: No resource found that matches the given name (at 'contentDescription' with value '@string/search_pref_button_content_description').
22:59.56
22:59.56 /Users/rnewman/moz/hg/fx-team/mobile/android/base/resources/layout/search_suggestions_row.xml:21: error: Error: No resource found that matches the given name (at 'contentDescription' with value '@string/search_plus_content_description').
22:59.56
22:59.56 /Users/rnewman/moz/hg/fx-team/mobile/android/base/resources/layout/search_widget.xml:23: error: Error: No resource found that matches the given name (at 'contentDescription' with value '@string/search_widget_button_label').
22:59.56
22:59.56 /Users/rnewman/moz/hg/fx-team/mobile/android/base/resources/layout/search_widget.xml:32: error: Error: No resource found that matches the given name (at 'text' with value '@string/search_widget_button_label').
22:59.56
22:59.56 /Users/rnewman/moz/hg/fx-team/mobile/android/base/resources/xml/search_preferences.xml:6: error: Error: No resource found that matches the given name (at 'title' with value '@string/pref_clearHistory_title').
22:59.57
22:59.57 /Users/rnewman/moz/hg/fx-team/mobile/android/base/resources/xml/search_widget_info.xml:6: error: Error: No resource found that matches the given name (at 'label' with value '@string/search_widget_name').
Oh, right, this was a conscious choice in Bug 1080326.  We moved the resources (to simplify the IDE story) but that means that the build flag needs to be removed or the strings need to be included without reference to the build flag.  (So the build flag is either always on or applies to code only.)

In a brave future gradle world, we might be able to revisit this decision and really keep the search activity separate.

This is low priority since the default is on and few people will turn it off.
It looks like removing the two "#ifdef MOZ_ANDROID_SEARCH_ACTIVITY" conditionals from strings.xml.in will address this issue.  Patches are forthcoming.
Comment on attachment 8531823 [details] [diff] [review]
Simple patch which just removes conditionals from strings.xml.in

Review of attachment 8531823 [details] [diff] [review]:
-----------------------------------------------------------------

Please include rationale in the commit message:

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.
Attachment #8531823 - Flags: review?(nalexander) → review+
Try server https://treeherder.mozilla.org/#/jobs?repo=try&revision=fde296fb6532

Could someone please add the checkin-needed keyword?
https://hg.mozilla.org/integration/fx-team/rev/f3abfa68ae44
Assignee: nobody → nathan
Keywords: checkin-needed
Whiteboard: [fixed-in-fx-team]
https://hg.mozilla.org/mozilla-central/rev/f3abfa68ae44
Status: NEW → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
Whiteboard: [fixed-in-fx-team]
Target Milestone: --- → Firefox 37
Product: Firefox for Android → Firefox Build System
Target Milestone: Firefox 37 → mozilla37
You need to log in before you can comment on or make changes to this bug.