Commit 4263a746 authored by Brett Wilson's avatar Brett Wilson

Make component build Chrome link.

It does not seem to run due to resource issues.

R=jamesr@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#294041}
parent 6559f20a
...@@ -172,7 +172,13 @@ pkg_config("gio_config") { ...@@ -172,7 +172,13 @@ pkg_config("gio_config") {
# (saucy) and earlier. Update the code to use # (saucy) and earlier. Update the code to use
# g_settings_schema_source_list_schemas instead. # g_settings_schema_source_list_schemas instead.
defines = [ "USE_GIO", "GLIB_DISABLE_DEPRECATION_WARNINGS" ] defines = [ "USE_GIO", "GLIB_DISABLE_DEPRECATION_WARNINGS" ]
ignore_libs = true # Loader generated below.
# TODO(brettw) Theoretically I think ignore_libs should be set so that we
# don't link directly to GIO and use the loader generated below. But the gio
# target in GYP doesn't make any sense to me and appears to link directly to
# GIO in addition to making a loader. This this uncommented, the link in
# component build fails, so I think this is closer to the GYP build.
#ignore_libs = true # Loader generated below.
} }
# This generates a target named "gio". # This generates a target named "gio".
......
...@@ -638,6 +638,7 @@ grit("resources") { ...@@ -638,6 +638,7 @@ grit("resources") {
":about_credits", ":about_credits",
":chrome_internal_resources_gen", ":chrome_internal_resources_gen",
"//chrome/browser/ui/webui/omnibox:mojo_bindings", "//chrome/browser/ui/webui/omnibox:mojo_bindings",
"//mojo/environment:chromium",
] ]
} }
......
...@@ -120,6 +120,7 @@ static_library("extensions") { ...@@ -120,6 +120,7 @@ static_library("extensions") {
"//build/config/linux:x11", "//build/config/linux:x11",
] ]
deps += [ deps += [
"//ui/events:events_base",
"//ui/events/platform", "//ui/events/platform",
"//ui/events/platform/x11", "//ui/events/platform/x11",
] ]
......
...@@ -187,7 +187,10 @@ static_library("ui") { ...@@ -187,7 +187,10 @@ static_library("ui") {
sources += rebase_path(gypi_values.chrome_browser_ui_ash_sources, sources += rebase_path(gypi_values.chrome_browser_ui_ash_sources,
".", "//chrome") ".", "//chrome")
deps += [ deps += [
"//ash",
"//ash:ash_with_content", "//ash:ash_with_content",
"//ash/strings",
"//components/user_manager",
] ]
if (!is_chromeos) { if (!is_chromeos) {
sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos, sources += rebase_path(gypi_values.chrome_browser_ui_ash_non_chromeos,
......
...@@ -26,10 +26,12 @@ source_set("renderer") { ...@@ -26,10 +26,12 @@ source_set("renderer") {
"//cc", "//cc",
"//cc/blink", "//cc/blink",
"//content:resources", "//content:resources",
"//content/public/child",
"//content/common:mojo_bindings", "//content/common:mojo_bindings",
"//content/public/child", "//content/public/child",
"//content/public/common", "//content/public/common",
"//gin", "//gin",
"//gpu",
"//jingle:jingle_glue", "//jingle:jingle_glue",
"//media", "//media",
"//media/blink", "//media/blink",
......
...@@ -64,6 +64,10 @@ proto_library("proto") { ...@@ -64,6 +64,10 @@ proto_library("proto") {
"protocol/checkin.proto", "protocol/checkin.proto",
"protocol/mcs.proto", "protocol/mcs.proto",
] ]
cc_generator_options = "dllexport_decl=GCM_EXPORT:"
cc_include = "google_apis/gcm/base/gcm_export.h"
defines = [ "GCM_IMPLEMENTATION" ]
} }
static_library("test_support") { static_library("test_support") {
......
...@@ -457,6 +457,8 @@ source_set("ppapi_ipc") { ...@@ -457,6 +457,8 @@ source_set("ppapi_ipc") {
"proxy/var_serialization_rules.h", "proxy/var_serialization_rules.h",
] ]
defines = [ "PPAPI_PROXY_IMPLEMENTATION" ]
deps = [ deps = [
":ppapi_c", ":ppapi_c",
":ppapi_shared", ":ppapi_shared",
......
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