Fixes for GN Android build inputs/outputs

chrome/android/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/module_args/v8.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
@@ skipping 202 matching lines @@
 shared_library("chrome_sync_shell") {
   testonly = true
   sources = [
     #"shell/chrome_shell_entry_point.cc",
     #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc",
     #"sync_shell/chrome_main_delegate_chrome_sync_shell_android.h",
   ]
   deps = [
     "//sync:test_support_sync_fake_server_android",
   ]
-  datadeps = [
-    ":chrome_shell_base",
-  ]
+  data_deps = [ ":chrome_shell_base" ]
 }
 
 # GYP: N/A
 android_resources("chrome_shell_resources") {
   deps = [
     ":chrome_java_resources",
   ]
   testonly = true
   resource_dirs = [ "shell/res" ]
   custom_package = "org.chromium.chrome.shell"
@@ skipping 228 matching lines @@
 android_apk("chrome_shell_test_apk") {
   testonly = true
   apk_under_test = ":chrome_shell_apk"
   deps = [
     ":chrome_javatests",
     ":chrome_shell_test_java",
     "//sync/android:sync_javatests",
     "//testing/android/broker:broker_java",
     "//ui/android:ui_javatests",
   ]
-  datadeps = [
-    "//testing/android/driver:driver_apk",
-  ]
+  data_deps = [ "//testing/android/driver:driver_apk" ]
   apk_name = "ChromeShellTest"
   android_manifest = "shell/javatests/AndroidManifest.xml"
 }
 
 # GYP: //chrome/chrome_tests.gypi:chrome_junit_tests
 junit_binary("chrome_junit_tests") {
   java_files = [
     "junit/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtilsTest.java",
     "junit/src/org/chromium/chrome/browser/omaha/ResponseParserTest.java",
     "junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java",
@@ skipping 248 matching lines @@
 
 copy_ex("chrome_public_apk_assets") {
   clear_dir = true
   dest = chrome_public_apk_assets_dir
   gypi_sources = chrome_android_paks_gypi.chrome_android_pak_input_resources
   cleaned_sources = rebase_path(gypi_sources, "<(PRODUCT_DIR)")
   sources = rebase_path(cleaned_sources, ".", root_out_dir)
   if (icu_use_data_file) {
     sources += [ "$root_build_dir/icudtl.dat" ]
   }
+  deps = [
+    "//chrome:packed_extra_resources",
+    "//chrome:packed_resources",
+    "//third_party/icu:icudata",
+  ]
 
   if (v8_use_external_startup_data) {
     sources += [
       "$root_build_dir/natives_blob.bin",
       "$root_build_dir/snapshot_blob.bin",
     ]
+    deps += [ "//v8" ]
   }
 
   sources += [ "$root_build_dir/resources.pak" ]
 }
 
 # GYP: //chrome/android/chrome_apk.gyp:chrome_apk_manifest
 jinja_template("chrome_public_apk_manifest") {
   input = "java_staging/AndroidManifest.xml"
   output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml"
   variables = jinja_variables + [ "min_sdk_version=16" ]
@@ skipping 59 matching lines @@
 
   # TODO(GYP,cjhopman): Does this need version code/name?
   apk_name = "ChromePublicTest"
   apk_under_test = ":chrome_public_apk"
   android_manifest = chrome_public_test_apk_manifest
   deps = [
     "//chrome/test/android:chrome_staging_test_support_java",
     "//chrome/android:chrome_staging_test_java",
   ]
 }