From 286196be2d3157784e80a8eff8a05c98e7bedbf2 Mon Sep 17 00:00:00 2001 From: Mark Capella Date: Mon, 10 Aug 2015 19:19:51 -0400 Subject: [PATCH] Bug 1191872 - Move annotations to org.mozilla.gecko.annotation package, r=jchen --- .../voiceengine/AudioManagerAndroid.java | 2 +- .../webrtc/voiceengine/WebRtcAudioRecord.java | 2 +- .../webrtc/voiceengine/WebRtcAudioTrack.java | 2 +- .../videoengine/CaptureCapabilityAndroid.java | 2 +- .../videoengine/VideoCaptureAndroid.java | 2 +- .../VideoCaptureDeviceInfoAndroid.java | 2 +- .../webrtc/videoengine/ViEAndroidGLES20.java | 2 +- .../videoengine/ViESurfaceRenderer.java | 2 +- mobile/android/base/AboutPages.java | 2 +- mobile/android/base/BrowserApp.java | 2 +- mobile/android/base/EventDispatcher.java | 2 +- mobile/android/base/GeckoAppShell.java | 4 +- mobile/android/base/GeckoEvent.java | 4 +- mobile/android/base/GeckoNetworkManager.java | 2 +- mobile/android/base/GeckoProfile.java | 2 +- .../android/base/GeckoProfileDirectories.java | 2 +- mobile/android/base/GeckoSharedPrefs.java | 2 +- mobile/android/base/GeckoThread.java | 2 +- mobile/android/base/MediaPlayerManager.java | 2 +- mobile/android/base/NSSBridge.java | 2 +- mobile/android/base/ReadingListHelper.java | 2 +- mobile/android/base/RestrictedProfiles.java | 2 +- mobile/android/base/SuggestClient.java | 2 +- mobile/android/base/Tab.java | 2 +- mobile/android/base/Tabs.java | 4 +- mobile/android/base/Telemetry.java | 2 +- mobile/android/base/TelemetryContract.java | 2 +- .../{mozglue => annotation}/JNITarget.java | 2 +- .../RobocopTarget.java | 2 +- .../WebRTCJNITarget.java | 2 +- .../background/nativecode/NativeCrypto.java | 2 +- .../AbstractPerProfileDatabaseProvider.java | 2 +- mobile/android/base/db/BrowserContract.java | 2 +- mobile/android/base/db/DBUtils.java | 2 +- mobile/android/base/db/LocalBrowserDB.java | 2 +- .../base/db/LocalReadingListAccessor.java | 2 +- .../android/base/db/ReadingListAccessor.java | 2 +- mobile/android/base/db/StubBrowserDB.java | 4 +- mobile/android/base/db/SuggestedSites.java | 2 +- .../base/distribution/Distribution.java | 2 +- .../base/distribution/ReferrerDescriptor.java | 2 +- .../base/distribution/ReferrerReceiver.java | 2 +- mobile/android/base/gfx/GeckoLayerClient.java | 2 +- mobile/android/base/gfx/LayerRenderer.java | 2 +- mobile/android/base/gfx/LayerView.java | 2 +- mobile/android/base/gfx/PanningPerfAPI.java | 2 +- mobile/android/base/home/BrowserSearch.java | 2 +- mobile/android/base/home/HomeConfig.java | 2 +- mobile/android/base/home/SearchEngineBar.java | 2 +- mobile/android/base/moz.build | 6 +-- mobile/android/base/mozglue/GeckoLoader.java | 2 + mobile/android/base/mozglue/NativeZip.java | 2 +- mobile/android/base/sqlite/SQLiteBridge.java | 2 +- .../base/updater/UpdateServiceHelper.java | 2 +- mobile/android/base/util/EventCallback.java | 2 +- mobile/android/base/util/FileUtils.java | 2 +- .../android/base/util/GeckoEventListener.java | 2 +- mobile/android/base/util/GeckoJarReader.java | 2 +- mobile/android/base/util/GeckoRequest.java | 2 +- .../base/util/NativeEventListener.java | 2 +- .../android/base/util/NativeJSContainer.java | 1 - mobile/android/base/util/NativeJSObject.java | 2 +- mobile/android/base/util/ThreadUtils.java | 2 +- mobile/android/config/proguard/proguard.cfg | 38 +++++++++---------- 64 files changed, 88 insertions(+), 87 deletions(-) rename mobile/android/base/{mozglue => annotation}/JNITarget.java (93%) rename mobile/android/base/{mozglue => annotation}/RobocopTarget.java (93%) rename mobile/android/base/{mozglue => annotation}/WebRTCJNITarget.java (93%) diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/AudioManagerAndroid.java b/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/AudioManagerAndroid.java index 5067b7c87b9..c80207e28af 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/AudioManagerAndroid.java +++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/AudioManagerAndroid.java @@ -21,7 +21,7 @@ import android.util.Log; import java.lang.reflect.Field; import java.lang.reflect.Method; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.gecko.annotation.WebRTCJNITarget; @WebRTCJNITarget class AudioManagerAndroid { diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java b/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java index ef8b976f119..7a9267e21e0 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java +++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java @@ -20,7 +20,7 @@ import android.media.AudioRecord; import android.media.MediaRecorder.AudioSource; import android.util.Log; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.gecko.annotation.WebRTCJNITarget; @WebRTCJNITarget class WebRtcAudioRecord { diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java b/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java index f525d97672e..f131edc7f56 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java +++ b/media/webrtc/trunk/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java @@ -20,7 +20,7 @@ import android.media.AudioRecord; import android.media.AudioTrack; import android.util.Log; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.gecko.annotation.WebRTCJNITarget; @WebRTCJNITarget class WebRtcAudioTrack { diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java index 6cefced35a6..811be9d11a7 100644 --- a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java +++ b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/CaptureCapabilityAndroid.java @@ -10,7 +10,7 @@ package org.webrtc.videoengine; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.gecko.annotation.WebRTCJNITarget; @WebRTCJNITarget public class CaptureCapabilityAndroid { diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java index c7729c4794a..49290f5d7f2 100644 --- a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java +++ b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureAndroid.java @@ -32,9 +32,9 @@ import android.view.SurfaceHolder.Callback; import android.view.SurfaceHolder; import android.view.WindowManager; +import org.mozilla.gecko.annotation.WebRTCJNITarget; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoAppShell.AppStateListener; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; // Wrapper for android Camera, with support for direct local preview rendering. // Threading notes: this class is called from ViE C++ code, and from Camera & diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java index 082f0fdde81..fed4e072c29 100644 --- a/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java +++ b/media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java @@ -19,7 +19,7 @@ import android.hardware.Camera.Size; import android.hardware.Camera; import android.util.Log; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.gecko.annotation.WebRTCJNITarget; public class VideoCaptureDeviceInfoAndroid { private final static String TAG = "WEBRTC-JC"; diff --git a/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java b/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java index 788c71016db..b1097504a28 100644 --- a/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java +++ b/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java @@ -25,7 +25,7 @@ import android.graphics.PixelFormat; import android.opengl.GLSurfaceView; import android.util.Log; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.gecko.annotation.WebRTCJNITarget; public class ViEAndroidGLES20 extends GLSurfaceView implements GLSurfaceView.Renderer { diff --git a/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java b/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java index 11fcd3da5c4..9f46255bfb1 100644 --- a/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java +++ b/media/webrtc/trunk/webrtc/modules/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java @@ -26,7 +26,7 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.SurfaceHolder.Callback; -import org.mozilla.gecko.mozglue.WebRTCJNITarget; +import org.mozilla.gecko.annotation.WebRTCJNITarget; public class ViESurfaceRenderer implements Callback { diff --git a/mobile/android/base/AboutPages.java b/mobile/android/base/AboutPages.java index ada8e644abe..7f5574d66bc 100644 --- a/mobile/android/base/AboutPages.java +++ b/mobile/android/base/AboutPages.java @@ -5,9 +5,9 @@ package org.mozilla.gecko; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.home.HomeConfig; import org.mozilla.gecko.home.HomeConfig.PanelType; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.util.StringUtils; public class AboutPages { diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java index a4ffe14ed57..18746e186a6 100644 --- a/mobile/android/base/BrowserApp.java +++ b/mobile/android/base/BrowserApp.java @@ -5,6 +5,7 @@ package org.mozilla.gecko; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.AppConstants.Versions; import org.mozilla.gecko.DynamicToolbar.PinReason; import org.mozilla.gecko.DynamicToolbar.VisibilityTransition; @@ -49,7 +50,6 @@ import org.mozilla.gecko.menu.GeckoMenu; import org.mozilla.gecko.menu.GeckoMenuItem; import org.mozilla.gecko.mozglue.ContextUtils; import org.mozilla.gecko.mozglue.ContextUtils.SafeIntent; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.overlays.ui.ShareDialog; import org.mozilla.gecko.preferences.ClearOnShutdownPref; import org.mozilla.gecko.preferences.GeckoPreferences; diff --git a/mobile/android/base/EventDispatcher.java b/mobile/android/base/EventDispatcher.java index 6ec8cbb5f80..30008230fbb 100644 --- a/mobile/android/base/EventDispatcher.java +++ b/mobile/android/base/EventDispatcher.java @@ -4,9 +4,9 @@ package org.mozilla.gecko; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoEvent; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.util.EventCallback; import org.mozilla.gecko.util.GeckoEventListener; import org.mozilla.gecko.util.NativeEventListener; diff --git a/mobile/android/base/GeckoAppShell.java b/mobile/android/base/GeckoAppShell.java index 70ef3ef16fa..d1a615bb47f 100644 --- a/mobile/android/base/GeckoAppShell.java +++ b/mobile/android/base/GeckoAppShell.java @@ -30,6 +30,8 @@ import java.util.StringTokenizer; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; +import org.mozilla.gecko.annotation.JNITarget; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.annotation.WrapForJNI; import org.mozilla.gecko.AppConstants.Versions; import org.mozilla.gecko.db.BrowserDB; @@ -40,8 +42,6 @@ import org.mozilla.gecko.gfx.LayerView; import org.mozilla.gecko.gfx.PanZoomController; import org.mozilla.gecko.mozglue.ContextUtils; import org.mozilla.gecko.mozglue.GeckoLoader; -import org.mozilla.gecko.mozglue.JNITarget; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.overlays.ui.ShareDialog; import org.mozilla.gecko.prompts.PromptService; import org.mozilla.gecko.util.EventCallback; diff --git a/mobile/android/base/GeckoEvent.java b/mobile/android/base/GeckoEvent.java index c970aa7a39e..0b3e1596439 100644 --- a/mobile/android/base/GeckoEvent.java +++ b/mobile/android/base/GeckoEvent.java @@ -25,8 +25,8 @@ import android.util.Log; import android.util.SparseArray; import android.view.KeyEvent; import android.view.MotionEvent; -import org.mozilla.gecko.mozglue.JNITarget; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.JNITarget; +import org.mozilla.gecko.annotation.RobocopTarget; /** * We're not allowed to hold on to most events given to us diff --git a/mobile/android/base/GeckoNetworkManager.java b/mobile/android/base/GeckoNetworkManager.java index 0d349376fd2..aaa2392fcc9 100644 --- a/mobile/android/base/GeckoNetworkManager.java +++ b/mobile/android/base/GeckoNetworkManager.java @@ -5,7 +5,7 @@ package org.mozilla.gecko; -import org.mozilla.gecko.mozglue.JNITarget; +import org.mozilla.gecko.annotation.JNITarget; import org.mozilla.gecko.util.NativeEventListener; import org.mozilla.gecko.util.NativeJSObject; import org.mozilla.gecko.util.EventCallback; diff --git a/mobile/android/base/GeckoProfile.java b/mobile/android/base/GeckoProfile.java index ae7d493cf4e..134b5cbaa63 100644 --- a/mobile/android/base/GeckoProfile.java +++ b/mobile/android/base/GeckoProfile.java @@ -21,6 +21,7 @@ import java.util.regex.Pattern; import org.json.JSONException; import org.json.JSONArray; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.GeckoProfileDirectories.NoMozillaDirectoryException; import org.mozilla.gecko.GeckoProfileDirectories.NoSuchProfileException; import org.mozilla.gecko.db.BrowserDB; @@ -28,7 +29,6 @@ import org.mozilla.gecko.db.LocalBrowserDB; import org.mozilla.gecko.db.StubBrowserDB; import org.mozilla.gecko.distribution.Distribution; import org.mozilla.gecko.mozglue.ContextUtils; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.firstrun.FirstrunPane; import org.mozilla.gecko.RestrictedProfiles; import org.mozilla.gecko.util.INIParser; diff --git a/mobile/android/base/GeckoProfileDirectories.java b/mobile/android/base/GeckoProfileDirectories.java index d655928dacd..f584c4ccfa0 100644 --- a/mobile/android/base/GeckoProfileDirectories.java +++ b/mobile/android/base/GeckoProfileDirectories.java @@ -9,7 +9,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.util.INIParser; import org.mozilla.gecko.util.INISection; diff --git a/mobile/android/base/GeckoSharedPrefs.java b/mobile/android/base/GeckoSharedPrefs.java index 7a64dd31e93..b4468bcacd2 100644 --- a/mobile/android/base/GeckoSharedPrefs.java +++ b/mobile/android/base/GeckoSharedPrefs.java @@ -9,7 +9,7 @@ import java.util.EnumSet; import java.util.List; import java.util.Map; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; import android.content.Context; import android.content.SharedPreferences; diff --git a/mobile/android/base/GeckoThread.java b/mobile/android/base/GeckoThread.java index 0b5b2f508b0..213cc6db21b 100644 --- a/mobile/android/base/GeckoThread.java +++ b/mobile/android/base/GeckoThread.java @@ -5,8 +5,8 @@ package org.mozilla.gecko; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.mozglue.GeckoLoader; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.util.GeckoEventListener; import org.mozilla.gecko.util.ThreadUtils; diff --git a/mobile/android/base/MediaPlayerManager.java b/mobile/android/base/MediaPlayerManager.java index 80ed0870566..da0b8887530 100644 --- a/mobile/android/base/MediaPlayerManager.java +++ b/mobile/android/base/MediaPlayerManager.java @@ -16,8 +16,8 @@ import android.util.Log; import com.google.android.gms.cast.CastMediaControlIntent; import org.json.JSONObject; +import org.mozilla.gecko.annotation.JNITarget; import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.mozglue.JNITarget; import org.mozilla.gecko.util.EventCallback; import org.mozilla.gecko.util.NativeEventListener; import org.mozilla.gecko.util.NativeJSObject; diff --git a/mobile/android/base/NSSBridge.java b/mobile/android/base/NSSBridge.java index 83dc32d9f2f..8d525b0ba66 100644 --- a/mobile/android/base/NSSBridge.java +++ b/mobile/android/base/NSSBridge.java @@ -7,7 +7,7 @@ package org.mozilla.gecko; import org.mozilla.gecko.mozglue.GeckoLoader; import android.content.Context; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; public class NSSBridge { private static final String LOGTAG = "NSSBridge"; diff --git a/mobile/android/base/ReadingListHelper.java b/mobile/android/base/ReadingListHelper.java index 44501a55e29..a768b252f92 100644 --- a/mobile/android/base/ReadingListHelper.java +++ b/mobile/android/base/ReadingListHelper.java @@ -6,11 +6,11 @@ package org.mozilla.gecko; import org.json.JSONException; import org.json.JSONObject; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.db.BrowserContract.ReadingListItems; import org.mozilla.gecko.db.BrowserDB; import org.mozilla.gecko.db.ReadingListAccessor; import org.mozilla.gecko.favicons.Favicons; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.util.EventCallback; import org.mozilla.gecko.util.NativeEventListener; import org.mozilla.gecko.util.NativeJSObject; diff --git a/mobile/android/base/RestrictedProfiles.java b/mobile/android/base/RestrictedProfiles.java index d52e6f05963..27ec658972f 100644 --- a/mobile/android/base/RestrictedProfiles.java +++ b/mobile/android/base/RestrictedProfiles.java @@ -5,9 +5,9 @@ package org.mozilla.gecko; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.annotation.WrapForJNI; import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.restrictions.DefaultConfiguration; import org.mozilla.gecko.restrictions.GuestProfileConfiguration; import org.mozilla.gecko.restrictions.RestrictedProfileConfiguration; diff --git a/mobile/android/base/SuggestClient.java b/mobile/android/base/SuggestClient.java index 439f63271a7..ebea3d43c98 100644 --- a/mobile/android/base/SuggestClient.java +++ b/mobile/android/base/SuggestClient.java @@ -13,7 +13,7 @@ import java.net.URLEncoder; import java.util.ArrayList; import org.json.JSONArray; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.util.HardwareUtils; import android.content.Context; diff --git a/mobile/android/base/Tab.java b/mobile/android/base/Tab.java index ce16e7690d8..051eeb92124 100644 --- a/mobile/android/base/Tab.java +++ b/mobile/android/base/Tab.java @@ -15,6 +15,7 @@ import java.util.regex.Pattern; import org.json.JSONException; import org.json.JSONObject; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.db.BrowserDB; import org.mozilla.gecko.db.URLMetadata; import org.mozilla.gecko.favicons.Favicons; @@ -23,7 +24,6 @@ import org.mozilla.gecko.favicons.OnFaviconLoadedListener; import org.mozilla.gecko.favicons.RemoteFavicon; import org.mozilla.gecko.gfx.BitmapUtils; import org.mozilla.gecko.gfx.Layer; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.toolbar.BrowserToolbar.TabEditingState; import org.mozilla.gecko.util.ThreadUtils; diff --git a/mobile/android/base/Tabs.java b/mobile/android/base/Tabs.java index f2c801cf488..22c4774d7fe 100644 --- a/mobile/android/base/Tabs.java +++ b/mobile/android/base/Tabs.java @@ -14,13 +14,13 @@ import java.util.concurrent.atomic.AtomicInteger; import org.json.JSONException; import org.json.JSONObject; +import org.mozilla.gecko.annotation.JNITarget; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.AppConstants.Versions; import org.mozilla.gecko.db.BrowserDB; import org.mozilla.gecko.favicons.Favicons; import org.mozilla.gecko.fxa.FirefoxAccounts; import org.mozilla.gecko.mozglue.ContextUtils.SafeIntent; -import org.mozilla.gecko.mozglue.JNITarget; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.sync.setup.SyncAccounts; import org.mozilla.gecko.preferences.GeckoPreferences; import org.mozilla.gecko.util.GeckoEventListener; diff --git a/mobile/android/base/Telemetry.java b/mobile/android/base/Telemetry.java index bac613bcf96..1ec3c5a5cdc 100644 --- a/mobile/android/base/Telemetry.java +++ b/mobile/android/base/Telemetry.java @@ -5,7 +5,7 @@ package org.mozilla.gecko; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.TelemetryContract.Event; import org.mozilla.gecko.TelemetryContract.Method; import org.mozilla.gecko.TelemetryContract.Reason; diff --git a/mobile/android/base/TelemetryContract.java b/mobile/android/base/TelemetryContract.java index 68d8b3d6357..97799a5bafd 100644 --- a/mobile/android/base/TelemetryContract.java +++ b/mobile/android/base/TelemetryContract.java @@ -5,7 +5,7 @@ package org.mozilla.gecko; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; /** * Holds data definitions for our UI Telemetry implementation. diff --git a/mobile/android/base/mozglue/JNITarget.java b/mobile/android/base/annotation/JNITarget.java similarity index 93% rename from mobile/android/base/mozglue/JNITarget.java rename to mobile/android/base/annotation/JNITarget.java index 2cfd8496909..d6140a1ffb6 100644 --- a/mobile/android/base/mozglue/JNITarget.java +++ b/mobile/android/base/annotation/JNITarget.java @@ -2,7 +2,7 @@ * 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/. */ -package org.mozilla.gecko.mozglue; +package org.mozilla.gecko.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/mobile/android/base/mozglue/RobocopTarget.java b/mobile/android/base/annotation/RobocopTarget.java similarity index 93% rename from mobile/android/base/mozglue/RobocopTarget.java rename to mobile/android/base/annotation/RobocopTarget.java index 94fa1b85fb0..e1513067480 100644 --- a/mobile/android/base/mozglue/RobocopTarget.java +++ b/mobile/android/base/annotation/RobocopTarget.java @@ -2,7 +2,7 @@ * 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/. */ -package org.mozilla.gecko.mozglue; +package org.mozilla.gecko.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/mobile/android/base/mozglue/WebRTCJNITarget.java b/mobile/android/base/annotation/WebRTCJNITarget.java similarity index 93% rename from mobile/android/base/mozglue/WebRTCJNITarget.java rename to mobile/android/base/annotation/WebRTCJNITarget.java index aad1cbfda29..f58dea14876 100644 --- a/mobile/android/base/mozglue/WebRTCJNITarget.java +++ b/mobile/android/base/annotation/WebRTCJNITarget.java @@ -2,7 +2,7 @@ * 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/. */ -package org.mozilla.gecko.mozglue; +package org.mozilla.gecko.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/mobile/android/base/background/nativecode/NativeCrypto.java b/mobile/android/base/background/nativecode/NativeCrypto.java index a48c4862716..d72db75cc6d 100644 --- a/mobile/android/base/background/nativecode/NativeCrypto.java +++ b/mobile/android/base/background/nativecode/NativeCrypto.java @@ -6,8 +6,8 @@ package org.mozilla.gecko.background.nativecode; import java.security.GeneralSecurityException; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.AppConstants; -import org.mozilla.gecko.mozglue.RobocopTarget; import android.util.Log; diff --git a/mobile/android/base/db/AbstractPerProfileDatabaseProvider.java b/mobile/android/base/db/AbstractPerProfileDatabaseProvider.java index 832192765fb..2e056cc1ea7 100644 --- a/mobile/android/base/db/AbstractPerProfileDatabaseProvider.java +++ b/mobile/android/base/db/AbstractPerProfileDatabaseProvider.java @@ -4,7 +4,7 @@ package org.mozilla.gecko.db; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; diff --git a/mobile/android/base/db/BrowserContract.java b/mobile/android/base/db/BrowserContract.java index c662da594bf..7cc27598412 100644 --- a/mobile/android/base/db/BrowserContract.java +++ b/mobile/android/base/db/BrowserContract.java @@ -8,7 +8,7 @@ package org.mozilla.gecko.db; import org.mozilla.gecko.AppConstants; import android.net.Uri; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; @RobocopTarget public class BrowserContract { diff --git a/mobile/android/base/db/DBUtils.java b/mobile/android/base/db/DBUtils.java index 3851eb9c9a3..608ada5a245 100644 --- a/mobile/android/base/db/DBUtils.java +++ b/mobile/android/base/db/DBUtils.java @@ -19,8 +19,8 @@ import android.database.sqlite.SQLiteOpenHelper; import android.net.Uri; import android.text.TextUtils; import android.util.Log; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.mozglue.RobocopTarget; import java.util.Map; diff --git a/mobile/android/base/db/LocalBrowserDB.java b/mobile/android/base/db/LocalBrowserDB.java index a92ee5554e4..3ee67369461 100644 --- a/mobile/android/base/db/LocalBrowserDB.java +++ b/mobile/android/base/db/LocalBrowserDB.java @@ -24,6 +24,7 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import org.mozilla.gecko.AboutPages; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.R; import org.mozilla.gecko.db.BrowserContract.Bookmarks; @@ -39,7 +40,6 @@ import org.mozilla.gecko.distribution.Distribution; import org.mozilla.gecko.favicons.decoders.FaviconDecoder; import org.mozilla.gecko.favicons.decoders.LoadFaviconResult; import org.mozilla.gecko.gfx.BitmapUtils; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.sync.Utils; import org.mozilla.gecko.util.GeckoJarReader; import org.mozilla.gecko.util.StringUtils; diff --git a/mobile/android/base/db/LocalReadingListAccessor.java b/mobile/android/base/db/LocalReadingListAccessor.java index 3bac122e1da..850e313943b 100644 --- a/mobile/android/base/db/LocalReadingListAccessor.java +++ b/mobile/android/base/db/LocalReadingListAccessor.java @@ -13,11 +13,11 @@ import android.database.Cursor; import android.net.Uri; import android.util.Log; import org.mozilla.gecko.AboutPages; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoEvent; import org.mozilla.gecko.ReaderModeUtils; import org.mozilla.gecko.db.BrowserContract.ReadingListItems; -import org.mozilla.gecko.mozglue.RobocopTarget; @RobocopTarget diff --git a/mobile/android/base/db/ReadingListAccessor.java b/mobile/android/base/db/ReadingListAccessor.java index b63687dd235..b1ff8fdc2cd 100644 --- a/mobile/android/base/db/ReadingListAccessor.java +++ b/mobile/android/base/db/ReadingListAccessor.java @@ -9,7 +9,7 @@ import android.content.ContentValues; import android.content.Context; import android.database.ContentObserver; import android.database.Cursor; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; @RobocopTarget public interface ReadingListAccessor { diff --git a/mobile/android/base/db/StubBrowserDB.java b/mobile/android/base/db/StubBrowserDB.java index f5b5f24ad37..877074cf726 100644 --- a/mobile/android/base/db/StubBrowserDB.java +++ b/mobile/android/base/db/StubBrowserDB.java @@ -13,10 +13,10 @@ import java.util.List; import java.util.Map; import org.json.JSONObject; -import org.mozilla.gecko.Tab; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.distribution.Distribution; import org.mozilla.gecko.favicons.decoders.LoadFaviconResult; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.Tab; import android.content.ContentProviderOperation; import android.content.ContentResolver; diff --git a/mobile/android/base/db/SuggestedSites.java b/mobile/android/base/db/SuggestedSites.java index 58434e747bf..3708435c121 100644 --- a/mobile/android/base/db/SuggestedSites.java +++ b/mobile/android/base/db/SuggestedSites.java @@ -34,6 +34,7 @@ import java.util.Set; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.GeckoSharedPrefs; import org.mozilla.gecko.GeckoProfile; import org.mozilla.gecko.Locales; @@ -41,7 +42,6 @@ import org.mozilla.gecko.R; import org.mozilla.gecko.distribution.Distribution; import org.mozilla.gecko.db.BrowserContract; import org.mozilla.gecko.RestrictedProfiles; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.preferences.GeckoPreferences; import org.mozilla.gecko.util.RawResource; import org.mozilla.gecko.util.ThreadUtils; diff --git a/mobile/android/base/distribution/Distribution.java b/mobile/android/base/distribution/Distribution.java index 1cb9d508711..12e11b44abb 100644 --- a/mobile/android/base/distribution/Distribution.java +++ b/mobile/android/base/distribution/Distribution.java @@ -36,12 +36,12 @@ import ch.boye.httpclientandroidlib.protocol.HTTP; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoEvent; import org.mozilla.gecko.GeckoSharedPrefs; import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.util.FileUtils; import org.mozilla.gecko.util.HardwareUtils; import org.mozilla.gecko.util.ThreadUtils; diff --git a/mobile/android/base/distribution/ReferrerDescriptor.java b/mobile/android/base/distribution/ReferrerDescriptor.java index f422810ed14..981756c8c7e 100644 --- a/mobile/android/base/distribution/ReferrerDescriptor.java +++ b/mobile/android/base/distribution/ReferrerDescriptor.java @@ -4,7 +4,7 @@ package org.mozilla.gecko.distribution; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; import android.net.Uri; diff --git a/mobile/android/base/distribution/ReferrerReceiver.java b/mobile/android/base/distribution/ReferrerReceiver.java index 1c41b7bd40a..2d75fbbf6b9 100644 --- a/mobile/android/base/distribution/ReferrerReceiver.java +++ b/mobile/android/base/distribution/ReferrerReceiver.java @@ -6,10 +6,10 @@ package org.mozilla.gecko.distribution; import org.mozilla.gecko.AdjustConstants; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoEvent; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.json.JSONException; import org.json.JSONObject; diff --git a/mobile/android/base/gfx/GeckoLayerClient.java b/mobile/android/base/gfx/GeckoLayerClient.java index 612f2785947..cfa1ff5aef4 100644 --- a/mobile/android/base/gfx/GeckoLayerClient.java +++ b/mobile/android/base/gfx/GeckoLayerClient.java @@ -5,6 +5,7 @@ package org.mozilla.gecko.gfx; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.annotation.WrapForJNI; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoEvent; @@ -12,7 +13,6 @@ import org.mozilla.gecko.gfx.LayerView.DrawListener; import org.mozilla.gecko.Tab; import org.mozilla.gecko.Tabs; import org.mozilla.gecko.ZoomConstraints; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.EventDispatcher; import org.mozilla.gecko.util.FloatUtils; import org.mozilla.gecko.AppConstants; diff --git a/mobile/android/base/gfx/LayerRenderer.java b/mobile/android/base/gfx/LayerRenderer.java index 437a2ae6389..bce023303b9 100644 --- a/mobile/android/base/gfx/LayerRenderer.java +++ b/mobile/android/base/gfx/LayerRenderer.java @@ -28,7 +28,7 @@ import android.opengl.GLES20; import android.os.SystemClock; import android.util.Log; -import org.mozilla.gecko.mozglue.JNITarget; +import org.mozilla.gecko.annotation.JNITarget; import org.mozilla.gecko.util.ThreadUtils; import java.nio.ByteBuffer; diff --git a/mobile/android/base/gfx/LayerView.java b/mobile/android/base/gfx/LayerView.java index 8fa2820d56a..56faaf49e8f 100644 --- a/mobile/android/base/gfx/LayerView.java +++ b/mobile/android/base/gfx/LayerView.java @@ -10,6 +10,7 @@ import java.nio.IntBuffer; import java.util.ArrayList; import org.mozilla.gecko.AndroidGamepadManager; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.annotation.WrapForJNI; import org.mozilla.gecko.AppConstants.Versions; import org.mozilla.gecko.EventDispatcher; @@ -20,7 +21,6 @@ import org.mozilla.gecko.PrefsHelper; import org.mozilla.gecko.Tab; import org.mozilla.gecko.Tabs; import org.mozilla.gecko.ZoomConstraints; -import org.mozilla.gecko.mozglue.RobocopTarget; import android.content.Context; import android.graphics.Bitmap; diff --git a/mobile/android/base/gfx/PanningPerfAPI.java b/mobile/android/base/gfx/PanningPerfAPI.java index c4b9e4e5505..4507e30dbf2 100644 --- a/mobile/android/base/gfx/PanningPerfAPI.java +++ b/mobile/android/base/gfx/PanningPerfAPI.java @@ -5,7 +5,7 @@ package org.mozilla.gecko.gfx; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; import android.os.SystemClock; import android.util.Log; diff --git a/mobile/android/base/home/BrowserSearch.java b/mobile/android/base/home/BrowserSearch.java index 8c46a752196..7b898053b86 100644 --- a/mobile/android/base/home/BrowserSearch.java +++ b/mobile/android/base/home/BrowserSearch.java @@ -14,6 +14,7 @@ import java.util.Locale; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.EventDispatcher; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoEvent; @@ -28,7 +29,6 @@ import org.mozilla.gecko.db.BrowserContract.History; import org.mozilla.gecko.db.BrowserContract.URLColumns; import org.mozilla.gecko.home.HomePager.OnUrlOpenListener; import org.mozilla.gecko.home.SearchLoader.SearchCursorLoader; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.toolbar.AutocompleteHandler; import org.mozilla.gecko.util.GeckoEventListener; import org.mozilla.gecko.util.StringUtils; diff --git a/mobile/android/base/home/HomeConfig.java b/mobile/android/base/home/HomeConfig.java index 6bab4c2eab4..4676548e17c 100644 --- a/mobile/android/base/home/HomeConfig.java +++ b/mobile/android/base/home/HomeConfig.java @@ -17,10 +17,10 @@ import java.util.Map; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoEvent; import org.mozilla.gecko.R; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.util.ThreadUtils; import android.content.Context; diff --git a/mobile/android/base/home/SearchEngineBar.java b/mobile/android/base/home/SearchEngineBar.java index 223c7166d91..11f9a910901 100644 --- a/mobile/android/base/home/SearchEngineBar.java +++ b/mobile/android/base/home/SearchEngineBar.java @@ -15,8 +15,8 @@ import android.util.DisplayMetrics; import android.util.TypedValue; import android.view.View; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.R; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.widget.RecyclerViewClickSupport; import java.util.List; diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build index ceaccb87044..abc823ca454 100644 --- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -14,6 +14,9 @@ thirdparty_source_dir = TOPSRCDIR + '/mobile/android/thirdparty/' constants_jar = add_java_jar('constants') constants_jar.sources = [ 'adjust/AdjustHelperInterface.java', + 'annotation/JNITarget.java', + 'annotation/RobocopTarget.java', + 'annotation/WebRTCJNITarget.java', 'annotation/WrapForJNI.java', 'SysInfo.java', ] @@ -56,11 +59,8 @@ mgjar.sources += [ 'mozglue/DirectBufferAllocator.java', 'mozglue/GeckoLoader.java', 'mozglue/JNIObject.java', - 'mozglue/JNITarget.java', 'mozglue/NativeReference.java', 'mozglue/NativeZip.java', - 'mozglue/RobocopTarget.java', - 'mozglue/WebRTCJNITarget.java', ] mgjar.generated_sources = [] # Keep it this way. mgjar.extra_jars += [ diff --git a/mobile/android/base/mozglue/GeckoLoader.java b/mobile/android/base/mozglue/GeckoLoader.java index 646b33a4956..5a28b0e451b 100644 --- a/mobile/android/base/mozglue/GeckoLoader.java +++ b/mobile/android/base/mozglue/GeckoLoader.java @@ -21,6 +21,8 @@ import android.os.Build; import android.os.Environment; import android.util.Log; +import org.mozilla.gecko.annotation.JNITarget; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.mozglue.ContextUtils.SafeIntent; diff --git a/mobile/android/base/mozglue/NativeZip.java b/mobile/android/base/mozglue/NativeZip.java index 8a35d155fb9..be2f76390fa 100644 --- a/mobile/android/base/mozglue/NativeZip.java +++ b/mobile/android/base/mozglue/NativeZip.java @@ -5,7 +5,7 @@ package org.mozilla.gecko.mozglue; -import org.mozilla.gecko.mozglue.JNITarget; +import org.mozilla.gecko.annotation.JNITarget; import java.io.InputStream; import java.nio.ByteBuffer; diff --git a/mobile/android/base/sqlite/SQLiteBridge.java b/mobile/android/base/sqlite/SQLiteBridge.java index 072e63bf815..9ad88dca02c 100644 --- a/mobile/android/base/sqlite/SQLiteBridge.java +++ b/mobile/android/base/sqlite/SQLiteBridge.java @@ -11,7 +11,7 @@ import android.database.sqlite.SQLiteException; import android.text.TextUtils; import android.util.Log; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; import java.util.ArrayList; import java.util.Arrays; diff --git a/mobile/android/base/updater/UpdateServiceHelper.java b/mobile/android/base/updater/UpdateServiceHelper.java index 9a8f428a2d1..f464146d3f7 100644 --- a/mobile/android/base/updater/UpdateServiceHelper.java +++ b/mobile/android/base/updater/UpdateServiceHelper.java @@ -5,9 +5,9 @@ package org.mozilla.gecko.updater; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.PrefsHelper; -import org.mozilla.gecko.mozglue.RobocopTarget; import org.mozilla.gecko.util.GeckoJarReader; import android.content.Context; diff --git a/mobile/android/base/util/EventCallback.java b/mobile/android/base/util/EventCallback.java index 7bd4ad51cbf..09954266617 100644 --- a/mobile/android/base/util/EventCallback.java +++ b/mobile/android/base/util/EventCallback.java @@ -1,6 +1,6 @@ package org.mozilla.gecko.util; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; /** * Callback interface for Gecko requests. diff --git a/mobile/android/base/util/FileUtils.java b/mobile/android/base/util/FileUtils.java index 202696338d3..77d6b6651ce 100644 --- a/mobile/android/base/util/FileUtils.java +++ b/mobile/android/base/util/FileUtils.java @@ -11,7 +11,7 @@ import java.io.IOException; import java.io.FilenameFilter; import java.util.Scanner; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; public class FileUtils { private static final String LOGTAG= "GeckoFileUtils"; diff --git a/mobile/android/base/util/GeckoEventListener.java b/mobile/android/base/util/GeckoEventListener.java index bc78cb5aade..10336490b70 100644 --- a/mobile/android/base/util/GeckoEventListener.java +++ b/mobile/android/base/util/GeckoEventListener.java @@ -6,7 +6,7 @@ package org.mozilla.gecko.util; import org.json.JSONObject; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; @RobocopTarget public interface GeckoEventListener { diff --git a/mobile/android/base/util/GeckoJarReader.java b/mobile/android/base/util/GeckoJarReader.java index 722f587ea8a..501d8819af6 100644 --- a/mobile/android/base/util/GeckoJarReader.java +++ b/mobile/android/base/util/GeckoJarReader.java @@ -9,10 +9,10 @@ import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.drawable.BitmapDrawable; import android.util.Log; +import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.mozglue.GeckoLoader; import org.mozilla.gecko.mozglue.NativeZip; -import org.mozilla.gecko.mozglue.RobocopTarget; import java.io.BufferedReader; import java.io.File; diff --git a/mobile/android/base/util/GeckoRequest.java b/mobile/android/base/util/GeckoRequest.java index ac32513db2e..a57ed7f0826 100644 --- a/mobile/android/base/util/GeckoRequest.java +++ b/mobile/android/base/util/GeckoRequest.java @@ -8,7 +8,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.json.JSONException; import org.json.JSONObject; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; import android.util.Log; diff --git a/mobile/android/base/util/NativeEventListener.java b/mobile/android/base/util/NativeEventListener.java index f5e7bb2d674..2a1b6e89a8f 100644 --- a/mobile/android/base/util/NativeEventListener.java +++ b/mobile/android/base/util/NativeEventListener.java @@ -5,7 +5,7 @@ package org.mozilla.gecko.util; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; @RobocopTarget public interface NativeEventListener { diff --git a/mobile/android/base/util/NativeJSContainer.java b/mobile/android/base/util/NativeJSContainer.java index 0c939cadea3..ac092ecc83d 100644 --- a/mobile/android/base/util/NativeJSContainer.java +++ b/mobile/android/base/util/NativeJSContainer.java @@ -6,7 +6,6 @@ package org.mozilla.gecko.util; import org.mozilla.gecko.annotation.WrapForJNI; -import org.mozilla.gecko.mozglue.JNITarget; /** * NativeJSContainer is a wrapper around the SpiderMonkey JSAPI to make it possible to diff --git a/mobile/android/base/util/NativeJSObject.java b/mobile/android/base/util/NativeJSObject.java index ad5b645d648..0adce638ce1 100644 --- a/mobile/android/base/util/NativeJSObject.java +++ b/mobile/android/base/util/NativeJSObject.java @@ -5,9 +5,9 @@ package org.mozilla.gecko.util; +import org.mozilla.gecko.annotation.JNITarget; import org.mozilla.gecko.annotation.WrapForJNI; import org.mozilla.gecko.mozglue.JNIObject; -import org.mozilla.gecko.mozglue.JNITarget; import android.os.Bundle; diff --git a/mobile/android/base/util/ThreadUtils.java b/mobile/android/base/util/ThreadUtils.java index 64681f23d75..884a56dc4dc 100644 --- a/mobile/android/base/util/ThreadUtils.java +++ b/mobile/android/base/util/ThreadUtils.java @@ -5,7 +5,7 @@ package org.mozilla.gecko.util; -import org.mozilla.gecko.mozglue.RobocopTarget; +import org.mozilla.gecko.annotation.RobocopTarget; import java.util.Map; diff --git a/mobile/android/config/proguard/proguard.cfg b/mobile/android/config/proguard/proguard.cfg index 466ea1a6a16..c6b15f44712 100644 --- a/mobile/android/config/proguard/proguard.cfg +++ b/mobile/android/config/proguard/proguard.cfg @@ -118,19 +118,19 @@ # Keep miscellaneous targets. # Keep the annotation. --keep @interface org.mozilla.gecko.mozglue.JNITarget +-keep @interface org.mozilla.gecko.annotation.JNITarget # Keep classes tagged with the annotation. --keep @org.mozilla.gecko.mozglue.JNITarget class * +-keep @org.mozilla.gecko.annotation.JNITarget class * # Keep all members of an annotated class. --keepclassmembers @org.mozilla.gecko.mozglue.JNITarget class * { +-keepclassmembers @org.mozilla.gecko.annotation.JNITarget class * { *; } # Keep annotated members of any class. -keepclassmembers class * { - @org.mozilla.gecko.mozglue.JNITarget *; + @org.mozilla.gecko.annotation.JNITarget *; } # Keep classes which contain at least one annotated element. Split over two directives @@ -138,44 +138,44 @@ # doesn't combine well with the '*' wildcard" (And, indeed, using it causes things to # be deleted that we want to keep.) -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.JNITarget ; + @org.mozilla.gecko.annotation.JNITarget ; } -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.JNITarget ; + @org.mozilla.gecko.annotation.JNITarget ; } # Keep Robocop targets. TODO: Can omit these from release builds. Also, Bug 916507. # Same formula as above... --keep @interface org.mozilla.gecko.mozglue.RobocopTarget --keep @org.mozilla.gecko.mozglue.RobocopTarget class * +-keep @interface org.mozilla.gecko.annotation.RobocopTarget +-keep @org.mozilla.gecko.annotation.RobocopTarget class * -keepclassmembers class * { - @org.mozilla.gecko.mozglue.RobocopTarget *; + @org.mozilla.gecko.annotation.RobocopTarget *; } --keepclassmembers @org.mozilla.gecko.mozglue.RobocopTarget class * { +-keepclassmembers @org.mozilla.gecko.annotation.RobocopTarget class * { *; } -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.RobocopTarget ; + @org.mozilla.gecko.annotation.RobocopTarget ; } -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.RobocopTarget ; + @org.mozilla.gecko.annotation.RobocopTarget ; } # Keep WebRTC targets. --keep @interface org.mozilla.gecko.mozglue.WebRTCJNITarget --keep @org.mozilla.gecko.mozglue.WebRTCJNITarget class * +-keep @interface org.mozilla.gecko.annotation.WebRTCJNITarget +-keep @org.mozilla.gecko.annotation.WebRTCJNITarget class * -keepclassmembers class * { - @org.mozilla.gecko.mozglue.WebRTCJNITarget *; + @org.mozilla.gecko.annotation.WebRTCJNITarget *; } --keepclassmembers @org.mozilla.gecko.mozglue.WebRTCJNITarget class * { +-keepclassmembers @org.mozilla.gecko.annotation.WebRTCJNITarget class * { *; } -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.WebRTCJNITarget ; + @org.mozilla.gecko.annotation.WebRTCJNITarget ; } -keepclasseswithmembers class * { - @org.mozilla.gecko.mozglue.WebRTCJNITarget ; + @org.mozilla.gecko.annotation.WebRTCJNITarget ; } # Keep generator-targeted entry points. @@ -198,7 +198,7 @@ -keep class **.R$* -# Keep classes, and all their contents, compiled before mozglue.RobocopTarget. +# Keep classes, and all their contents, compiled before annotation.RobocopTarget. -keep class org.mozilla.gecko.AppConstants { *; }