| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.base.library_loader; | 5 package org.chromium.base.library_loader; |
| 6 | 6 |
| 7 public class NativeLibraries { | 7 public class NativeLibraries { |
| 8 /** | 8 /** |
| 9 * IMPORTANT NOTE: The variables defined here must _not_ be 'final'. | 9 * IMPORTANT NOTE: The variables defined here must _not_ be 'final'. |
| 10 * | 10 * |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 * the sources of each and every Chromium-based target. | 42 * the sources of each and every Chromium-based target. |
| 43 */ | 43 */ |
| 44 | 44 |
| 45 #if defined(ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE) && \ | 45 #if defined(ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE) && \ |
| 46 !defined(ENABLE_CHROMIUM_LINKER) | 46 !defined(ENABLE_CHROMIUM_LINKER) |
| 47 #error "Must have ENABLE_CHROMIUM_LINKER to enable library in zip file" | 47 #error "Must have ENABLE_CHROMIUM_LINKER to enable library in zip file" |
| 48 #endif | 48 #endif |
| 49 | 49 |
| 50 // Set to true to enable the use of the Chromium Linker. | 50 // Set to true to enable the use of the Chromium Linker. |
| 51 #if defined(ENABLE_CHROMIUM_LINKER) | 51 #if defined(ENABLE_CHROMIUM_LINKER) |
| 52 public static boolean USE_LINKER = true; | 52 public static boolean sUseLinker = true; |
| 53 #else | 53 #else |
| 54 public static boolean USE_LINKER = false; | 54 public static boolean sUseLinker = false; |
| 55 #endif | 55 #endif |
| 56 | 56 |
| 57 #if defined(ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE) | 57 #if defined(ENABLE_CHROMIUM_LINKER_LIBRARY_IN_ZIP_FILE) |
| 58 public static boolean USE_LIBRARY_IN_ZIP_FILE = true; | 58 public static boolean sUseLibraryInZipFile = true; |
| 59 #else | 59 #else |
| 60 public static boolean USE_LIBRARY_IN_ZIP_FILE = false; | 60 public static boolean sUseLibraryInZipFile = false; |
| 61 #endif | 61 #endif |
| 62 | 62 |
| 63 #if defined(ENABLE_CHROMIUM_LINKER_TESTS) | 63 #if defined(ENABLE_CHROMIUM_LINKER_TESTS) |
| 64 public static boolean ENABLE_LINKER_TESTS = true; | 64 public static boolean sEnableLinkerTests = true; |
| 65 #else | 65 #else |
| 66 public static boolean ENABLE_LINKER_TESTS = false; | 66 public static boolean sEnableLinkerTests = false; |
| 67 #endif | 67 #endif |
| 68 | 68 |
| 69 // This is the list of native libraries to be loaded (in the correct order) | 69 // This is the list of native libraries to be loaded (in the correct order) |
| 70 // by LibraryLoader.java. The base java library is compiled with no | 70 // by LibraryLoader.java. The base java library is compiled with no |
| 71 // array defined, and then the build system creates a version of the file | 71 // array defined, and then the build system creates a version of the file |
| 72 // with the real list of libraries required (which changes based upon which | 72 // with the real list of libraries required (which changes based upon which |
| 73 // .apk is being built). | 73 // .apk is being built). |
| 74 // TODO(cjhopman): This is public since it is referenced by ChromeNativeTest
Activity.java | 74 // TODO(cjhopman): This is public since it is referenced by ChromeNativeTest
Activity.java |
| 75 // directly. The two ways of library loading should be refactored into one. | 75 // directly. The two ways of library loading should be refactored into one. |
| 76 public static final String[] LIBRARIES = | 76 public static final String[] LIBRARIES = |
| 77 #if defined(NATIVE_LIBRARIES_LIST) | 77 #if defined(NATIVE_LIBRARIES_LIST) |
| 78 NATIVE_LIBRARIES_LIST; | 78 NATIVE_LIBRARIES_LIST; |
| 79 #else | 79 #else |
| 80 {}; | 80 {}; |
| 81 #endif | 81 #endif |
| 82 | 82 |
| 83 // This is the expected version of the 'main' native library, which is the o
ne that | 83 // This is the expected version of the 'main' native library, which is the o
ne that |
| 84 // implements the initial set of base JNI functions including | 84 // implements the initial set of base JNI functions including |
| 85 // base::android::nativeGetVersionName() | 85 // base::android::nativeGetVersionName() |
| 86 static String VERSION_NUMBER = | 86 static String sVersionNumber = |
| 87 #if defined(NATIVE_LIBRARIES_VERSION_NUMBER) | 87 #if defined(NATIVE_LIBRARIES_VERSION_NUMBER) |
| 88 NATIVE_LIBRARIES_VERSION_NUMBER; | 88 NATIVE_LIBRARIES_VERSION_NUMBER; |
| 89 #else | 89 #else |
| 90 ""; | 90 ""; |
| 91 #endif | 91 #endif |
| 92 } | 92 } |
| OLD | NEW |