diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 19:31:22 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 19:31:22 +0000 |
| commit | bc96d8ba9962f7bd7d0806478bfb4332d5447005 (patch) | |
| tree | a61781f32595cc5649cb93911e85a35bfdc6ba3d /build | |
| parent | a97cac0d9372c411c9832a1cc5c7452bda387efa (diff) | |
| download | chromium_src-bc96d8ba9962f7bd7d0806478bfb4332d5447005.zip chromium_src-bc96d8ba9962f7bd7d0806478bfb4332d5447005.tar.gz chromium_src-bc96d8ba9962f7bd7d0806478bfb4332d5447005.tar.bz2 | |
[Android] Include gdbserver in APKs
Debug APKs with native libraries should include gdbserver. Copy this
into the apk_package_native_libs_dir. Then, the apkbuilder task will
include this in the APK for debug builds (but not for release builds).
TEST=unzip -l ContentShell.apk should list gdbserver for debug builds
(but not for release)
Review URL: https://chromiumcodereview.appspot.com/14200040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/java_apk.gypi | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 65550ad..f40ef7a 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -107,10 +107,19 @@ 'final_apk_path%': '<(PRODUCT_DIR)/apks/<(apk_name).apk', 'source_dir': '<(java_in_dir)/src', 'apk_install_record': '<(intermediate_dir)/apk_install.record.stamp', - 'apk_package_native_libs_dir': '<(intermediate_dir)/libs', 'device_intermediate_dir': '/data/local/tmp/chromium/<(_target_name)/<(CONFIGURATION_NAME)', 'symlink_script_host_path': '<(intermediate_dir)/create_symlinks.sh', 'symlink_script_device_path': '<(device_intermediate_dir)/create_symlinks.sh', + 'variables': { + 'conditions': [ + ['gyp_managed_install == 1', { + 'apk_package_native_libs_dir': '<(intermediate_dir)/libs.managed', + }, { + 'apk_package_native_libs_dir': '<(intermediate_dir)/libs', + }], + ], + }, + 'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)', }, # 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 @@ -144,8 +153,24 @@ 'variables': { 'compile_input_paths': [ '<(native_libraries_java_stamp)' ], 'generated_src_dirs': [ '<(native_libraries_java_dir)' ], - 'native_libs_paths': ['<(SHARED_LIB_DIR)/<(native_lib_target).>(android_product_extension)'], + 'native_libs_paths': [ + '<(SHARED_LIB_DIR)/<(native_lib_target).>(android_product_extension)' + ], + 'package_input_paths': [ + '<(apk_package_native_libs_dir)/<(android_app_abi)/gdbserver', + ], }, + 'copies': [ + { + # gdbserver is always copied into the APK's native libs dir. The ant + # build scripts (apkbuilder task) will only include it in a debug + # build. + 'destination': '<(apk_package_native_libs_dir)/<(android_app_abi)', + 'files': [ + '<(android_gdbserver)', + ], + }, + ], 'actions': [ { 'variables': { @@ -203,7 +228,6 @@ ['gyp_managed_install == 1', { 'variables': { 'libraries_source_dir': '<(intermediate_dir)/lib.stripped/<(android_app_abi)', - 'apk_package_native_libs_dir': '<(intermediate_dir)/libs.managed', 'device_library_dir': '<(device_intermediate_dir)/lib.stripped', }, 'dependencies': [ |