summaryrefslogtreecommitdiffstats
path: root/content/public
diff options
context:
space:
mode:
authorcjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-11 01:52:47 +0000
committercjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-11 01:52:47 +0000
commit677ad365c17980f74f03c1992e6e1795723f9cfb (patch)
treea9ac5a2ef53fa95d2e41e152c332400a8082d517 /content/public
parent07890324ed098994dd336ee00e54074e6b029014 (diff)
downloadchromium_src-677ad365c17980f74f03c1992e6e1795723f9cfb.zip
chromium_src-677ad365c17980f74f03c1992e6e1795723f9cfb.tar.gz
chromium_src-677ad365c17980f74f03c1992e6e1795723f9cfb.tar.bz2
[Android] Use the build-generated list of libraries for gtest APKs
For normal APKs, the build generates a list of libraries to load at build time and this is used at runtime to load libraries. Update our gtest APKs to use this. This makes gtest APKs work in the component build. BUG=158821 Review URL: https://chromiumcodereview.appspot.com/13962003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193536 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
-rw-r--r--content/public/android/java/templates/NativeLibraries.template4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/public/android/java/templates/NativeLibraries.template b/content/public/android/java/templates/NativeLibraries.template
index 8c9b42d..a54c2c7 100644
--- a/content/public/android/java/templates/NativeLibraries.template
+++ b/content/public/android/java/templates/NativeLibraries.template
@@ -10,7 +10,9 @@ public class NativeLibraries {
// array defined, and then the build system creates a version of the file
// with the real list of libraries required (which changes based upon which
// .apk is being built).
- static String[] libraries
+ // 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 String[] libraries
#include <native_libraries_array.h>
;
}