Move the android library loader from content to base

The android library loader has no logical connection with content. Mojo
shell, which doesn't depend on content, wants to use it. This CL
moves it from content to base.

BUG=225101
NOTRY=true

Review URL: https://codereview.chromium.org/141223002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250113 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 28 insertions, 10 deletions

diff --git a/build/android/findbugs_filter/findbugs_exclude.xml b/build/android/findbugs_filter/findbugs_exclude.xml
index f300db1..2dc7f53 100644
--- a/build/android/findbugs_filter/findbugs_exclude.xml
+++ b/build/android/findbugs_filter/findbugs_exclude.xml
@@ -19,7 +19,7 @@ In particular, ~ at the start of a string means it's a regex.
   </Match>
   <!-- Ignore bugs in NativeLibraries.java (the auto-generation confuses findbugs). -->
   <Match>
-    <Class name="~org\.chromium\.content\..*\.NativeLibraries.*?" />
+    <Class name="~org\.chromium\.base\..*\.NativeLibraries.*?" />
   </Match>
   <!--
   Ignore bugs in CleanupReferenceTest.java (redundant null check)
diff --git a/build/android/findbugs_filter/findbugs_known_bugs.txt b/build/android/findbugs_filter/findbugs_known_bugs.txt
index 739790f..0aab535 100644
--- a/build/android/findbugs_filter/findbugs_known_bugs.txt
+++ b/build/android/findbugs_filter/findbugs_known_bugs.txt
@@ -1,3 +1,5 @@
+H B Nm: The class name org.chromium.base.library_loader.ProcessInitException shadows the simple name of the superclass org.chromium.content.common.ProcessInitException  At ProcessInitException.java
+H B Nm: The class name org.chromium.content.app.LibraryLoader shadows the simple name of the superclass org.chromium.base.library_loader.LibraryLoader  At LibraryLoader.java
 H C EC: Using pointer equality to compare a JavaBridgeCoercionTest$CustomType with a JavaBridgeCoercionTest$CustomType2 in org.chromium.content.browser.JavaBridgeCoercionTest.testPassJavaObject()  At JavaBridgeCoercionTest.java
 H P Bx: Boxing/unboxing to parse a primitive org.chromium.content.browser.ViewportTest.evaluateIntegerValue(String)  At ViewportTest.java
 M B RV: Exceptional return value of java.io.File.delete() ignored in org.chromium.base.test.util.TestFileUtil.deleteFile(String)  At TestFileUtil.java
diff --git a/build/android/pylib/linker/test_case.py b/build/android/pylib/linker/test_case.py
index febab92..7eed8287 100644
--- a/build/android/pylib/linker/test_case.py
+++ b/build/android/pylib/linker/test_case.py
@@ -29,7 +29,7 @@
 
    To build and run the linker tests, do the following:
 
-     ninja -C out/Debug content_linker_test_apk
+     ninja -C out/Debug chromium_linker_test_apk
      build/android/test_runner.py linker
 
 """
@@ -47,13 +47,13 @@ from pylib.base import base_test_result
 
 ResultType = base_test_result.ResultType
 
-_PACKAGE_NAME = 'org.chromium.content_linker_test_apk'
-_ACTIVITY_NAME = '.ContentLinkerTestActivity'
-_COMMAND_LINE_FILE = '/data/local/tmp/content-linker-test-command-line'
+_PACKAGE_NAME = 'org.chromium.chromium_linker_test_apk'
+_ACTIVITY_NAME = '.ChromiumLinkerTestActivity'
+_COMMAND_LINE_FILE = '/data/local/tmp/chromium-linker-test-command-line'
 
 # Path to the Linker.java source file.
 _LINKER_JAVA_SOURCE_PATH = (
-    'content/public/android/java/src/org/chromium/content/app/Linker.java')
+  'base/android/java/src/org/chromium/base/library_loader/Linker.java')
 
 # A regular expression used to extract the browser shared RELRO configuration
 # from the Java source file above.
@@ -64,9 +64,9 @@ _RE_LINKER_BROWSER_CONFIG = re.compile(
 
 # Logcat filters used during each test. Only the 'chromium' one is really
 # needed, but the logs are added to the TestResult in case of error, and
-# it is handy to have the 'content_android_linker' ones as well when
+# it is handy to have the 'chromium_android_linker' ones as well when
 # troubleshooting.
-_LOGCAT_FILTERS = [ '*:s', 'chromium:v', 'content_android_linker:v' ]
+_LOGCAT_FILTERS = [ '*:s', 'chromium:v', 'chromium_android_linker:v' ]
 #_LOGCAT_FILTERS = [ '*:v' ]  ## DEBUG
 
 # Regular expression used to match status lines in logcat.
diff --git a/build/android/pylib/linker/test_runner.py b/build/android/pylib/linker/test_runner.py
index b9eb0b4..c9b7dd9 100644
--- a/build/android/pylib/linker/test_runner.py
+++ b/build/android/pylib/linker/test_runner.py
@@ -17,7 +17,7 @@ from pylib.utils import apk_helper
 
 
 # Name of the Android package to install for this to work.
-_PACKAGE_NAME = 'ContentLinkerTest'
+_PACKAGE_NAME = 'ChromiumLinkerTest'
 
 
 class LinkerExceptionTestResult(base_test_result.BaseTestResult):
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
index 30e23b6..a8a3969 100755
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
@@ -538,7 +538,7 @@ def _RunLinkerTests(options, devices):
   report_results.LogFull(
       results=results,
       test_type='Linker test',
-      test_package='ContentLinkerTest')
+      test_package='ChromiumLinkerTest')
 
   return exit_code
 
diff --git a/build/android/tests/multiple_proguards/src/dummy/NativeLibraries.java b/build/android/tests/multiple_proguards/src/dummy/NativeLibraries.java
new file mode 100644
index 0000000..edf71d7
--- /dev/null
+++ b/build/android/tests/multiple_proguards/src/dummy/NativeLibraries.java
@@ -0,0 +1,16 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.base.library_loader;
+
+/**
+ * This is a complete dummy, required because base now requires a version of
+ * NativeLibraries to build, but doesn't include it in its jar file.
+ */
+public class NativeLibraries {
+    public static boolean USE_LINKER = false;
+    public static boolean ENABLE_LINKER_TESTS = false;
+    static final String[] LIBRARIES = {};
+    static String VERSION_NUMBER = "";
+}