Add missing files/deps/defines

TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/371903003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282804 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 53 insertions, 4 deletions

diff --git a/base/BUILD.gn b/base/BUILD.gn
index 9aacfc9..b5efa05 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -30,6 +30,8 @@ component("base") {
     "android/cpu_features.cc",
     "android/event_log.cc",
     "android/event_log.h",
+    "android/field_trial_list.cc",
+    "android/field_trial_list.h",
     "android/fifo_utils.cc",
     "android/fifo_utils.h",
     "android/important_file_writer_android.cc",
@@ -1314,6 +1316,7 @@ if (is_android) {
       "android/java/src/org/chromium/base/ContentUriUtils.java",
       "android/java/src/org/chromium/base/CpuFeatures.java",
       "android/java/src/org/chromium/base/EventLog.java",
+      "android/java/src/org/chromium/base/FieldTrialList.java",
       "android/java/src/org/chromium/base/ImportantFileWriterAndroid.java",
       "android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
       "android/java/src/org/chromium/base/MemoryPressureListener.java",
diff --git a/gpu/command_buffer/client/BUILD.gn b/gpu/command_buffer/client/BUILD.gn
index 91dcddb..dcabf99 100644
--- a/gpu/command_buffer/client/BUILD.gn
+++ b/gpu/command_buffer/client/BUILD.gn
@@ -17,6 +17,8 @@ source_set("client") {
     "transfer_buffer.h",
   ]
 
+  defines = [ "GPU_IMPLEMENTATION" ]
+
   if (is_win) {
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     cflags = [ "/wd4267" ]  # size_t to int truncation.
@@ -36,6 +38,8 @@ source_set("gles2_cmd_helper") {
     "gles2_cmd_helper_autogen.h",
   ]
 
+  defines = [ "GLES2_IMPL_IMPLEMENTATION" ]
+
   if (is_win) {
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     cflags = [ "/wd4267" ]  # size_t to int truncation.
diff --git a/gpu/command_buffer/common/BUILD.gn b/gpu/command_buffer/common/BUILD.gn
index 43b1940..a60626e 100644
--- a/gpu/command_buffer/common/BUILD.gn
+++ b/gpu/command_buffer/common/BUILD.gn
@@ -21,9 +21,6 @@ source_set("common") {
     "gles2_cmd_format_autogen.h",
     "gles2_cmd_ids.h",
     "gles2_cmd_ids_autogen.h",
-    "gles2_cmd_utils.cc",
-    "gles2_cmd_utils.h",
-    "gles2_utils_export.h",
     "id_allocator.cc",
     "id_allocator.h",
     "mailbox.cc",
@@ -34,9 +31,26 @@ source_set("common") {
     "time.h",
   ]
 
-  all_dependent_configs = [ "//third_party/khronos:khronos_headers" ]
+  defines = [ "GPU_IMPLEMENTATION" ]
+
+  deps = [
+    ":gles2_utils",
+    "//base",
+  ]
+}
+
+component("gles2_utils") {
+  sources = [
+    "gles2_cmd_utils.cc",
+    "gles2_cmd_utils.h",
+    "gles2_utils_export.h",
+  ]
+
+  defines = [ "GLES2_UTILS_IMPLEMENTATION" ]
 
   deps = [
     "//base",
   ]
+
+  all_dependent_configs = [ "//third_party/khronos:khronos_headers" ]
 }
diff --git a/gpu/command_buffer/service/BUILD.gn b/gpu/command_buffer/service/BUILD.gn
index c9f8f57..9f47469 100644
--- a/gpu/command_buffer/service/BUILD.gn
+++ b/gpu/command_buffer/service/BUILD.gn
@@ -113,6 +113,8 @@ source_set("service") {
     "vertex_attrib_manager.cc",
   ]
 
+  defines = [ "GPU_IMPLEMENTATION" ]
+
   configs += [
     "//third_party/khronos:khronos_headers",
   ]
diff --git a/gpu/config/BUILD.gn b/gpu/config/BUILD.gn
index 8e7b04d..6355197 100644
--- a/gpu/config/BUILD.gn
+++ b/gpu/config/BUILD.gn
@@ -38,6 +38,8 @@ source_set("config") {
     "software_rendering_list_json.cc",
   ]
 
+  defines = [ "GPU_IMPLEMENTATION" ]
+
   deps = [
     "//base",
     "//third_party/re2",
diff --git a/gpu/ipc/BUILD.gn b/gpu/ipc/BUILD.gn
index a6249bf..8f83ead 100644
--- a/gpu/ipc/BUILD.gn
+++ b/gpu/ipc/BUILD.gn
@@ -8,6 +8,8 @@ source_set("ipc") {
     "gpu_command_buffer_traits.h",
   ]
 
+  defines = [ "GPU_IMPLEMENTATION" ]
+
   configs += [ "//third_party/khronos:khronos_headers" ]
 
   deps = [
diff --git a/mojo/public/cpp/bindings/BUILD.gn b/mojo/public/cpp/bindings/BUILD.gn
index 3c13e88..bba3519 100644
--- a/mojo/public/cpp/bindings/BUILD.gn
+++ b/mojo/public/cpp/bindings/BUILD.gn
@@ -34,6 +34,8 @@ source_set("bindings") {
     "lib/message_builder.cc",
     "lib/message_builder.h",
     "lib/message_filter.cc",
+    "lib/message_header_validator.cc",
+    "lib/message_header_validator.h",
     "lib/message_internal.h",
     "lib/message_queue.cc",
     "lib/message_queue.h",
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index b9a0106..df86f1a 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -310,6 +310,13 @@ component("skia") {
   sources += gypi_skia_pdf.sources
   sources += gypi_values.skia_library_sources
 
+  if (cpu_arch == "arm") {
+    sources += [
+      "//third_party/skia/src/core/SkUtilsArm.cpp",
+      "//third_party/skia/src/core/SkUtilsArm.h",
+    ]
+  }
+
   # GPU
   if (skia_support_gpu) {
     sources += gypi_skia_gpu.skgpu_sources
@@ -451,6 +458,11 @@ component("skia") {
     sources -= [
       "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
       "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp",
+    ]
+  }
+
+  if (!is_linux && !is_android) {
+    sources -= [
       "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
@@ -509,9 +521,15 @@ component("skia") {
   }
 
   if (is_android) {
+    set_sources_assignment_filter([])
+    sources += [
+      "ext/platform_device_linux.cc",
+    ]
+    set_sources_assignment_filter(sources_assignment_filter)
     deps += [
       "//third_party/expat",
       "//third_party/freetype",
+      "//third_party/android_tools:cpu_features",
     ]
   }
 
diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn
index 64e39c9..97c6e5a 100644
--- a/ui/accessibility/BUILD.gn
+++ b/ui/accessibility/BUILD.gn
@@ -68,6 +68,7 @@ test("accessibility_unittests") {
 
 generated_extensions_api("ax_gen") {
   sources = [ "ax_enums.idl" ]
+  deps = [ "//base/third_party/dynamic_annotations" ]
   root_namespace = ""
   impl_dir = "."
   bundle = true
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index 40a4ade..acfc671 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -74,6 +74,7 @@ component("events") {
     ":dom4_keycode_converter",
     ":events_base",
     ":gesture_detection",
+    "//base/third_party/dynamic_annotations",
     "//skia",
     "//ui/gfx",
     "//ui/gfx/geometry",