Move several annotations to annotations package.
Move AccessedByNative, CalledByNativeUnchecked and UsedByReflection to
annotations package where they belond. CalledByNative and NativeCall will
be moved in a separate CL since they touch every file under the sun.
BUG=None
Review URL: https://codereview.chromium.org/1078343002
Cr-Commit-Position: refs/heads/master@{#324983}
diff --git a/base/android/java/src/org/chromium/base/AccessedByNative.java b/base/android/java/src/org/chromium/base/annotations/AccessedByNative.java
similarity index 93%
rename from base/android/java/src/org/chromium/base/AccessedByNative.java
rename to base/android/java/src/org/chromium/base/annotations/AccessedByNative.java
index 3e163fc..6df7c11 100644
--- a/base/android/java/src/org/chromium/base/AccessedByNative.java
+++ b/base/android/java/src/org/chromium/base/annotations/AccessedByNative.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.base;
+package org.chromium.base.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/base/android/java/src/org/chromium/base/CalledByNativeUnchecked.java b/base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java
similarity index 96%
rename from base/android/java/src/org/chromium/base/CalledByNativeUnchecked.java
rename to base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java
index d5e9b74..c0abcbe6 100644
--- a/base/android/java/src/org/chromium/base/CalledByNativeUnchecked.java
+++ b/base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.base;
+package org.chromium.base.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/base/android/java/src/org/chromium/base/UsedByReflection.java b/base/android/java/src/org/chromium/base/annotations/UsedByReflection.java
similarity index 95%
rename from base/android/java/src/org/chromium/base/UsedByReflection.java
rename to base/android/java/src/org/chromium/base/annotations/UsedByReflection.java
index 7d18fb0..a2af704 100644
--- a/base/android/java/src/org/chromium/base/UsedByReflection.java
+++ b/base/android/java/src/org/chromium/base/annotations/UsedByReflection.java
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.base;
+package org.chromium.base.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
diff --git a/base/android/java/src/org/chromium/base/library_loader/Linker.java b/base/android/java/src/org/chromium/base/library_loader/Linker.java
index dbeb758..7e50998 100644
--- a/base/android/java/src/org/chromium/base/library_loader/Linker.java
+++ b/base/android/java/src/org/chromium/base/library_loader/Linker.java
@@ -10,10 +10,10 @@
import android.os.Parcelable;
import android.util.Log;
-import org.chromium.base.AccessedByNative;
import org.chromium.base.CalledByNative;
import org.chromium.base.SysUtils;
import org.chromium.base.ThreadUtils;
+import org.chromium.base.annotations.AccessedByNative;
import java.io.FileNotFoundException;
import java.util.HashMap;
diff --git a/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java b/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java
index 732fe6e..89bee99 100644
--- a/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java
+++ b/base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java
@@ -6,11 +6,11 @@
import android.graphics.Rect;
-import org.chromium.base.AccessedByNative;
import org.chromium.base.CalledByNative;
-import org.chromium.base.CalledByNativeUnchecked;
import org.chromium.base.JNINamespace;
import org.chromium.base.NativeClassQualifiedName;
+import org.chromium.base.annotations.AccessedByNative;
+import org.chromium.base.annotations.CalledByNativeUnchecked;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
index 30cfae2..1e0ff7c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java
@@ -31,9 +31,9 @@
import android.util.LongSparseArray;
import org.chromium.base.CalledByNative;
-import org.chromium.base.CalledByNativeUnchecked;
import org.chromium.base.ThreadUtils;
import org.chromium.base.VisibleForTesting;
+import org.chromium.base.annotations.CalledByNativeUnchecked;
import org.chromium.base.annotations.SuppressFBWarnings;
import org.chromium.chrome.browser.database.SQLiteCursor;
import org.chromium.sync.AndroidSyncSettings;
diff --git a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestFactory.java b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestFactory.java
index 6c54949..75846c4 100644
--- a/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestFactory.java
+++ b/components/cronet/android/java/src/org/chromium/net/ChromiumUrlRequestFactory.java
@@ -7,7 +7,7 @@
import android.content.Context;
import android.os.Build;
-import org.chromium.base.UsedByReflection;
+import org.chromium.base.annotations.UsedByReflection;
import java.nio.channels.WritableByteChannel;
import java.util.Map;
diff --git a/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java b/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java
index a2d6446..78d3bee 100644
--- a/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java
+++ b/components/cronet/android/java/src/org/chromium/net/CronetUrlRequestContext.java
@@ -15,7 +15,7 @@
import org.chromium.base.CalledByNative;
import org.chromium.base.JNINamespace;
import org.chromium.base.NativeClassQualifiedName;
-import org.chromium.base.UsedByReflection;
+import org.chromium.base.annotations.UsedByReflection;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/components/cronet/android/proguard.cfg b/components/cronet/android/proguard.cfg
index 3930cb94..65f4333 100644
--- a/components/cronet/android/proguard.cfg
+++ b/components/cronet/android/proguard.cfg
@@ -2,7 +2,7 @@
-keep class org.chromium.base.*Native*
-keep class org.chromium.base.JNINamespace
-keepclasseswithmembers class org.chromium.** {
- @org.chromium.base.AccessedByNative <fields>;
+ @org.chromium.base.annotations.AccessedByNative <fields>;
}
-keepclasseswithmembers class org.chromium.** {
@org.chromium.base.*Native* <methods>;
diff --git a/content/public/android/java/src/org/chromium/content/browser/SmartClipProvider.java b/content/public/android/java/src/org/chromium/content/browser/SmartClipProvider.java
index e1502b6..ae38c04 100644
--- a/content/public/android/java/src/org/chromium/content/browser/SmartClipProvider.java
+++ b/content/public/android/java/src/org/chromium/content/browser/SmartClipProvider.java
@@ -6,7 +6,7 @@
import android.os.Handler;
-import org.chromium.base.UsedByReflection;
+import org.chromium.base.annotations.UsedByReflection;
/**
* An interface to provide smart clip data when requested.
diff --git a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
index 32b7192..047a787 100644
--- a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
+++ b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
@@ -12,7 +12,7 @@
import android.util.Log;
import org.chromium.base.CalledByNative;
-import org.chromium.base.CalledByNativeUnchecked;
+import org.chromium.base.annotations.CalledByNativeUnchecked;
import java.net.NetworkInterface;
import java.net.SocketException;
