Separate desktop and mobile media player controls image resources.

third_party/WebKit/public/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("//third_party/WebKit/Source/config.gni")
 import("//tools/grit/grit_rule.gni")
 
 blink_headers_values = exec_script("//build/gypi_to_gn.py",
-                                  [ rebase_path("blink_headers.gypi") ],
+                                   [ rebase_path("blink_headers.gypi") ],

[philipj_slow, 2015/10/21 11:19:49]

This and a bunch of other changes in this file looks unintentional, right?

                                    "scope",
-                                  [ "blink_headers.gypi" ])
-
+                                   [ "blink_headers.gypi" ])
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 # GYP version: WebKit/public/blink.gyp:blink
 group("blink") {
   public_deps = [
     ":blink_headers",
     ":blink_minimal",
@@ skipping 54 matching lines @@
   if (debug_devtools) {
     defines = [ "DEBUG_DEVTOOLS=1" ]
   }
 }
 
 if (is_android) {
   # GYP version: WebKit/public/blink_headers.gyp:web_input_event_java
   # GYP version: WebKit/public/blink_headers.gyp:web_text_input_type
   java_cpp_enum("blink_headers_java_enums_srcjar") {
     sources = [
+      "./platform/WebDisplayMode.h",
       "./web/WebInputEvent.h",
       "./web/WebTextInputType.h",
-      "./platform/WebDisplayMode.h",
     ]
     outputs = [
       "org/chromium/blink_public/platform/WebDisplayMode.java",
       "org/chromium/blink_public/web/WebInputEventModifier.java",
       "org/chromium/blink_public/web/WebInputEventType.java",
       "org/chromium/blink_public/web/WebTextInputFlags.java",
     ]
   }
 
   # GYP version: WebKit/public/blink_headers.gyp:blink_headers_java
   android_library("blink_headers_java") {
-    srcjar_deps = [
-      ":blink_headers_java_enums_srcjar",
-    ]
+    srcjar_deps = [ ":blink_headers_java_enums_srcjar" ]
   }
 }
 
 # Depend on this target to use public blink API headers for things like enums
 # and public structures without actually linking against any Blink libraries.
 source_set("blink_headers") {
   public_configs = [
     ":blink_headers_config",
+
     # Blink exposes icu headers in the public API.
     "//third_party/icu:icu_config",
+
     # Blink exposes NPAPI headers in the public API.
     "//third_party/npapi:npapi_config",
   ]
   sources = blink_headers_values.blink_public_sources
 }
 
 # GYP version: WebKit/public/blink_devtools.gyp:blink_devtools_frontend_resources
 group("blink_devtools_frontend_resources") {
   public_deps = [
     "//third_party/WebKit/Source/devtools:devtools_frontend_resources",
@@ skipping 21 matching lines @@
       "-D",
       "use_concatenated_impulse_responses",
     ]
   }
 }
 
 # GYP version: WebKit/public/blink_resources.gyp:blink_image_resources
 grit("image_resources") {
   output_dir = "$root_gen_dir/blink/public/resources"
   use_qualified_include = true
+  if (is_android) {
+    platform_type = "mobile"
+  } else {
+    platform_type = "desktop"
+  }
   source = "blink_image_resources.grd"
   outputs = [
     "grit/blink_image_resources.h",
     "blink_image_resources_100_percent.pak",
     "blink_image_resources_200_percent.pak",
   ]
+  grit_flags = [
+    "-E",
+    "platform_type=" + platform_type,
+  ]
 }