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

Unified Diff: base/android/java/templates/NativeLibraries.template

Issue 456493002: Add native libraries to gn apks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/BUILD.gn ('k') | base/android/java/templates/native_libraries_array.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/java/templates/NativeLibraries.template
diff --git a/base/android/java/templates/NativeLibraries.template b/base/android/java/templates/NativeLibraries.template
index 09b02ebf469aad57a3162ef29633655f056aea89..165f468ccef371952c0ac14e7ac638998326ba50 100644
--- a/base/android/java/templates/NativeLibraries.template
+++ b/base/android/java/templates/NativeLibraries.template
@@ -73,13 +73,20 @@ public class NativeLibraries {
// .apk is being built).
// TODO(cjhopman): This is public since it is referenced by ChromeNativeTestActivity.java
// directly. The two ways of library loading should be refactored into one.
- public static final String[] LIBRARIES
-#include <native_libraries_array.h>
- ;
+ public static final String[] LIBRARIES =
+#if defined(NATIVE_LIBRARIES_LIST)
+ NATIVE_LIBRARIES_LIST;
+#else
+ {};
+#endif
+
// This is the expected version of the 'main' native library, which is the one that
// implements the initial set of base JNI functions including
// base::android::nativeGetVersionName()
- static String VERSION_NUMBER
-#include <native_libraries_version.h>
- ;
+ static String VERSION_NUMBER =
+#if defined(NATIVE_LIBRARIES_VERSION_NUMBER)
+ NATIVE_LIBRARIES_VERSION_NUMBER;
+#else
+ "";
+#endif
}
« no previous file with comments | « base/BUILD.gn ('k') | base/android/java/templates/native_libraries_array.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698