Skip to content

Commit

Permalink
Add missing files/deps/defines
Browse files Browse the repository at this point in the history
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
  • Loading branch information
cjhopman@chromium.org committed Jul 12, 2014
1 parent dbd38e8 commit a5d20a2
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 4 deletions.
3 changes: 3 additions & 0 deletions base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 4 additions & 0 deletions gpu/command_buffer/client/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down
22 changes: 18 additions & 4 deletions gpu/command_buffer/common/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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" ]
}
2 changes: 2 additions & 0 deletions gpu/command_buffer/service/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ source_set("service") {
"vertex_attrib_manager.cc",
]

defines = [ "GPU_IMPLEMENTATION" ]

configs += [
"//third_party/khronos:khronos_headers",
]
Expand Down
2 changes: 2 additions & 0 deletions gpu/config/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ source_set("config") {
"software_rendering_list_json.cc",
]

defines = [ "GPU_IMPLEMENTATION" ]

deps = [
"//base",
"//third_party/re2",
Expand Down
2 changes: 2 additions & 0 deletions gpu/ipc/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ source_set("ipc") {
"gpu_command_buffer_traits.h",
]

defines = [ "GPU_IMPLEMENTATION" ]

configs += [ "//third_party/khronos:khronos_headers" ]

deps = [
Expand Down
2 changes: 2 additions & 0 deletions mojo/public/cpp/bindings/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
18 changes: 18 additions & 0 deletions skia/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
]
}

Expand Down
1 change: 1 addition & 0 deletions ui/accessibility/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ui/events/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ component("events") {
":dom4_keycode_converter",
":events_base",
":gesture_detection",
"//base/third_party/dynamic_annotations",
"//skia",
"//ui/gfx",
"//ui/gfx/geometry",
Expand Down

0 comments on commit a5d20a2

Please sign in to comment.