Bug 838652 - Use res-auto namespace alias instead of preprocessing files (r=mfinkle)
authorLucas Rocha <lucasr@mozilla.com>
Fri, 15 Mar 2013 00:44:00 +0000
changeset 124905 e9843158cc6a9ad0371b56847cef594e09a5a529
parent 124904 a1b34cb6b77e6bad539a011bd7dd19b4db9f9338
child 124906 93fe1f895a4a5f689b59dff6e30a689434462bcb
push id24667
push userlrocha@mozilla.com
push dateFri, 15 Mar 2013 09:41:35 +0000
treeherdermozilla-inbound@e9843158cc6a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs838652
milestone22.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 838652 - Use res-auto namespace alias instead of preprocessing files (r=mfinkle)
CLOBBER
mobile/android/base/Makefile.in
mobile/android/base/resources/color/abouthome_section_more_text.xml
mobile/android/base/resources/color/abouthome_section_more_text.xml.in
mobile/android/base/resources/color/abouthome_section_subtitle.xml
mobile/android/base/resources/color/abouthome_section_subtitle.xml.in
mobile/android/base/resources/color/abouthome_section_title.xml
mobile/android/base/resources/color/abouthome_section_title.xml.in
mobile/android/base/resources/color/awesome_bar_title.xml
mobile/android/base/resources/color/awesome_bar_title.xml.in
mobile/android/base/resources/color/awesome_bar_title_hint.xml
mobile/android/base/resources/color/awesome_bar_title_hint.xml.in
mobile/android/base/resources/drawable/abouthome_logo.xml
mobile/android/base/resources/drawable/abouthome_logo.xml.in
mobile/android/base/resources/drawable/address_bar_bg.xml
mobile/android/base/resources/drawable/address_bar_bg.xml.in
mobile/android/base/resources/drawable/address_bar_nav_button.xml
mobile/android/base/resources/drawable/address_bar_nav_button.xml.in
mobile/android/base/resources/drawable/address_bar_url.xml
mobile/android/base/resources/drawable/address_bar_url.xml.in
mobile/android/base/resources/drawable/menu_item_state.xml
mobile/android/base/resources/drawable/menu_item_state.xml.in
mobile/android/base/resources/drawable/menu_level.xml
mobile/android/base/resources/drawable/menu_level.xml.in
mobile/android/base/resources/layout-land-v14/browser_toolbar.xml
mobile/android/base/resources/layout-land-v14/browser_toolbar.xml.in
mobile/android/base/resources/layout-land-v14/browser_toolbar_menu.xml
mobile/android/base/resources/layout-land-v14/browser_toolbar_menu.xml.in
mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml.in
mobile/android/base/resources/layout-large-v11/awesomebar_search.xml
mobile/android/base/resources/layout-large-v11/awesomebar_search.xml.in
mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml
mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml.in
mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in
mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml
mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml.in
mobile/android/base/resources/layout/abouthome_content.xml
mobile/android/base/resources/layout/abouthome_content.xml.in
mobile/android/base/resources/layout/awesomebar_search.xml
mobile/android/base/resources/layout/awesomebar_search.xml.in
mobile/android/base/resources/layout/awesomebar_suggestion_row.xml
mobile/android/base/resources/layout/awesomebar_suggestion_row.xml.in
mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
mobile/android/base/resources/layout/awesomebar_tab_indicator.xml.in
mobile/android/base/resources/layout/browser_toolbar.xml
mobile/android/base/resources/layout/browser_toolbar.xml.in
mobile/android/base/resources/layout/browser_toolbar_menu.xml
mobile/android/base/resources/layout/browser_toolbar_menu.xml.in
mobile/android/base/resources/layout/gecko_app.xml
mobile/android/base/resources/layout/gecko_app.xml.in
mobile/android/base/resources/layout/tabs_panel.xml
mobile/android/base/resources/layout/tabs_panel.xml.in
mobile/android/base/resources/layout/text_selection_handles.xml
mobile/android/base/resources/layout/text_selection_handles.xml.in
mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
mobile/android/base/resources/menu-v11/browser_app_menu.xml
mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
mobile/android/base/resources/menu/browser_app_menu.xml
mobile/android/base/resources/menu/browser_app_menu.xml.in
mobile/android/base/resources/xml/preferences.xml.in
--- a/CLOBBER
+++ b/CLOBBER
@@ -10,9 +10,9 @@
 #                  O   <-- Users coming from both parents need to Clobber
 #               /     \
 #          O               O
 #          |               |
 #          O <-- Clobber   O  <-- Clobber
 #
 # Note: The description below will be part of the error message shown to users.
 #
