Bug 850487. Fix --enable-profiling build breakage by not relying on imports inside #ifdefs. r=bnicholson
authorRobert O'Callahan <robert@ocallahan.org>
Thu, 28 Mar 2013 23:58:45 +1300
changeset 133111 4a57008543aa8cbb0b6072b0c7c166b57249c3d2
parent 133110 5a7aaa967ad3f809b015034939eab2ca9f4a0129
child 133112 2e930513d923b81fadab2a78ce566926b94bd139
push id3582
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 20:50:56 +0000
treeherdermozilla-aurora@400370bbc9fa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbnicholson
bugs850487
milestone22.0a1
Bug 850487. Fix --enable-profiling build breakage by not relying on imports inside #ifdefs. r=bnicholson
mobile/android/base/App.java.in
mobile/android/base/WebApp.java.in
--- a/mobile/android/base/App.java.in
+++ b/mobile/android/base/App.java.in
@@ -49,17 +49,18 @@ public class App extends BrowserApp {
         if ("t.co".equals(host))
             return "Redirector/@MOZ_APP_VERSION@ (Android; rv:@MOZ_APP_VERSION@)";
         return getDefaultUAString();
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
 #ifdef MOZ_PROFILING
-        if (item.getItemId() == R.id.toggle_profiling) {
-            GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("ToggleProfiling", null));
+        if (item.getItemId() == org.mozilla.gecko.R.id.toggle_profiling) {
+            org.mozilla.gecko.GeckoAppShell.sendEventToGecko(
+                org.mozilla.gecko.GeckoEvent.createBroadcastEvent("ToggleProfiling", null));
             return true;
         }
 #endif
         return super.onOptionsItemSelected(item);
     }
 }
 
--- a/mobile/android/base/WebApp.java.in
+++ b/mobile/android/base/WebApp.java.in
@@ -181,18 +181,19 @@ public class WebApp extends GeckoApp {
         }
 
         return "webapp" + action.substring(ACTION_WEBAPP_PREFIX.length());
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
 #ifdef MOZ_PROFILING
-        if (item.getItemId() == R.id.toggle_profiling) {
-            GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("ToggleProfiling", null));
+        if (item.getItemId() == org.mozilla.gecko.R.id.toggle_profiling) {
+            org.mozilla.gecko.GeckoAppShell.sendEventToGecko(
+                org.mozilla.gecko.GeckoEvent.createBroadcastEvent("ToggleProfiling", null));
             return true;
         }
 #endif
         return super.onOptionsItemSelected(item);
     }
 
 #ifdef MOZ_LINKER_EXTRACT
     @Override