Commit a5d20a27 authored by cjhopman@chromium.org's avatar cjhopman@chromium.org

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
parent dbd38e81
...@@ -30,6 +30,8 @@ component("base") { ...@@ -30,6 +30,8 @@ component("base") {
"android/cpu_features.cc", "android/cpu_features.cc",
"android/event_log.cc", "android/event_log.cc",
"android/event_log.h", "android/event_log.h",
"android/field_trial_list.cc",
"android/field_trial_list.h",
"android/fifo_utils.cc", "android/fifo_utils.cc",
"android/fifo_utils.h", "android/fifo_utils.h",
"android/important_file_writer_android.cc", "android/important_file_writer_android.cc",
...@@ -1314,6 +1316,7 @@ if (is_android) { ...@@ -1314,6 +1316,7 @@ if (is_android) {
"android/java/src/org/chromium/base/ContentUriUtils.java", "android/java/src/org/chromium/base/ContentUriUtils.java",
"android/java/src/org/chromium/base/CpuFeatures.java", "android/java/src/org/chromium/base/CpuFeatures.java",
"android/java/src/org/chromium/base/EventLog.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/ImportantFileWriterAndroid.java",
"android/java/src/org/chromium/base/library_loader/LibraryLoader.java", "android/java/src/org/chromium/base/library_loader/LibraryLoader.java",
"android/java/src/org/chromium/base/MemoryPressureListener.java", "android/java/src/org/chromium/base/MemoryPressureListener.java",
......
...@@ -17,6 +17,8 @@ source_set("client") { ...@@ -17,6 +17,8 @@ source_set("client") {
"transfer_buffer.h", "transfer_buffer.h",
] ]
defines = [ "GPU_IMPLEMENTATION" ]
if (is_win) { if (is_win) {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations. # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
cflags = [ "/wd4267" ] # size_t to int truncation. cflags = [ "/wd4267" ] # size_t to int truncation.
...@@ -36,6 +38,8 @@ source_set("gles2_cmd_helper") { ...@@ -36,6 +38,8 @@ source_set("gles2_cmd_helper") {
"gles2_cmd_helper_autogen.h", "gles2_cmd_helper_autogen.h",
] ]
defines = [ "GLES2_IMPL_IMPLEMENTATION" ]
if (is_win) { if (is_win) {
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations. # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
cflags = [ "/wd4267" ] # size_t to int truncation. cflags = [ "/wd4267" ] # size_t to int truncation.
......
...@@ -21,9 +21,6 @@ source_set("common") { ...@@ -21,9 +21,6 @@ source_set("common") {
"gles2_cmd_format_autogen.h", "gles2_cmd_format_autogen.h",
"gles2_cmd_ids.h", "gles2_cmd_ids.h",
"gles2_cmd_ids_autogen.h", "gles2_cmd_ids_autogen.h",
"gles2_cmd_utils.cc",
"gles2_cmd_utils.h",
"gles2_utils_export.h",
"id_allocator.cc", "id_allocator.cc",
"id_allocator.h", "id_allocator.h",
"mailbox.cc", "mailbox.cc",
...@@ -34,9 +31,26 @@ source_set("common") { ...@@ -34,9 +31,26 @@ source_set("common") {
"time.h", "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 = [ deps = [
"//base", "//base",
] ]
all_dependent_configs = [ "//third_party/khronos:khronos_headers" ]
} }
...@@ -113,6 +113,8 @@ source_set("service") { ...@@ -113,6 +113,8 @@ source_set("service") {
"vertex_attrib_manager.cc", "vertex_attrib_manager.cc",
] ]
defines = [ "GPU_IMPLEMENTATION" ]
configs += [ configs += [
"//third_party/khronos:khronos_headers", "//third_party/khronos:khronos_headers",
] ]
......
...@@ -38,6 +38,8 @@ source_set("config") { ...@@ -38,6 +38,8 @@ source_set("config") {
"software_rendering_list_json.cc", "software_rendering_list_json.cc",
] ]
defines = [ "GPU_IMPLEMENTATION" ]
deps = [ deps = [
"//base", "//base",
"//third_party/re2", "//third_party/re2",
......
...@@ -8,6 +8,8 @@ source_set("ipc") { ...@@ -8,6 +8,8 @@ source_set("ipc") {
"gpu_command_buffer_traits.h", "gpu_command_buffer_traits.h",
] ]
defines = [ "GPU_IMPLEMENTATION" ]
configs += [ "//third_party/khronos:khronos_headers" ] configs += [ "//third_party/khronos:khronos_headers" ]
deps = [ deps = [
......
...@@ -34,6 +34,8 @@ source_set("bindings") { ...@@ -34,6 +34,8 @@ source_set("bindings") {
"lib/message_builder.cc", "lib/message_builder.cc",
"lib/message_builder.h", "lib/message_builder.h",
"lib/message_filter.cc", "lib/message_filter.cc",
"lib/message_header_validator.cc",
"lib/message_header_validator.h",
"lib/message_internal.h", "lib/message_internal.h",
"lib/message_queue.cc", "lib/message_queue.cc",
"lib/message_queue.h", "lib/message_queue.h",
......
...@@ -310,6 +310,13 @@ component("skia") { ...@@ -310,6 +310,13 @@ component("skia") {
sources += gypi_skia_pdf.sources sources += gypi_skia_pdf.sources
sources += gypi_values.skia_library_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 # GPU
if (skia_support_gpu) { if (skia_support_gpu) {
sources += gypi_skia_gpu.skgpu_sources sources += gypi_skia_gpu.skgpu_sources
...@@ -451,6 +458,11 @@ component("skia") { ...@@ -451,6 +458,11 @@ component("skia") {
sources -= [ sources -= [
"//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp",
"//third_party/skia/src/ports/SkFontConfigInterface_direct.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_fontconfig.cpp",
"//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
"//third_party/skia/src/ports/SkFontHost_FreeType.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
...@@ -509,9 +521,15 @@ component("skia") { ...@@ -509,9 +521,15 @@ component("skia") {
} }
if (is_android) { if (is_android) {
set_sources_assignment_filter([])
sources += [
"ext/platform_device_linux.cc",
]
set_sources_assignment_filter(sources_assignment_filter)
deps += [ deps += [
"//third_party/expat", "//third_party/expat",
"//third_party/freetype", "//third_party/freetype",
"//third_party/android_tools:cpu_features",
] ]
} }
......
...@@ -68,6 +68,7 @@ test("accessibility_unittests") { ...@@ -68,6 +68,7 @@ test("accessibility_unittests") {
generated_extensions_api("ax_gen") { generated_extensions_api("ax_gen") {
sources = [ "ax_enums.idl" ] sources = [ "ax_enums.idl" ]
deps = [ "//base/third_party/dynamic_annotations" ]
root_namespace = "" root_namespace = ""
impl_dir = "." impl_dir = "."
bundle = true bundle = true
......
...@@ -74,6 +74,7 @@ component("events") { ...@@ -74,6 +74,7 @@ component("events") {
":dom4_keycode_converter", ":dom4_keycode_converter",
":events_base", ":events_base",
":gesture_detection", ":gesture_detection",
"//base/third_party/dynamic_annotations",
"//skia", "//skia",
"//ui/gfx", "//ui/gfx",
"//ui/gfx/geometry", "//ui/gfx/geometry",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment