Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: base/android/java/templates/NativeLibraries.template

Issue 1115173004: [Android] Rename ChromeNativeTest* to NativeTest*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: switch to org.chromium.base.Log Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | build/android/pylib/constants/__init__.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 import org.chromium.base.annotations.SuppressFBWarnings; 7 import org.chromium.base.annotations.SuppressFBWarnings;
8 8
9 @SuppressFBWarnings 9 @SuppressFBWarnings
10 public class NativeLibraries { 10 public class NativeLibraries {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 public static boolean sEnableLinkerTests = true; 67 public static boolean sEnableLinkerTests = true;
68 #else 68 #else
69 public static boolean sEnableLinkerTests = false; 69 public static boolean sEnableLinkerTests = false;
70 #endif 70 #endif
71 71
72 // This is the list of native libraries to be loaded (in the correct order) 72 // This is the list of native libraries to be loaded (in the correct order)
73 // by LibraryLoader.java. The base java library is compiled with no 73 // by LibraryLoader.java. The base java library is compiled with no
74 // array defined, and then the build system creates a version of the file 74 // array defined, and then the build system creates a version of the file
75 // with the real list of libraries required (which changes based upon which 75 // with the real list of libraries required (which changes based upon which
76 // .apk is being built). 76 // .apk is being built).
77 // TODO(cjhopman): This is public since it is referenced by ChromeNativeTest Activity.java 77 // TODO(cjhopman): This is public since it is referenced by NativeTestActivi ty.java
78 // directly. The two ways of library loading should be refactored into one. 78 // directly. The two ways of library loading should be refactored into one.
79 public static final String[] LIBRARIES = 79 public static final String[] LIBRARIES =
80 #if defined(NATIVE_LIBRARIES_LIST) 80 #if defined(NATIVE_LIBRARIES_LIST)
81 NATIVE_LIBRARIES_LIST; 81 NATIVE_LIBRARIES_LIST;
82 #else 82 #else
83 {}; 83 {};
84 #endif 84 #endif
85 85
86 // This is the expected version of the 'main' native library, which is the o ne that 86 // This is the expected version of the 'main' native library, which is the o ne that
87 // implements the initial set of base JNI functions including 87 // implements the initial set of base JNI functions including
88 // base::android::nativeGetVersionName() 88 // base::android::nativeGetVersionName()
89 static String sVersionNumber = 89 static String sVersionNumber =
90 #if defined(NATIVE_LIBRARIES_VERSION_NUMBER) 90 #if defined(NATIVE_LIBRARIES_VERSION_NUMBER)
91 NATIVE_LIBRARIES_VERSION_NUMBER; 91 NATIVE_LIBRARIES_VERSION_NUMBER;
92 #else 92 #else
93 ""; 93 "";
94 #endif 94 #endif
95 } 95 }
OLDNEW
« no previous file with comments | « no previous file | build/android/pylib/constants/__init__.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698