Commit 743530fb authored by brettw@chromium.org's avatar brettw@chromium.org

More work on content/browser GN build.

Still not hooked up and not quite everything compiles but this should be the bulk of the functionality.

BUG=
R=scottmg@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276774 0039d316-1c4b-4281-b951-d872f2087c98
parent 5c10cca4
......@@ -63,3 +63,10 @@ enable_notifications = !is_android
# TODO(brettw) this should be moved to net and only dependents get this define.
disable_ftp_support = is_ios
# Speech input is compiled in by default. Set to 0 to disable.
# TODO(tommyw): Speech Input doesn't exist anymore. Clarify the scope
# of this flag (and probably rename it).
enable_speech_input = true
use_dbus = is_linux
......@@ -49,6 +49,8 @@ pkg_config("udev") {
packages = [ "libudev" ]
}
# Note: if your target also depends on //dbus, you don't need to add this
# config (it will get added automatically if you depend on //dbus).
pkg_config("dbus") {
packages = [ "dbus-1" ]
}
......@@ -157,8 +159,7 @@ generate_library_loader("gio") {
name = "LibGioLoader"
output_h = "libgio.h"
output_cc = "libgio_loader.cc"
# TODO(brettw) convert ti "<gio/gio.h>" once GN doesn't mangle <>.
header = "\"gio/gio.h\""
header = "<gio/gio.h>"
config = ":gio_config"
functions = [
......@@ -185,8 +186,7 @@ generate_library_loader("libpci") {
name = "LibPciLoader"
output_h = "libpci.h"
output_cc = "libpci_loader.cc"
# TODO(brettw) convert to "<pci/pci.h>" once GN doesn't mangle <>.
header = "\"pci/pci.h\""
header = "<pci/pci.h>"
config = ":libpci_config"
functions = [
......
# 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/protobuf/proto_library.gni")
proto_library("power_manager_proto") {
sources = [
"//third_party/cros_system_api/dbus/power_manager/input_event.proto",
"//third_party/cros_system_api/dbus/power_manager/peripheral_battery_status.proto",
"//third_party/cros_system_api/dbus/power_manager/policy.proto",
"//third_party/cros_system_api/dbus/power_manager/power_supply_properties.proto",
"//third_party/cros_system_api/dbus/power_manager/suspend.proto",
]
proto_in_dir = "//third_party/cros_system_api/dbus/power_manager"
proto_out_dir = "chromeos/dbus/power_manager"
}
This diff is collapsed.
This diff is collapsed.
......@@ -41,7 +41,7 @@ component("dbus") {
"//third_party/protobuf:protobuf_lite",
]
configs += [
direct_dependent_configs = [
"//build/config/linux:dbus",
]
}
......
......@@ -4,8 +4,8 @@
# Compile a protocol buffer.
#
# The 'proto_in_dir' variable must be the relative path to the
# directory containing the .proto files. If left out, it defaults to '.'.
# The 'proto_in_dir' variable is the path to the directory containing the
# .proto files. If left out, it defaults to '.'.
#
# The 'proto_out_dir' variable specifies the path suffix that output files are
# generated under. Targets that gyp-depend on my_proto_lib will be able to
......
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