Move shared library copy and strip to java_apk.gypi

android_webview/android_webview.gyp

 # 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,
   },
   'targets': [
     {
       'target_name': 'libwebview',
@@ skipping 108 matching lines @@
         '../chrome/chrome_resources.gyp:packed_resources',
         '../content/content.gyp:content_java',
         '../media/media.gyp:media_java',
         '../net/net.gyp:net_java',
         '../ui/ui.gyp:ui_java',
         'libwebview',
       ],
       'variables': {
         'package_name': 'android_webview',
         'apk_name': 'AndroidWebView',
+        'manifest_package_name': 'org.chromium.android_webview',
         'java_in_dir': '../android_webview/java',
         'resource_dir': '../res',
-        'native_libs_paths': ['<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so'],
+        'native_libs_paths': ['<(SHARED_LIB_DIR)/libwebview.so'],
         'input_pak_files': [
           '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
           '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',
           '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
           '<(SHARED_INTERMEDIATE_DIR)/repack/en-US.pak',
         ],
         'copied_pak_files': [
           '<(PRODUCT_DIR)/android_webview/assets/chrome.pak',
           '<(PRODUCT_DIR)/android_webview/assets/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/android_webview/assets/resources.pak',
           '<(PRODUCT_DIR)/android_webview/assets/en-US.pak',
         ],
         'additional_input_paths': [ '<@(copied_pak_files)' ],
       },
-      'actions': [
-        {
-          'action_name': 'copy_and_strip_so',
-          'inputs': ['<(SHARED_LIB_DIR)/libwebview.so'],
-          'outputs': ['<(PRODUCT_DIR)/android_webview/libs/<(android_app_abi)/libwebview.so'],
-          'action': [
-            '<(android_strip)',
-            '--strip-unneeded',  # All symbols not needed for relocation.
-            '<@(_inputs)',
-            '-o',
-            '<@(_outputs)',
-          ],
-        },
-      ],
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)/android_webview/assets',
           'files': [ '<@(input_pak_files)' ]
         },
       ],
       'includes': [ '../build/java_apk.gypi' ],
     },
     {
       'target_name': 'android_webview_test_apk',
@@ skipping 22 matching lines @@
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)/android_webview_test/assets',
           'files': [ '<!@(find <(java_in_dir)/assets -type f -name "*")' ]
         },
       ],
       'includes': [ '../build/java_apk.gypi' ],
     },
   ],
 }