From 93c9f9b0eaf8be547b33ba59027c44358f6f845a Mon Sep 17 00:00:00 2001 From: "aberent@chromium.org" Date: Mon, 10 Feb 2014 16:19:22 +0000 Subject: 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 --- .../base/library_loader/NativeLibraries.java | 28 ++++++++++++++++++++++ .../org/chromium/content/app/NativeLibraries.java | 25 ------------------- 2 files changed, 28 insertions(+), 25 deletions(-) create mode 100644 android_webview/java/generated_src/org/chromium/base/library_loader/NativeLibraries.java delete mode 100644 android_webview/java/generated_src/org/chromium/content/app/NativeLibraries.java (limited to 'android_webview/java/generated_src') diff --git a/android_webview/java/generated_src/org/chromium/base/library_loader/NativeLibraries.java b/android_webview/java/generated_src/org/chromium/base/library_loader/NativeLibraries.java new file mode 100644 index 0000000..2bb1460 --- /dev/null +++ b/android_webview/java/generated_src/org/chromium/base/library_loader/NativeLibraries.java @@ -0,0 +1,28 @@ +// 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 class defines the native libraries and loader options required by webview + */ +public class NativeLibraries { + // Set to true to use the chromium linker. Only useful to save memory + // on multi-process content-based projects. Always disabled for the Android Webview. + public static boolean USE_LINKER = false; + + // Set to true to enable chromium linker test support. NEVER enable this for the + // Android webview. + public static boolean ENABLE_LINKER_TESTS = false; + + // This is the list of native libraries to load. In the normal chromium build, this would be + // automatically generated. + // TODO(torne, cjhopman): Use a generated file for this. + static final String[] LIBRARIES = { "webviewchromium" }; + // This should match the version name string returned by the native library. + // TODO(aberent) The Webview native library currently returns an empty string; change this + // to a string generated at compile time, and incorporate that string in a generated + // replacement for this file. + static String VERSION_NUMBER = ""; +} diff --git a/android_webview/java/generated_src/org/chromium/content/app/NativeLibraries.java b/android_webview/java/generated_src/org/chromium/content/app/NativeLibraries.java deleted file mode 100644 index c01bea5..0000000 --- a/android_webview/java/generated_src/org/chromium/content/app/NativeLibraries.java +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2013 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.content.app; - -public class NativeLibraries { - // Set to true to use the content linker. Only useful to save memory - // on multi-process content-based projects. Always disabled for the Android Webview. - public static boolean USE_LINKER = false; - - // Set to true to enable content linker test support. NEVER enable this for the - // Android webview. - public static boolean ENABLE_LINKER_TESTS = false; - - // This is the list of native libraries to load. In the normal chromium build, this would be - // automatically generated. - // TODO(torne, cjhopman): Use a generated file for this. - static final String[] LIBRARIES = { "webviewchromium" }; - // This should match the version name string returned by the native library. - // TODO(aberent) The Webview native library currently returns an empty string; change this - // to a string generated at compile time, and incorporate that string in a generated - // replacement for this file. - static String VERSION_NUMBER = ""; -} -- cgit v1.1