From c40ed24e7ca9918283c9c39cf2b02d39ea4fa31b Mon Sep 17 00:00:00 2001 From: "peter@chromium.org" Date: Fri, 20 Sep 2013 17:44:33 +0000 Subject: [PATCH] Add a gyp variable to indicate additional native libraries to be included in the APK Based on a patch by Chris Hopman . This patch allows us to lazily load libosmesa.so only when it's needed for content_shell, rather than directly linking it. https://codereview.chromium.org/23868030/ BUG= Review URL: https://chromiumcodereview.appspot.com/24253005 git-svn-id: http://src.chromium.org/svn/trunk/src/build@224424 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- java_apk.gypi | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/java_apk.gypi b/java_apk.gypi index 4ee901482..81984472a 100644 --- a/java_apk.gypi +++ b/java_apk.gypi @@ -134,6 +134,7 @@ 'emma_instrument': '<(emma_coverage)', 'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)', 'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)', + 'extra_native_libs': [], }, # Pass the jar path to the apk's "fake" jar target. This would be better as # direct_dependent_settings, but a variable set by a direct_dependent_settings @@ -182,13 +183,17 @@ 'destination': '<(apk_package_native_libs_dir)/<(android_app_abi)', 'files': [ '<(android_gdbserver)', + '<@(extra_native_libs)', ], }, ], 'actions': [ { 'variables': { - 'input_libraries': ['<@(native_libs_paths)'], + 'input_libraries': [ + '<@(native_libs_paths)', + '<@(extra_native_libs)', + ], }, 'includes': ['../build/android/write_ordered_libraries.gypi'], }, @@ -235,7 +240,10 @@ 'variables': { 'ordered_libraries_file%': '<(ordered_libraries_file)', 'stripped_libraries_dir': '<(libraries_source_dir)', - 'input_paths': ['<@(native_libs_paths)'], + 'input_paths': [ + '<@(native_libs_paths)', + '<@(extra_native_libs)', + ], 'stamp': '<(strip_stamp)' }, 'includes': ['../build/android/strip_native_libraries.gypi'],