-Bug 847599 requires a clobber
+Bug 838652 requires a clobber
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -244,52 +244,20 @@ FENNEC_PP_JAVA_FILES = \
   db/FormHistoryProvider.java \
   db/TabsProvider.java \
   db/GeckoProvider.java \
   SmsManager.java \
   UpdateServiceHelper.java \
   $(NULL)
 
 FENNEC_PP_XML_FILES = \
-  res/color/abouthome_section_more_text.xml \
-  res/color/abouthome_section_subtitle.xml \
-  res/color/abouthome_section_title.xml \
-  res/color/awesome_bar_title.xml \
-  res/color/awesome_bar_title_hint.xml \
-  res/drawable/abouthome_logo.xml \
-  res/drawable/address_bar_bg.xml \
-  res/drawable/address_bar_nav_button.xml \
-  res/drawable/address_bar_url.xml \
-  res/drawable/menu_item_state.xml \
-  res/drawable/menu_level.xml \
-  res/layout/abouthome_content.xml \
-  res/layout/awesomebar_search.xml \
-  res/layout/awesomebar_suggestion_row.xml \
-  res/layout/awesomebar_tab_indicator.xml \
-  res/layout/browser_toolbar.xml \
-  res/layout/browser_toolbar_menu.xml \
-  res/layout-land-v14/browser_toolbar.xml \
-  res/layout-land-v14/browser_toolbar_menu.xml \
-  res/layout-large-v11/awesomebar_search.xml \
-  res/layout-large-v11/browser_toolbar_menu.xml \
-  res/layout-large-land-v11/tabs_panel.xml \
-  res/layout/gecko_app.xml \
-  res/layout/tabs_panel.xml \
-  res/layout/text_selection_handles.xml \
-  res/layout-xlarge-land-v11/abouthome_content.xml \
-  res/layout-xlarge-v11/awesomebar_search.xml \
   res/xml/preferences.xml \
   res/xml/searchable.xml \
-  res/menu/browser_app_menu.xml \
-  res/menu-v11/browser_app_menu.xml \
-  res/menu-large-v11/browser_app_menu.xml \
-  res/menu-xlarge-v11/browser_app_menu.xml \
   $(NULL)
 
-
 ifneq (,$(findstring -march=armv7,$(OS_CFLAGS)))
 MIN_CPU_VERSION=7
 else
 MIN_CPU_VERSION=5
 endif
 
 MOZ_APP_BUILDID=$(shell cat $(DEPTH)/config/buildid)
 
@@ -392,36 +360,43 @@ ifdef MOZ_ANDROID_SHARED_ID
 DEFINES += -DMOZ_ANDROID_SHARED_ID="$(MOZ_ANDROID_SHARED_ID)"
 endif
 ifdef MOZ_ANDROID_SHARED_ACCOUNT_TYPE
 DEFINES += -DMOZ_ANDROID_SHARED_ACCOUNT_TYPE="$(MOZ_ANDROID_SHARED_ACCOUNT_TYPE)"
 endif
 
 RES_LAYOUT = \
   $(SYNC_RES_LAYOUT) \
+  res/layout/abouthome_content.xml \
   res/layout/autocomplete_list.xml \
   res/layout/autocomplete_list_item.xml \
   res/layout/awesomebar.xml \
   res/layout/awesomebar_actionbar.xml \
   res/layout/awesomebar_expandable_list.xml \
   res/layout/awesomebar_folder_row.xml \
   res/layout/awesomebar_header_row.xml \
   res/layout/awesomebar_allpages_list.xml \
   res/layout/awesomebar_list.xml \
   res/layout/awesomebar_row.xml \
+  res/layout/awesomebar_search.xml \
+  res/layout/awesomebar_suggestion_row.xml \
   res/layout/awesomebar_suggestion_item.xml \
   res/layout/awesomebar_suggestion_prompt.xml \
+  res/layout/awesomebar_tab_indicator.xml \
   res/layout/awesomebar_tabs.xml \
   res/layout/bookmark_edit.xml \
+  res/layout/browser_toolbar.xml \
+  res/layout/browser_toolbar_menu.xml \
   res/layout/datetime_picker.xml \
   res/layout/doorhangerpopup.xml \
   res/layout/doorhanger.xml \
   res/layout/doorhanger_button.xml \
   res/layout/find_in_page_content.xml \
   res/layout/font_size_preference.xml \
+  res/layout/gecko_app.xml \
   res/layout/gecko_appwidget.xml \
   res/layout/web_app.xml \
   res/layout/launch_app_list.xml \
   res/layout/launch_app_listitem.xml \
   res/layout/menu_action_bar.xml \
   res/layout/menu_item.xml \
   res/layout/menu_popup.xml \
   res/layout/notification_icon_text.xml \
