Split apk-build.xml into 3 steps

android_webview/android_webview_tests.gypi

Index: android_webview/android_webview_tests.gypi
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index 998aba33491a99e38767d50158b0d72a33476275..379d677be3e9a433ae02b3235d8a71f767f22e9f 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -14,7 +14,7 @@
         'libwebviewchromium',
       ],
       'variables': {
-        'java_in_dir': '../android_webview/javatests',
+        'java_in_dir': 'javatests',
         'has_java_resources': 1,
         'R_package': 'org.chromium.android_webview.test',
         'R_package_relpath': 'org/chromium/android_webview/test',
@@ -29,7 +29,7 @@
       ],
       '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',
@@ -58,9 +58,9 @@
       ],
       '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',