android_webview: remove All target to fix build issue.

Remove the All target and instead add the extra dependencies to
libwebviewchromium, making that the new root of the dependency tree when
building with android_webview_build==1. This also requires making
android_webview_java a conditionally defined target, since using
android_webview.gyp as the root would otherwise start building it.

This is to avoid needing to depend on a shared library target during the
build, as currently that doesn't work on 64-bit android builds.

BUG=358141
R=benm@chromium.org

Review URL: https://codereview.chromium.org/218943004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260538 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 46 insertions, 59 deletions

diff --git a/android_webview/all_webview.gyp b/android_webview/all_webview.gyp
deleted file mode 100644
index a630cf2..0000000
--- a/android_webview/all_webview.gyp
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 is used as the top-level gyp file for building WebView in the Android
-# tree. It should depend only on native code, as we cannot currently generate
-# correct makefiles to build Java code via gyp in the Android tree.
-
-{
-  'targets': [
-    {
-      'target_name': 'All',
-      'type': 'none',
-      'dependencies': [
-        'android_webview.gyp:libwebviewchromium',
-
-        # Needed by android_webview_java
-        # Generated java files from templates should then be listed in android_webview/Android.mk
-        '../base/base.gyp:base_java_application_state',
-        '../base/base.gyp:base_java_memory_pressure_level_list',
-        '../content/content.gyp:gesture_event_type_java',
-        '../content/content.gyp:page_transition_types_java',
-        '../content/content.gyp:popup_item_type_java',
-        '../content/content.gyp:result_codes_java',
-        '../content/content.gyp:screen_orientation_values_java',
-        '../content/content.gyp:speech_recognition_error_java',
-        '../media/media.gyp:media_android_imageformat_list',
-        '../net/net.gyp:certificate_mime_types_java',
-        '../net/net.gyp:cert_verify_status_android_java',
-        '../net/net.gyp:net_errors_java',
-        '../net/net.gyp:private_key_types_java',
-        '../ui/android/ui_android.gyp:window_open_disposition_java',
-        '../ui/android/ui_android.gyp:bitmap_format_java',
-      ],
-    }, # target_name: All
-  ],  # targets
-}
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index ef872cc..bc28dc2 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -5,13 +5,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'conditions': [
-    ['android_webview_build==0', {
-      'includes': [
-        'android_webview_tests.gypi',
-      ],
-    }],
-  ],
   'targets': [
     {
       'target_name': 'libwebviewchromium',
@@ -26,6 +19,28 @@
         [ 'android_webview_build==0', {
           'product_prefix': 'libstandalone',
         }],
+        [ 'android_webview_build==1', {
+          # When building inside the android tree we also need to depend on all
+          # the java sources generated from templates which will be needed by
+          # android_webview_java in android_webview/Android.mk.
+          'dependencies': [
+            '../base/base.gyp:base_java_application_state',
+            '../base/base.gyp:base_java_memory_pressure_level_list',
+            '../content/content.gyp:gesture_event_type_java',
+            '../content/content.gyp:page_transition_types_java',
+            '../content/content.gyp:popup_item_type_java',
+            '../content/content.gyp:result_codes_java',
+            '../content/content.gyp:screen_orientation_values_java',
+            '../content/content.gyp:speech_recognition_error_java',
+            '../media/media.gyp:media_android_imageformat_list',
+            '../net/net.gyp:certificate_mime_types_java',
+            '../net/net.gyp:cert_verify_status_android_java',
+            '../net/net.gyp:net_errors_java',
+            '../net/net.gyp:private_key_types_java',
+            '../ui/android/ui_android.gyp:window_open_disposition_java',
+            '../ui/android/ui_android.gyp:bitmap_format_java',
+          ],
+        }],
         [ 'android_webview_build==1 and use_system_skia==0', {
           # When not using the system skia there are linker warnings about
           # overriden hidden symbols which there's no easy way to eliminate;
@@ -210,19 +225,28 @@
         'renderer/print_web_view_helper_linux.cc',
       ],
     },
-    {
-      'target_name': 'android_webview_java',
-      'type': 'none',
-      'dependencies': [
-        '../components/components.gyp:navigation_interception_java',
-        '../components/components.gyp:web_contents_delegate_android_java',
-        '../content/content.gyp:content_java',
-        '../ui/android/ui_android.gyp:ui_java',
+  ],
+  'conditions': [
+    ['android_webview_build==0', {
+      'includes': [
+        'android_webview_tests.gypi',
       ],
-      'variables': {
-        'java_in_dir': '../android_webview/java',
-      },
-      'includes': [ '../build/java.gypi' ],
-    },
+      'targets': [
+        {
+          'target_name': 'android_webview_java',
+          'type': 'none',
+          'dependencies': [
+            '../components/components.gyp:navigation_interception_java',
+            '../components/components.gyp:web_contents_delegate_android_java',
+            '../content/content.gyp:content_java',
+            '../ui/android/ui_android.gyp:ui_java',
+          ],
+          'variables': {
+            'java_in_dir': '../android_webview/java',
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
+      ],
+    }],
   ],
 }
diff --git a/android_webview/tools/gyp_webview b/android_webview/tools/gyp_webview
index 3b7f8aa..4f7c2d8 100755
--- a/android_webview/tools/gyp_webview
+++ b/android_webview/tools/gyp_webview
@@ -49,8 +49,8 @@ fi
 
 export GYP_DEFINES="${GYP_DEFINES} ${DEFINES}"
 
-FLAGS="-f android -Gdefault_target=All -Glimit_to_target_all=1 "\
-"--depth=${CHROME_SRC} ${CHROME_SRC}/android_webview/all_webview.gyp"
+FLAGS="-f android -Gdefault_target=libwebviewchromium -Glimit_to_target_all=1 "\
+"--depth=${CHROME_SRC} ${CHROME_SRC}/android_webview/android_webview.gyp"
 
 for host_os in linux mac; do
   host_platform=$(echo $host_os | sed -e 's/mac/darwin/')