BASELINE: Update Chromium to 64.0.3282.139

Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 19 insertions, 4 deletions

diff --git a/chromium/chromecast/chromecast.gni b/chromium/chromecast/chromecast.gni
index 9cb49f6f1a7..28cb5963894 100644
--- a/chromium/chromecast/chromecast.gni
+++ b/chromium/chromecast/chromecast.gni
@@ -50,12 +50,16 @@ declare_args() {
 
   # Set to true to start music apps in headless mode.
   enable_headless_music_mode = false
+
+  # Set to true to keep Android activities alive when they are moved to the
+  # background.
+  enable_background_activities = false
+
+  # Set the number of lines for LogcatExtractor to send.
+  logcat_extractor_size = 512
 }
 
 declare_args() {
-  # Currently android things libraries live in internal.
-  # TODO(njeff): change this when Android Things API is moved to public.
-  enable_athings_loopback = is_android_things && chromecast_branding != "public"
   enable_volume_tables_access =
       is_android_things && chromecast_branding != "public"
 }
@@ -87,14 +91,21 @@ foreach(target_type,
           "executable",
           "shared_library",
           "loadable_module",
+          "source_set",
         ]) {
   template("cast_${target_type}") {
     target(target_type, target_name) {
       forward_variables_from(invoker, "*")
+
+      configs += [ "//chromecast:cast_config" ]
+
       if (!defined(deps)) {
         deps = []
       }
-      deps += [ "//build/config:exe_and_shlib_deps" ]
+
+      if (target_type != "source_set") {
+        deps += [ "//build/config:exe_and_shlib_deps" ]
+      }
     }
   }
 }
@@ -119,3 +130,7 @@ set_defaults("cast_loadable_module") {
     configs -= [ "//build/config/android:hide_all_but_jni_onload" ]
   }
 }
+
+set_defaults("cast_source_set") {
+  configs = default_compiler_configs
+}