summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authoraurimas <aurimas@chromium.org>2015-04-13 18:42:02 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-14 01:42:27 +0000
commit9c45cf75d0438700b29211be14970d8068ca02c5 (patch)
treef8a15efc1917466eabeb6317f51ea3e11848573d /base
parent1cc86c4f686869f32dfede093a07828c73563892 (diff)
downloadchromium_src-9c45cf75d0438700b29211be14970d8068ca02c5.zip
chromium_src-9c45cf75d0438700b29211be14970d8068ca02c5.tar.gz
chromium_src-9c45cf75d0438700b29211be14970d8068ca02c5.tar.bz2
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}
Diffstat (limited to 'base')
-rw-r--r--base/android/java/src/org/chromium/base/annotations/AccessedByNative.java (renamed from base/android/java/src/org/chromium/base/AccessedByNative.java)2
-rw-r--r--base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java (renamed from base/android/java/src/org/chromium/base/CalledByNativeUnchecked.java)2
-rw-r--r--base/android/java/src/org/chromium/base/annotations/UsedByReflection.java (renamed from base/android/java/src/org/chromium/base/UsedByReflection.java)2
-rw-r--r--base/android/java/src/org/chromium/base/library_loader/Linker.java2
-rw-r--r--base/android/jni_generator/java/src/org/chromium/example/jni_generator/SampleForTests.java4
5 files changed, 6 insertions, 6 deletions
diff --git a/base/android/java/src/org/chromium/base/AccessedByNative.java b/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
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
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.ParcelFileDescriptor;
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 @@ package org.chromium.example.jni_generator;
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;