@@ -429,48 +404,63 @@ RES_LAYOUT = \
   res/layout/notification_progress_text.xml \
   res/layout/site_setting_item.xml \
   res/layout/site_setting_title.xml \
   res/layout/setup_screen.xml \
   res/layout/shared_ui_components.xml \
   res/layout/site_identity_popup.xml \
   res/layout/remote_tabs_child.xml \
   res/layout/remote_tabs_group.xml \
+  res/layout/tabs_panel.xml \
   res/layout/tabs_counter.xml \
   res/layout/tabs_panel_header.xml \
   res/layout/tabs_panel_indicator.xml \
   res/layout/tabs_item_cell.xml \
   res/layout/tabs_item_row.xml \
+  res/layout/text_selection_handles.xml \
   res/layout/list_item_header.xml \
   res/layout/select_dialog_list.xml \
   res/layout/select_dialog_multichoice.xml \
   res/layout/abouthome_addon_row.xml \
   res/layout/abouthome_last_tabs_row.xml \
   res/layout/abouthome_section.xml \
   res/layout/abouthome_remote_tab_row.xml \
   res/layout/abouthome_topsite_item.xml \
   res/layout/validation_message.xml \
   $(NULL)
 
+RES_LAYOUT_LAND_V14 = \
+  res/layout-land-v14/browser_toolbar.xml \
+  res/layout-land-v14/browser_toolbar_menu.xml \
+  $(NULL)
+
 RES_LAYOUT_LARGE_V11 = \
+  res/layout-large-v11/awesomebar_search.xml \
+  res/layout-large-v11/browser_toolbar_menu.xml \
   res/layout-large-v11/doorhangerpopup.xml \
   res/layout-large-v11/site_identity_popup.xml \
   $(NULL)
 
 RES_LAYOUT_LARGE_LAND_V11 = \
+  res/layout-large-land-v11/tabs_panel.xml \
   res/layout-large-land-v11/tabs_panel_header.xml \
   res/layout-large-land-v11/tabs_panel_footer.xml \
   $(NULL)
 
 RES_LAYOUT_XLARGE_V11 = \
+  res/layout-xlarge-v11/awesomebar_search.xml \
   res/layout-xlarge-v11/font_size_preference.xml \
   res/layout-xlarge-v11/remote_tabs_child.xml \
   res/layout-xlarge-v11/remote_tabs_group.xml \
   $(NULL)
 
+RES_LAYOUT_XLARGE_LAND_V11 = \
+  res/layout-xlarge-land-v11/abouthome_content.xml \
+  $(NULL)
+
 RES_VALUES = \
   $(SYNC_RES_VALUES) \
   res/values/attrs.xml \
   res/values/arrays.xml \
   res/values/colors.xml \
   res/values/dimens.xml \
   res/values/integers.xml \
   res/values/layout.xml \
@@ -513,17 +503,17 @@ RES_VALUES_LAND_V14 = \
   res/values-land-v14/dimens.xml \
   $(NULL)
 
 RES_VALUES_V14 = \
   res/values-v14/styles.xml \
   $(NULL)
 
 RES_XML = \
-        res/xml/gecko_appwidget_info.xml \
+  res/xml/gecko_appwidget_info.xml \
 	$(SYNC_RES_XML) \
 	$(NULL)
 
 RES_ANIM = \
   res/anim/awesomebar_fade_in.xml \
   res/anim/awesomebar_fade_out.xml \
   res/anim/awesomebar_hold_still.xml \
   res/anim/grow_fade_in.xml \
@@ -965,52 +955,76 @@ RES_DRAWABLE_XLARGE_XHDPI_V11 = \
   res/drawable-xlarge-xhdpi-v11/awesomebar_tab_right.9.png \
   res/drawable-xlarge-xhdpi-v11/awesomebar_sep_left.9.png \
   res/drawable-xlarge-xhdpi-v11/awesomebar_sep_right.9.png \
   res/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_add.png \
   res/drawable-xlarge-xhdpi-v11/ic_menu_bookmark_remove.png \
   $(NULL)
 
 RES_COLOR = \
+  res/color/abouthome_section_more_text.xml \
+  res/color/abouthome_section_subtitle.xml \
+  res/color/abouthome_section_title.xml \
+  res/color/awesome_bar_title.xml \
+  res/color/awesome_bar_title_hint.xml \
   res/color/menu_item_title.xml \
   res/color/select_item_multichoice.xml \
   $(NULL)
 
 RES_MENU = \
   res/menu/awesomebar_contextmenu.xml \
