summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_android.gypi
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-04 09:15:59 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-04 09:15:59 +0000
commite4865252cdb389139947df8c31c60f9bdacea74a (patch)
tree00b467d4535524fa8e260d1e4d202f6865ae17f8 /chrome/chrome_android.gypi
parent109fdfa752658b78a95149702de51c7c5800e3ea (diff)
downloadchromium_src-e4865252cdb389139947df8c31c60f9bdacea74a.zip
chromium_src-e4865252cdb389139947df8c31c60f9bdacea74a.tar.gz
chromium_src-e4865252cdb389139947df8c31c60f9bdacea74a.tar.bz2
[Android] "Namespace" shared libraries for the component build
With the component build, we tell Dalvik to load each library separately by name. Some of our library names conflict with android shared libraries resulting our library not getting loaded. When building for components on Android, change the suffix of libraries to "cr.so" e.g. libnetcr.so to avoid colliding with Android's copies BUG=158821 Review URL: https://chromiumcodereview.appspot.com/13549002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192258 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_android.gypi')
-rw-r--r--chrome/chrome_android.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index 79c9c98..7cbc1ab 100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -61,7 +61,7 @@
'java_in_dir': 'android/testshell/java',
'resource_dir': 'android/testshell/res',
'asset_location': '<(ant_build_out)/../assets/<(package_name)',
- 'native_libs_paths': [ '<(SHARED_LIB_DIR)/libchromiumtestshell.so', ],
+ 'native_lib_target': 'libchromiumtestshell',
'additional_input_paths': [
'<@(chrome_android_pak_output_resources)',
'<(chrome_android_pak_output_folder)/devtools_resources.pak',