[Android] Include gdbserver in APKs

build/java_apk.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 89 matching lines @@
     'android_manifest_path%': '<(java_in_dir)/AndroidManifest.xml',
     'push_stamp': '<(intermediate_dir)/push.stamp',
     'link_stamp': '<(intermediate_dir)/link.stamp',
     'package_resources_stamp': '<(intermediate_dir)/package_resources.stamp',
     'codegen_input_paths': [],
     'keystore_path': '<(DEPTH)/build/android/ant/chromium-debug.keystore',
     'unsigned_apk_path': '<(intermediate_dir)/<(apk_name)-unsigned.apk',
     '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
   # cannot be lifted in a dependent to all_dependent_settings.
   'all_dependent_settings': {
     'variables': {
       'apk_output_jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
     },
   },
   'conditions': [
@@ skipping 13 matching lines @@
     }],
     ['native_lib_target != "" and component == "shared_library"', {
       'dependencies': [
         '<(DEPTH)/build/android/setup.gyp:copy_system_libraries',
       ],
     }],
     ['native_lib_target != ""', {
       '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': {
             'input_libraries': ['<@(native_libs_paths)'],
           },
           'includes': ['../build/android/write_ordered_libraries.gypi'],
         },
         {
           'action_name': 'native_libraries_template_data_<(_target_name)',
           'message': 'Creating native_libraries_list.h for <(_target_name).',
@@ skipping 37 matching lines @@
             'stripped_libraries_dir': '<(libraries_source_dir)',
             'input_paths': ['<@(native_libs_paths)'],
           },
           'includes': ['../build/android/strip_native_libraries.gypi'],
         },
       ],
       'conditions': [
         ['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': [
             '<(DEPTH)/tools/android/md5sum/md5sum.gyp:md5sum',
           ],
           'actions': [
             {
               'includes': ['../build/android/push_libraries.gypi'],
             },
             {
@@ skipping 380 matching lines @@
         '--unsigned-apk-path=<(unsigned_apk_path)',
         '--final-apk-path=<(final_apk_path)',
         '--keystore-path=<(keystore_path)',
 
         # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
         '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
       ],
     },
   ],
 }