Split apk-build.xml into 3 steps

android_webview/android_webview_tests.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.
 {
   'targets': [
     {
       'target_name': 'android_webview_test_java',
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:base_java_test_support',
         '../content/content.gyp:content_java_test_support',
         '../net/net.gyp:net_java_test_support',
         'android_webview_java',
         'libwebviewchromium',
       ],
       'variables': {
-        'java_in_dir': '../android_webview/javatests',

[Yaron, 2013/03/22 22:32:35]

Nice to see this fixed!

+        'java_in_dir': 'javatests',
         'has_java_resources': 1,
         'R_package': 'org.chromium.android_webview.test',
         'R_package_relpath': 'org/chromium/android_webview/test',
       },
       'includes': [ '../build/java.gypi' ],
     },
     {
       'target_name': 'android_webview_test_apk',
       'type': 'none',
       'dependencies': [
         'android_webview_test_java',
       ],
       'variables': {
         'apk_name': 'AndroidWebViewTest',
-        'java_in_dir': '../android_webview/test_apk',
+        'java_in_dir': 'test_apk',
         'is_test_apk': 0, # We want resources from android_webview_test_java.
         'additional_input_paths': [
           '<(PRODUCT_DIR)/android_webview_test_apk/assets/asset_file.html',
           '<(PRODUCT_DIR)/android_webview_test_apk/assets/asset_icon.png',
           '<(PRODUCT_DIR)/android_webview_test_apk/assets/full_screen_video_test.html',
         ],
       },
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)/android_webview_test_apk/assets',
           'files': [
             '<(java_in_dir)/assets/asset_file.html',
             '<(java_in_dir)/assets/asset_icon.png',
             '<(java_in_dir)/assets/full_screen_video_test.html',
           ],
         },
       ],
       'includes': [ '../build/java_apk.gypi' ],
     },
     {
       'target_name': 'android_webview_shell_apk',
       'type': 'none',
       'dependencies': [
         'android_webview_test_java',
         'android_webview_pak',
       ],
       'variables': {
         'apk_name': 'AndroidWebViewShell',
-        'java_in_dir': '../android_webview/shell_apk',
         'native_libs_paths': ['<(SHARED_LIB_DIR)/libwebviewchromium.so'],
-        'resource_dir': 'res',
+        'java_in_dir': 'shell_apk',
+        'resource_dir': 'shell_apk/res',
         'asset_location': '<(ant_build_out)/android_webview_apk/assets',
         'additional_input_paths': [
           '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
         ],
       },
       'includes': [ '../build/java_apk.gypi' ],
     },
     {
       'target_name': 'android_webview_unittests',
       'type': '<(gtest_target_type)',
@@ skipping 51 matching lines @@
         'android_webview_unittests_jni',
       ],
       'variables': {
         'test_suite_name': 'android_webview_unittests',
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)android_webview_unittests<(SHARED_LIB_SUFFIX)',
       },
       'includes': [ '../build/apk_test.gypi' ],
     },
   ],
 }