+  res/menu/browser_app_menu.xml \
   res/menu/gecko_app_menu.xml \
   res/menu/titlebar_contextmenu.xml \
   res/menu/abouthome_topsites_contextmenu.xml \
   $(NULL)
 
+RES_MENU_V11 = \
+  res/menu-v11/browser_app_menu.xml \
+  $(NULL)
+
+RES_MENU_LARGE_V11 = \
+  res/menu-large-v11/browser_app_menu.xml \
+  $(NULL)
+
+RES_MENU_XLARGE_V11 = \
+  res/menu-xlarge-v11/browser_app_menu.xml \
+  $(NULL)
+
 JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
 
 ifdef MOZ_CRASHREPORTER
 FENNEC_PP_JAVA_FILES += CrashReporter.java
 RES_DRAWABLE_MDPI += res/drawable-mdpi/crash_reporter.png
 RES_LAYOUT += res/layout/crash_reporter.xml
 endif
 
 MOZ_ANDROID_DRAWABLES += \
   $(SYNC_RES_DRAWABLE)                                                          \
+  mobile/android/base/resources/drawable/abouthome_logo.xml                     \
   mobile/android/base/resources/drawable/abouthome_promo_box.xml                \
   mobile/android/base/resources/drawable/action_bar_button.xml                  \
   mobile/android/base/resources/drawable/action_bar_button_inverse.xml          \
+  mobile/android/base/resources/drawable/address_bar_bg.xml                     \
   mobile/android/base/resources/drawable/address_bar_bg_shadow_repeat.xml       \
+  mobile/android/base/resources/drawable/address_bar_nav_button.xml             \
+  mobile/android/base/resources/drawable/address_bar_url.xml                    \
   mobile/android/base/resources/drawable/awesomebar_row_favicon_bg.xml          \
   mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml           \
   mobile/android/base/resources/drawable/awesomebar_tab_selected.xml            \
   mobile/android/base/resources/drawable/awesomebar_tab_unselected.xml          \
   mobile/android/base/resources/drawable/handle_end_level.xml                   \
   mobile/android/base/resources/drawable/handle_start_level.xml                 \
   mobile/android/base/resources/drawable/ic_menu_back.xml                       \
   mobile/android/base/resources/drawable/ic_menu_desktop_mode_off.xml           \
   mobile/android/base/resources/drawable/ic_menu_desktop_mode_on.xml            \
   mobile/android/base/resources/drawable/ic_menu_quit.xml                       \
   mobile/android/base/resources/drawable/menu_button.xml                        \
+  mobile/android/base/resources/drawable/menu_item_state.xml                    \
+  mobile/android/base/resources/drawable/menu_level.xml                         \
   mobile/android/base/resources/drawable/progress_spinner.xml                   \
   mobile/android/base/resources/drawable/remote_tabs_child_divider.xml          \
   mobile/android/base/resources/drawable/site_security_level.xml                \
   mobile/android/base/resources/drawable/spinner.xml                            \
   mobile/android/base/resources/drawable/suggestion_selector.xml                \
   mobile/android/base/resources/drawable/tab_new_level.xml                      \
   mobile/android/base/resources/drawable/tab_row.xml                            \
   mobile/android/base/resources/drawable/tab_thumbnail.xml                      \
@@ -1019,17 +1033,17 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/tabs_panel_indicator.xml               \
   mobile/android/base/resources/drawable/webapp_titlebar_bg.xml                 \
   $(NULL)
 
 MOZ_BRANDING_DRAWABLE_MDPI = $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn | tr '\n' ' ';  fi)
 MOZ_BRANDING_DRAWABLE_HDPI = $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources-hdpi.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources-hdpi.mn | tr '\n' ' ';  fi)
 MOZ_BRANDING_DRAWABLE_XHDPI = $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources-xhdpi.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources-xhdpi.mn | tr '\n' ' ';  fi)
 
-RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_LARGE_LAND_V11) $(RES_LAYOUT_LARGE_V11) $(RES_LAYOUT_XLARGE_V11) $(RES_VALUES) $(RES_VALUES_LAND) $(RES_VALUES_V11) $(RES_VALUES_LARGE_V11) $(RES_VALUES_LARGE_LAND_V11) $(RES_VALUES_XLARGE_V11) $(RES_VALUES_LAND_V14) $(RES_VALUES_V14) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_MDPI) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_XHDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_DRAWABLE_LARGE_LAND_V11) $(RES_DRAWABLE_LARGE_MDPI_V11) $(RES_DRAWABLE_LARGE_HDPI_V11) $(RES_DRAWABLE_LARGE_XHDPI_V11) $(RES_DRAWABLE_XLARGE_MDPI_V11) $(RES_DRAWABLE_XLARGE_HDPI_V11) $(RES_DRAWABLE_XLARGE_XHDPI_V11) $(RES_COLOR) $(RES_MENU)
+RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_LAND_V14) $(RES_LAYOUT_LARGE_LAND_V11) $(RES_LAYOUT_LARGE_V11) $(RES_LAYOUT_XLARGE_V11) $(RES_LAYOUT_XLARGE_LAND_V11) $(RES_VALUES) $(RES_VALUES_LAND) $(RES_VALUES_V11) $(RES_VALUES_LARGE_V11) $(RES_VALUES_LARGE_LAND_V11) $(RES_VALUES_XLARGE_V11) $(RES_VALUES_LAND_V14) $(RES_VALUES_V14) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_MDPI) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_XHDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_DRAWABLE_LARGE_LAND_V11) $(RES_DRAWABLE_LARGE_MDPI_V11) $(RES_DRAWABLE_LARGE_HDPI_V11) $(RES_DRAWABLE_LARGE_XHDPI_V11) $(RES_DRAWABLE_XLARGE_MDPI_V11) $(RES_DRAWABLE_XLARGE_HDPI_V11) $(RES_DRAWABLE_XLARGE_XHDPI_V11) $(RES_COLOR) $(RES_MENU) $(RES_MENU_V11) $(RES_MENU_LARGE_V11) $(RES_MENU_XLARGE_V11)
 
 RES_DIRS= \
   res/layout                    \
   res/layout-land-v14           \
   res/layout-large-v11          \
   res/layout-large-land-v11     \
   res/layout-xlarge-v11         \
   res/layout-xlarge-land-v11    \
rename from mobile/android/base/resources/color/abouthome_section_more_text.xml.in
rename to mobile/android/base/resources/color/abouthome_section_more_text.xml
--- a/mobile/android/base/resources/color/abouthome_section_more_text.xml.in
+++ b/mobile/android/base/resources/color/abouthome_section_more_text.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+          xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <!-- dark theme -->
     <item gecko:state_dark="true" android:color="#80FFFFFF" />
 
     <!-- light theme -->
     <item gecko:state_light="true" android:color="#80222222" />
 
     <!-- default -->
rename from mobile/android/base/resources/color/abouthome_section_subtitle.xml.in
rename to mobile/android/base/resources/color/abouthome_section_subtitle.xml
--- a/mobile/android/base/resources/color/abouthome_section_subtitle.xml.in
+++ b/mobile/android/base/resources/color/abouthome_section_subtitle.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+          xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <!-- dark theme -->
     <item gecko:state_dark="true" android:color="#CCFFFFFF" />
 
     <!-- light theme -->
     <item gecko:state_light="true" android:color="#CC222222" />
 
     <!-- default -->
rename from mobile/android/base/resources/color/abouthome_section_title.xml.in
rename to mobile/android/base/resources/color/abouthome_section_title.xml
--- a/mobile/android/base/resources/color/abouthome_section_title.xml.in
+++ b/mobile/android/base/resources/color/abouthome_section_title.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+          xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <!-- dark theme -->
     <item gecko:state_dark="true" android:color="#FFFFFFFF" />
 
     <!-- light theme -->
     <item gecko:state_light="true" android:color="#FF222222" />
 
     <!-- default -->
rename from mobile/android/base/resources/color/awesome_bar_title.xml.in
rename to mobile/android/base/resources/color/awesome_bar_title.xml
--- a/mobile/android/base/resources/color/awesome_bar_title.xml.in
+++ b/mobile/android/base/resources/color/awesome_bar_title.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+          xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <!-- private browsing mode -->
     <item gecko:state_private="true" android:color="#FFDDDDDD" />
 
     <!-- dark theme -->
     <item gecko:state_dark="true" android:color="#FFDDDDDD"/>
 
     <!-- light theme -->
rename from mobile/android/base/resources/color/awesome_bar_title_hint.xml.in
rename to mobile/android/base/resources/color/awesome_bar_title_hint.xml
--- a/mobile/android/base/resources/color/awesome_bar_title_hint.xml.in
+++ b/mobile/android/base/resources/color/awesome_bar_title_hint.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+          xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <!-- private browsing mode -->
     <item gecko:state_private="true" android:color="#FF7F828A" />
 
     <!-- normal mode -->
     <item android:color="#FF666666"/>
 
 </selector>
