Android WebView: tidy up source/gyp layout.

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',
       'type': 'shared_library',
       'dependencies': [
         '<(DEPTH)/chrome/chrome.gyp:browser',
         '<(DEPTH)/chrome/chrome.gyp:renderer',
         '<(DEPTH)/content/content.gyp:content',
         '<(DEPTH)/android_webview/native/webview_native.gyp:webview_native',
         '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android',
         '<(DEPTH)/chrome/browser/component/components.gyp:browser_component_jni_headers',
       ],
       'include_dirs': [
-        '../..',
-        '../../skia/config',
+        '<(DEPTH)',
+        '<(DEPTH)/skia/config',
       ],
       'sources': [
-        'aw_browser_dependency_factory_impl.cc',
-        'aw_browser_dependency_factory_impl.h',
-        'aw_content_browser_client.cc',
-        'aw_content_browser_client.h',
-        'main/webview_entry_point.cc',
-        'main/webview_main_delegate.cc',
-        'main/webview_main_delegate.h',
-        'main/webview_stubs.cc',
-      ],
-      'includes': [
-        '../aw_browser.gypi',
+        'browser/renderer_host/aw_resource_dispatcher_host_delegate.cc',
+        'browser/renderer_host/aw_resource_dispatcher_host_delegate.h',
+        'lib/aw_browser_dependency_factory_impl.cc',
+        'lib/aw_browser_dependency_factory_impl.h',
+        'lib/aw_content_browser_client.cc',
+        'lib/aw_content_browser_client.h',
+        'lib/main/aw_main_delegate.cc',
+        'lib/main/aw_main_delegate.h',
+        'lib/main/webview_entry_point.cc',
+        'lib/main/webview_stubs.cc',
       ],
     },
     {
       'target_name': 'android_webview',
       'type' : 'none',
       'dependencies': [
         'libwebview',
       ],
       'variables': {
-        'install_binary_script': '../build/install_binary',
+        'install_binary_script': 'build/install_binary',
       },
       'actions': [
         {
           'action_name': 'libwebview_strip_and_install_in_android',
           'inputs': [
             '<(SHARED_LIB_DIR)/libwebview.so',
           ],
           'outputs': [
             '<(android_product_out)/obj/lib/libwebview.so',
             '<(android_product_out)/system/lib/libwebview.so',
@@ skipping 11 matching lines @@
       'target_name': 'android_webview_java',
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/content/content.gyp:content_java',
         '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android_java',
       ],
       'variables': {
         'package_name': 'android_webview_java',
         'java_in_dir': '<(DEPTH)/android_webview/java',
       },
-      'includes': [ '../../build/java.gypi' ],
+      'includes': [ '../build/java.gypi' ],
     },
     {
       'target_name': 'android_webview_javatests',
       'type': 'none',
       'dependencies': [
         'android_webview_java',
         '<(DEPTH)/base/base.gyp:base_java_test_support',
         '<(DEPTH)/content/content.gyp:content_java',
         '<(DEPTH)/content/content.gyp:content_javatests',
         '<(DEPTH)/chrome/browser/component/components.gyp:web_contents_delegate_android_java',
       ],
       'variables': {
         'package_name': 'android_webview_javatests',
         'java_in_dir': '<(DEPTH)/android_webview/javatests',
       },
-      'includes': [ '../../build/java.gypi' ],
+      'includes': [ '../build/java.gypi' ],
     },
 
     {
       'target_name': 'android_webview_apk',
       'type': 'none',
       'actions': [
       {
         'action_name': 'copy_base_jar',
         'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'],
         'outputs': ['<(PRODUCT_DIR)/android_webview/java/libs/chromium_base.jar'],
@@ skipping 189 matching lines @@
             '-DANDROID_SDK_VERSION=<(android_sdk_version)',
             '-DANDROID_TOOLCHAIN=<(android_toolchain)',
             '-buildfile',
             '<(DEPTH)/android_webview/javatests/android_webview_test_apk.xml',
           ]
         }
       ],
     },
   ],
 }