commit 8dccaccdf6e9d9135d85c6b3e2d50e01f756cf4e
author Tim Brown <timbrown@chromium.org> Fri Dec 15 01:11:54 2017
committer Commit Bot <commit-bot@chromium.org> Fri Dec 15 01:11:54 2017
tree 5d645b3f7811f244f2dc069a6b2b4ee85ae33ab8
parent 28417458ac4dc79f68915079d0f283f682504cc0

Remove gconf and dconf from instrumented libraries

Use of gconf has been removed, and we depend on gsettings (in
libgio/libglib) instead of dconf directly.

Bug: 768027
Change-Id: I2c2dfb7f36db456c8c55af1041ad9497ddca07cd
Reviewed-on: https://chromium-review.googlesource.com/827677
Reviewed-by: Evgeniy Stepanov <eugenis@chromium.org>
Commit-Queue: Tim Brown <timbrown@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#524274}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: aebd73d251f2e05235274cda2ee8fd6383c513a8

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 0130392..8c1668f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -111,11 +111,9 @@
       ":libdbus-glib-1-2",
       ":libdbusmenu",
       ":libdbusmenu-glib4",
-      ":libdconf1",
       ":libexpat1",
       ":libffi6",
       ":libfontconfig1",
-      ":libgconf-2-4",
       ":libgcrypt11",
       ":libgdk-pixbuf2.0-0",
       ":libglib2.0-0",
@@ -462,13 +460,6 @@
     pre_build = "scripts/pre-build/autogen.sh"
   }
 
-  instrumented_library("libdconf1") {
-    extra_configure_flags = [
-      "--disable-static",
-      "--disable-introspection",
-    ]
-  }
-
   instrumented_library("libexpat1") {
     extra_configure_flags = [ "--disable-static" ]
   }
@@ -489,19 +480,6 @@
     patch = "patches/libfontconfig.${instrumented_libraries_platform}.diff"
   }
 
-  instrumented_library("libgconf-2-4") {
-    extra_configure_flags = [
-      "--disable-static",
-
-      # From debian/rules. (Even though --with-gtk=3.0 doesn't make sense.)
-      "--with-gtk=3.0",
-      "--disable-orbit",
-
-      # See above.
-      "--disable-introspection",
-    ]
-  }
-
   instrumented_library("libgcrypt11") {
     package_ldflags = [ "-Wl,-z,muldefs" ]
     extra_configure_flags = [

scripts/install-build-deps.sh

diff --git a/scripts/install-build-deps.sh b/scripts/install-build-deps.sh
index 975193b..f2c3b2d 100755
--- a/scripts/install-build-deps.sh
+++ b/scripts/install-build-deps.sh
@@ -28,11 +28,9 @@
 libdbus-glib-1-2 \
 libdbusmenu \
 libdbusmenu-glib4 \
-libdconf1 \
 libexpat1 \
 libffi6 \
 libfontconfig1 \
-libgconf-2-4 \
 libgcrypt11 \
 libgdk-pixbuf2.0-0 \
 libglib2.0-0 \