Bug 1191872 - Move annotations to org.mozilla.gecko.annotation package, r=jchen

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 {

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 {

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 {

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 {

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 &

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";

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 {

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 {
 

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 {

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;

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;

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;

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

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;

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;

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;
 

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;

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;
 

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;

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";

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;

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;

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;

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;
 

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;

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;

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.

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;

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;

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;

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;
 

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;

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 {

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;
 

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;

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

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 {

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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 += [

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;
 

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;

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;

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;

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.

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";

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 {

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;

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;
 

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 {

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

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;
 

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;
 

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 <methods>;
+    @org.mozilla.gecko.annotation.JNITarget <methods>;
 }
 -keepclasseswithmembers class * {
-    @org.mozilla.gecko.mozglue.JNITarget <fields>;
+    @org.mozilla.gecko.annotation.JNITarget <fields>;
 }
 
 # 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 <methods>;
+    @org.mozilla.gecko.annotation.RobocopTarget <methods>;
 }
 -keepclasseswithmembers class * {
-    @org.mozilla.gecko.mozglue.RobocopTarget <fields>;
+    @org.mozilla.gecko.annotation.RobocopTarget <fields>;
 }
 
 # 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 <methods>;
+    @org.mozilla.gecko.annotation.WebRTCJNITarget <methods>;
 }
 -keepclasseswithmembers class * {
-    @org.mozilla.gecko.mozglue.WebRTCJNITarget <fields>;
+    @org.mozilla.gecko.annotation.WebRTCJNITarget <fields>;
 }
 
 # 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 {
     *;
 }