Commit a28f4d06 authored by Tim Brown's avatar Tim Brown Committed by Commit Bot

Remove use_gconf build flag

All usages of gconf have now been removed, so we can remove the build
flag too. After this, I will remove gconf from the instrumented
libraries, sysroots, and install-build-deps.sh.

Bug: 768027
Change-Id: Idf5e8d60da387b3287f875092feba488217ca642
Reviewed-on: https://chromium-review.googlesource.com/826046Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Tim Brown <timbrown@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524120}
parent 3085594d
...@@ -35,7 +35,6 @@ enable_remoting = false ...@@ -35,7 +35,6 @@ enable_remoting = false
use_alsa = false use_alsa = false
use_cups = false use_cups = false
use_dbus = false use_dbus = false
use_gconf = false
use_gio = false use_gio = false
use_kerberos = false use_kerberos = false
use_libpci = false use_libpci = false
......
...@@ -50,11 +50,6 @@ declare_args() { ...@@ -50,11 +50,6 @@ declare_args() {
use_dbus = is_linux && !is_chromecast use_dbus = is_linux && !is_chromecast
# Option controlling the use of GConf (the classic GNOME configuration
# system).
use_gconf = is_linux && !is_chromeos && !is_chromecast &&
current_toolchain == default_toolchain
use_gio = is_linux && !is_chromeos && !is_chromecast use_gio = is_linux && !is_chromeos && !is_chromecast
} }
# #
......
...@@ -7,12 +7,10 @@ import("//build/config/linux/gtk/gtk.gni") ...@@ -7,12 +7,10 @@ import("//build/config/linux/gtk/gtk.gni")
import("//build/config/linux/pkg_config.gni") import("//build/config/linux/pkg_config.gni")
import("//build/config/ui.gni") import("//build/config/ui.gni")
# CrOS doesn't install GTK, gconf or any gnome packages. # CrOS doesn't install GTK or any gnome packages.
assert(!is_chromeos) assert(!is_chromeos)
# These packages should _only_ be expected when building for a target. # These packages should _only_ be expected when building for a target.
# If these extra checks are not run, gconf is required when building host
# tools for a CrOS build.
assert(current_toolchain == default_toolchain) assert(current_toolchain == default_toolchain)
if (use_atk) { if (use_atk) {
......
# Copyright 2016 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("//build/config/features.gni")
import("//build/config/linux/pkg_config.gni")
# CrOS doesn't install GTK, gconf or any gnome packages.
assert(!is_chromeos && use_gconf)
# These packages should _only_ be expected when building for a target.
# If these extra checks are not run, gconf is required when building host
# tools for a CrOS build.
assert(current_toolchain == default_toolchain)
pkg_config("gconf") {
packages = [ "gconf-2.0" ]
defines = [ "USE_GCONF" ]
}
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