rename from mobile/android/base/resources/drawable/abouthome_logo.xml.in
rename to mobile/android/base/resources/drawable/abouthome_logo.xml
--- a/mobile/android/base/resources/drawable/abouthome_logo.xml.in
+++ b/mobile/android/base/resources/drawable/abouthome_logo.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+          xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <!-- dark theme -->
     <item gecko:state_dark="true" android:drawable="@drawable/abouthome_logo_light" />
 
     <!-- light theme -->
     <item gecko:state_light="true" android:drawable="@drawable/abouthome_logo_dark" />
 
     <!-- default -->
rename from mobile/android/base/resources/drawable/address_bar_bg.xml.in
rename to mobile/android/base/resources/drawable/address_bar_bg.xml
--- a/mobile/android/base/resources/drawable/address_bar_bg.xml.in
+++ b/mobile/android/base/resources/drawable/address_bar_bg.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+          xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <!-- private browsing mode -->
     <item gecko:state_private="true" android:drawable="@color/background_private"/>
 
     <!-- normal mode -->
     <item android:drawable="@color/background_normal"/>
 
 </selector>
rename from mobile/android/base/resources/drawable/address_bar_nav_button.xml.in
rename to mobile/android/base/resources/drawable/address_bar_nav_button.xml
--- a/mobile/android/base/resources/drawable/address_bar_nav_button.xml.in
+++ b/mobile/android/base/resources/drawable/address_bar_nav_button.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+          xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <!-- pressed state -->
     <item android:state_pressed="true" android:drawable="@color/highlight"/>
 
     <!-- private browsing mode -->
     <item gecko:state_private="true" android:drawable="@color/background_private"/>
 
     <!-- normal mode -->
rename from mobile/android/base/resources/drawable/address_bar_url.xml.in
rename to mobile/android/base/resources/drawable/address_bar_url.xml
--- a/mobile/android/base/resources/drawable/address_bar_url.xml.in
+++ b/mobile/android/base/resources/drawable/address_bar_url.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+          xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <!-- private browsing mode -->
     <item gecko:state_private="true"
           android:state_focused="true"
           android:drawable="@drawable/address_bar_url_pressed_pb"/>
 
     <item gecko:state_private="true"
           android:state_pressed="true"
rename from mobile/android/base/resources/drawable/menu_item_state.xml.in
rename to mobile/android/base/resources/drawable/menu_item_state.xml
--- a/mobile/android/base/resources/drawable/menu_item_state.xml.in
+++ b/mobile/android/base/resources/drawable/menu_item_state.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+          xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <item gecko:state_more="true"
           android:drawable="@drawable/menu_item_more"/>
 
     <item gecko:state_more="false"
           android:state_checkable="true"
           android:state_checked="true"
           android:drawable="@drawable/menu_item_check"/>
rename from mobile/android/base/resources/drawable/menu_level.xml.in
rename to mobile/android/base/resources/drawable/menu_level.xml
--- a/mobile/android/base/resources/drawable/menu_level.xml.in
+++ b/mobile/android/base/resources/drawable/menu_level.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <level-list xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+            xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <item android:maxLevel="1">
 
         <selector>
 
             <item gecko:state_private="true" android:drawable="@drawable/menu_pb"/>
             <item android:drawable="@drawable/menu"/>
 
rename from mobile/android/base/resources/layout-land-v14/browser_toolbar.xml.in
rename to mobile/android/base/resources/layout-land-v14/browser_toolbar.xml
--- a/mobile/android/base/resources/layout-land-v14/browser_toolbar.xml.in
+++ b/mobile/android/base/resources/layout-land-v14/browser_toolbar.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <org.mozilla.gecko.BrowserToolbarLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
+              xmlns:gecko="http://schemas.android.com/apk/res-auto"
               android:id="@+id/browser_toolbar"
               style="@style/BrowserToolbar">
 
     <RelativeLayout android:id="@+id/address_bar"
                     style="@style/AddressBar">
 
         <ImageButton android:id="@+id/back"
                      android:contentDescription="@string/back"
rename from mobile/android/base/resources/layout-land-v14/browser_toolbar_menu.xml.in
rename to mobile/android/base/resources/layout-land-v14/browser_toolbar_menu.xml
--- a/mobile/android/base/resources/layout-land-v14/browser_toolbar_menu.xml.in
+++ b/mobile/android/base/resources/layout-land-v14/browser_toolbar_menu.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <org.mozilla.gecko.BrowserToolbarLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
+              xmlns:gecko="http://schemas.android.com/apk/res-auto"
               android:id="@+id/browser_toolbar"
               style="@style/BrowserToolbar">
 
     <RelativeLayout android:id="@+id/address_bar"
                     style="@style/AddressBar">
 
         <ImageButton android:id="@+id/back"
                      android:contentDescription="@string/back"
