summaryrefslogtreecommitdiffstats
path: root/base/android
diff options
context:
space:
mode:
authornavabi@google.com <navabi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 21:05:56 +0000
committernavabi@google.com <navabi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 21:05:56 +0000
commitdccbbb1d1c707faab941be02f0f68ab805d0a7a7 (patch)
tree3e15c351fbc74f4c8e8399fb1489e7837fe31287 /base/android
parent6f5fac9d1b4c8bfc924ed555f46c3e67a8a8f962 (diff)
downloadchromium_src-dccbbb1d1c707faab941be02f0f68ab805d0a7a7.zip
chromium_src-dccbbb1d1c707faab941be02f0f68ab805d0a7a7.tar.gz
chromium_src-dccbbb1d1c707faab941be02f0f68ab805d0a7a7.tar.bz2
Move java files into src parent directory.
BUG=134704 TEST= TBR=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/10668039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/android')
-rw-r--r--base/android/java/base.xml2
-rw-r--r--base/android/java/src/org/chromium/base/AccessedByNative.java (renamed from base/android/java/org/chromium/base/AccessedByNative.java)0
-rw-r--r--base/android/java/src/org/chromium/base/ActivityStatus.java (renamed from base/android/java/org/chromium/base/ActivityStatus.java)0
-rw-r--r--base/android/java/src/org/chromium/base/BuildInfo.java (renamed from base/android/java/org/chromium/base/BuildInfo.java)0
-rw-r--r--base/android/java/src/org/chromium/base/CalledByNative.java (renamed from base/android/java/org/chromium/base/CalledByNative.java)0
-rw-r--r--base/android/java/src/org/chromium/base/CalledByNativeUnchecked.java (renamed from base/android/java/org/chromium/base/CalledByNativeUnchecked.java)0
-rw-r--r--base/android/java/src/org/chromium/base/JNINamespace.java (renamed from base/android/java/org/chromium/base/JNINamespace.java)0
-rw-r--r--base/android/java/src/org/chromium/base/LocaleUtils.java (renamed from base/android/java/org/chromium/base/LocaleUtils.java)0
-rw-r--r--base/android/java/src/org/chromium/base/NativeClassQualifiedName.java (renamed from base/android/java/org/chromium/base/NativeClassQualifiedName.java)0
-rw-r--r--base/android/java/src/org/chromium/base/PathUtils.java (renamed from base/android/java/org/chromium/base/PathUtils.java)0
-rw-r--r--base/android/java/src/org/chromium/base/SystemMessageHandler.java (renamed from base/android/java/org/chromium/base/SystemMessageHandler.java)0
-rw-r--r--base/android/java/src/org/chromium/base/ThreadUtils.java (renamed from base/android/java/org/chromium/base/ThreadUtils.java)0
-rw-r--r--base/android/java/src/org/chromium/base/WeakContext.java (renamed from base/android/java/org/chromium/base/WeakContext.java)0
13 files changed, 1 insertions, 1 deletions
diff --git a/base/android/java/base.xml b/base/android/java/base.xml
index d742907..74589b4 100644
--- a/base/android/java/base.xml
+++ b/base/android/java/base.xml
@@ -8,7 +8,7 @@
<!-- TODO(jrg): The apk-runner's version is hardcoded to SDK version 14. These
two should be unified. -->
<property name="sdk.version" value="${env.ANDROID_SDK_VERSION}"/>
- <property name="src" location="."/>
+ <property name="src" location="src"/>
<property name="dist" location="dist"/>
<property name="out.dir" location="${PRODUCT_DIR}/lib.java"/>
<!-- TODO(jrg): establish a standard for the intermediate java
diff --git a/base/android/java/org/chromium/base/AccessedByNative.java b/base/android/java/src/org/chromium/base/AccessedByNative.java
index 8248cc6..8248cc6 100644
--- a/base/android/java/org/chromium/base/AccessedByNative.java
+++ b/base/android/java/src/org/chromium/base/AccessedByNative.java
diff --git a/base/android/java/org/chromium/base/ActivityStatus.java b/base/android/java/src/org/chromium/base/ActivityStatus.java
index 765d841..765d841 100644
--- a/base/android/java/org/chromium/base/ActivityStatus.java
+++ b/base/android/java/src/org/chromium/base/ActivityStatus.java
diff --git a/base/android/java/org/chromium/base/BuildInfo.java b/base/android/java/src/org/chromium/base/BuildInfo.java
index d88eebc..d88eebc 100644
--- a/base/android/java/org/chromium/base/BuildInfo.java
+++ b/base/android/java/src/org/chromium/base/BuildInfo.java
diff --git a/base/android/java/org/chromium/base/CalledByNative.java b/base/android/java/src/org/chromium/base/CalledByNative.java
index 8d3dcad8..8d3dcad8 100644
--- a/base/android/java/org/chromium/base/CalledByNative.java
+++ b/base/android/java/src/org/chromium/base/CalledByNative.java
diff --git a/base/android/java/org/chromium/base/CalledByNativeUnchecked.java b/base/android/java/src/org/chromium/base/CalledByNativeUnchecked.java
index cc264a2..cc264a2 100644
--- a/base/android/java/org/chromium/base/CalledByNativeUnchecked.java
+++ b/base/android/java/src/org/chromium/base/CalledByNativeUnchecked.java
diff --git a/base/android/java/org/chromium/base/JNINamespace.java b/base/android/java/src/org/chromium/base/JNINamespace.java
index cfffc91..cfffc91 100644
--- a/base/android/java/org/chromium/base/JNINamespace.java
+++ b/base/android/java/src/org/chromium/base/JNINamespace.java
diff --git a/base/android/java/org/chromium/base/LocaleUtils.java b/base/android/java/src/org/chromium/base/LocaleUtils.java
index 6bca1f7..6bca1f7 100644
--- a/base/android/java/org/chromium/base/LocaleUtils.java
+++ b/base/android/java/src/org/chromium/base/LocaleUtils.java
diff --git a/base/android/java/org/chromium/base/NativeClassQualifiedName.java b/base/android/java/src/org/chromium/base/NativeClassQualifiedName.java
index 309169b..309169b 100644
--- a/base/android/java/org/chromium/base/NativeClassQualifiedName.java
+++ b/base/android/java/src/org/chromium/base/NativeClassQualifiedName.java
diff --git a/base/android/java/org/chromium/base/PathUtils.java b/base/android/java/src/org/chromium/base/PathUtils.java
index 94403d4..94403d4 100644
--- a/base/android/java/org/chromium/base/PathUtils.java
+++ b/base/android/java/src/org/chromium/base/PathUtils.java
diff --git a/base/android/java/org/chromium/base/SystemMessageHandler.java b/base/android/java/src/org/chromium/base/SystemMessageHandler.java
index f7bb19f..f7bb19f 100644
--- a/base/android/java/org/chromium/base/SystemMessageHandler.java
+++ b/base/android/java/src/org/chromium/base/SystemMessageHandler.java
diff --git a/base/android/java/org/chromium/base/ThreadUtils.java b/base/android/java/src/org/chromium/base/ThreadUtils.java
index ca31c3d..ca31c3d 100644
--- a/base/android/java/org/chromium/base/ThreadUtils.java
+++ b/base/android/java/src/org/chromium/base/ThreadUtils.java
diff --git a/base/android/java/org/chromium/base/WeakContext.java b/base/android/java/src/org/chromium/base/WeakContext.java
index d660cc9..d660cc9 100644
--- a/base/android/java/org/chromium/base/WeakContext.java
+++ b/base/android/java/src/org/chromium/base/WeakContext.java