Move shared library copy and strip to java_apk.gypi

chrome/chrome_android.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.
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'chrome_android_paks.gypi', # Included for the list of pak resources.
   ],
@@ skipping 33 matching lines @@
       'type': 'none',
       'dependencies': [
         '../media/media.gyp:media_java',
         'chrome.gyp:chrome_java',
         'chrome_android_paks',
         'libchromiumtestshell',
       ],
       'variables': {
         'package_name': 'chromium_testshell',
         'apk_name': 'ChromiumTestShell',
+        'manifest_package_name': 'org.chromium.chrome.testshell',
         'java_in_dir': 'android/testshell/java',
         'resource_dir': '../res',
         'asset_location': '<(ant_build_out)/../assets/chrome',
-        'native_libs_paths': [ '<(PRODUCT_DIR)/chromium_testshell/libs/<(android_app_abi)/libchromiumtestshell.so', ],
+        'native_libs_paths': [ '<(SHARED_LIB_DIR)/libchromiumtestshell.so', ],
         'additional_input_paths': [ '<@(chrome_android_pak_output_resources)', ],
       },
-      'actions': [
-        {
-          'action_name': 'copy_and_strip_so',
-          'inputs': ['<(SHARED_LIB_DIR)/libchromiumtestshell.so'],
-          'outputs': ['<(PRODUCT_DIR)/chromium_testshell/libs/<(android_app_abi)/libchromiumtestshell.so'],
-          'action': [
-            '<(android_strip)',
-            '--strip-unneeded',
-            '<@(_inputs)',
-            '-o',
-            '<@(_outputs)',
-          ],
-        },
-      ],
       'includes': [ '../build/java_apk.gypi', ],
     },
     {
       'target_name': 'chromium_testshell_jni_headers',
       'type': 'none',
       'sources': [
         'android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java',
       ],
       'variables': {
         'jni_gen_dir': 'chromium_testshell',
@@ skipping 73 matching lines @@
       ],
       'copies': [
         {
           'destination': '<(chrome_android_pak_output_folder)',
           'files': [ '<@(chrome_android_pak_input_resources)' ],
         }
       ],
     },
   ],
 }