rename from mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml.in
rename to mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
--- a/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml.in
+++ b/mobile/android/base/resources/layout-large-land-v11/tabs_panel.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+       xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <RelativeLayout android:id="@+id/tabs_panel_header"
                     android:layout_width="fill_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <view class="org.mozilla.gecko.TabsPanel$TabsPanelToolbar"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
rename from mobile/android/base/resources/layout-large-v11/awesomebar_search.xml.in
rename to mobile/android/base/resources/layout-large-v11/awesomebar_search.xml
--- a/mobile/android/base/resources/layout-large-v11/awesomebar_search.xml.in
+++ b/mobile/android/base/resources/layout-large-v11/awesomebar_search.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
+                xmlns:gecko="http://schemas.android.com/apk/res-auto"
                 style="@style/AwesomeBar">
 
     <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/address_bar_bg"
                                                 android:layout_width="fill_parent"
                                                 android:layout_height="fill_parent"
                                                 android:layout_alignParentTop="true"
                                                 android:layout_alignParentRight="true"
                                                 gecko:curveTowards="none"
rename from mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml.in
rename to mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml
--- a/mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml.in
+++ b/mobile/android/base/resources/layout-large-v11/browser_toolbar_menu.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <org.mozilla.gecko.BrowserToolbarLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
+              xmlns:gecko="http://schemas.android.com/apk/res-auto"
               android:id="@+id/browser_toolbar"
               style="@style/BrowserToolbar">
 
     <RelativeLayout android:id="@+id/address_bar"
                     style="@style/AddressBar">
 
         <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/address_bar_bg"
                                                     android:layout_width="fill_parent"
rename from mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in
rename to mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
--- a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in
+++ b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+       xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout android:orientation="horizontal"
                   android:layout_width="fill_parent"
                   android:layout_height="fill_parent">
 
         <LinearLayout android:orientation="vertical"
                       android:layout_width="0dp"
                       android:layout_height="fill_parent"
rename from mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml.in
rename to mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml
--- a/mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml.in
+++ b/mobile/android/base/resources/layout-xlarge-v11/awesomebar_search.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
+                xmlns:gecko="http://schemas.android.com/apk/res-auto"
                 style="@style/AwesomeBar">
 
     <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/address_bar_bg"
                                                 android:layout_width="fill_parent"
                                                 android:layout_height="fill_parent"
                                                 android:layout_alignParentTop="true"
                                                 android:layout_alignParentRight="true"
                                                 gecko:curveTowards="none"
rename from mobile/android/base/resources/layout/abouthome_content.xml.in
rename to mobile/android/base/resources/layout/abouthome_content.xml
--- a/mobile/android/base/resources/layout/abouthome_content.xml.in
+++ b/mobile/android/base/resources/layout/abouthome_content.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+       xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <RelativeLayout android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:paddingLeft="@dimen/abouthome_gutter_large"
                     android:paddingRight="@dimen/abouthome_gutter_large">
 
         <Gecko.ImageView android:id="@+id/abouthome_logo"
                          android:src="@drawable/abouthome_logo"
rename from mobile/android/base/resources/layout/awesomebar_search.xml.in
rename to mobile/android/base/resources/layout/awesomebar_search.xml
--- a/mobile/android/base/resources/layout/awesomebar_search.xml.in
+++ b/mobile/android/base/resources/layout/awesomebar_search.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
+                xmlns:gecko="http://schemas.android.com/apk/res-auto"
                 style="@style/AwesomeBar">
 
     <org.mozilla.gecko.BrowserToolbarBackground android:id="@+id/address_bar_bg"
                                                 android:layout_width="fill_parent"
                                                 android:layout_height="fill_parent"
                                                 android:layout_alignParentTop="true"
                                                 android:layout_alignParentRight="true"
                                                 gecko:curveTowards="none"
rename from mobile/android/base/resources/layout/awesomebar_suggestion_row.xml.in
rename to mobile/android/base/resources/layout/awesomebar_suggestion_row.xml
--- a/mobile/android/base/resources/layout/awesomebar_suggestion_row.xml.in
+++ b/mobile/android/base/resources/layout/awesomebar_suggestion_row.xml
@@ -1,16 +1,14 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <org.mozilla.gecko.AnimatedHeightLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:minHeight="@dimen/awesomebar_row_height"
                 android:padding="7dip">
 
     <ImageView android:id="@+id/suggestion_icon"
                android:layout_width="@dimen/awesomebar_row_favicon_bg"
                android:layout_height="@dimen/awesomebar_row_favicon_bg"
rename from mobile/android/base/resources/layout/awesomebar_tab_indicator.xml.in
rename to mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
--- a/mobile/android/base/resources/layout/awesomebar_tab_indicator.xml.in
+++ b/mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <Gecko.TextView xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
+                xmlns:gecko="http://schemas.android.com/apk/res-auto"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
                 android:layout_weight="1.0"
                 android:gravity="center"
                 android:background="@drawable/awesomebar_tab_indicator"
                 android:padding="10dp"
                 android:singleLine="true"
                 android:ellipsize="marquee"
rename from mobile/android/base/resources/layout/browser_toolbar.xml.in
rename to mobile/android/base/resources/layout/browser_toolbar.xml
--- a/mobile/android/base/resources/layout/browser_toolbar.xml.in
+++ b/mobile/android/base/resources/layout/browser_toolbar.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <org.mozilla.gecko.BrowserToolbarLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
+              xmlns:gecko="http://schemas.android.com/apk/res-auto"
               android:id="@+id/browser_toolbar"
               style="@style/BrowserToolbar">
 
     <RelativeLayout android:id="@+id/address_bar"
                     style="@style/AddressBar">
 
         <ImageButton android:id="@+id/back"
                      android:contentDescription="@string/back"
rename from mobile/android/base/resources/layout/browser_toolbar_menu.xml.in
rename to mobile/android/base/resources/layout/browser_toolbar_menu.xml
--- a/mobile/android/base/resources/layout/browser_toolbar_menu.xml.in
+++ b/mobile/android/base/resources/layout/browser_toolbar_menu.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <org.mozilla.gecko.BrowserToolbarLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
+              xmlns:gecko="http://schemas.android.com/apk/res-auto"
               android:id="@+id/browser_toolbar"
               style="@style/BrowserToolbar">
 
     <RelativeLayout android:id="@+id/address_bar"
                     style="@style/AddressBar">
 
         <ImageButton android:id="@+id/back"
                      android:contentDescription="@string/back"
rename from mobile/android/base/resources/layout/gecko_app.xml.in
rename to mobile/android/base/resources/layout/gecko_app.xml
--- a/mobile/android/base/resources/layout/gecko_app.xml.in
+++ b/mobile/android/base/resources/layout/gecko_app.xml
@@ -1,9 +1,8 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent">
rename from mobile/android/base/resources/layout/tabs_panel.xml.in
rename to mobile/android/base/resources/layout/tabs_panel.xml
--- a/mobile/android/base/resources/layout/tabs_panel.xml.in
+++ b/mobile/android/base/resources/layout/tabs_panel.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+       xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
     <RelativeLayout android:id="@+id/tabs_panel_header"
                     android:layout_width="fill_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <view class="org.mozilla.gecko.TabsPanel$TabsPanelToolbar"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
rename from mobile/android/base/resources/layout/text_selection_handles.xml.in
rename to mobile/android/base/resources/layout/text_selection_handles.xml
--- a/mobile/android/base/resources/layout/text_selection_handles.xml.in
+++ b/mobile/android/base/resources/layout/text_selection_handles.xml
@@ -1,16 +1,15 @@
-#filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
+       xmlns:gecko="http://schemas.android.com/apk/res-auto">
 
    <org.mozilla.gecko.TextSelectionHandle android:id="@+id/start_handle"
                                           android:layout_width="@dimen/text_selection_handle_width"
                                           android:layout_height="@dimen/text_selection_handle_height"
                                           android:src="@drawable/handle_start_level"
                                           android:visibility="gone"
                                           gecko:handleType="start"/>
 
rename from mobile/android/base/resources/menu-large-v11/browser_app_menu.xml.in
rename to mobile/android/base/resources/menu-large-v11/browser_app_menu.xml
rename from mobile/android/base/resources/menu-v11/browser_app_menu.xml.in
rename to mobile/android/base/resources/menu-v11/browser_app_menu.xml
rename from mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml.in
rename to mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml
rename from mobile/android/base/resources/menu/browser_app_menu.xml.in
rename to mobile/android/base/resources/menu/browser_app_menu.xml
--- a/mobile/android/base/resources/xml/preferences.xml.in
+++ b/mobile/android/base/resources/xml/preferences.xml.in
@@ -1,17 +1,17 @@
 #filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
+                  xmlns:gecko="http://schemas.android.com/apk/res-auto"
                   android:enabled="false">
 
     <PreferenceCategory android:title="@string/pref_category_general">
         <org.mozilla.gecko.LinkPreference android:title="@string/pref_about_firefox"
                                           url="about:" />
 
         <org.mozilla.gecko.SyncPreference android:title="@string/pref_sync"
                                           android:persistent="false" />