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

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/827677Reviewed-by: default avatarEvgeniy Stepanov <eugenis@chromium.org>
Commit-Queue: Tim Brown <timbrown@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524274}
parent e3d44eea
...@@ -111,11 +111,9 @@ if (use_locally_built_instrumented_libraries) { ...@@ -111,11 +111,9 @@ if (use_locally_built_instrumented_libraries) {
":libdbus-glib-1-2", ":libdbus-glib-1-2",
":libdbusmenu", ":libdbusmenu",
":libdbusmenu-glib4", ":libdbusmenu-glib4",
":libdconf1",
":libexpat1", ":libexpat1",
":libffi6", ":libffi6",
":libfontconfig1", ":libfontconfig1",
":libgconf-2-4",
":libgcrypt11", ":libgcrypt11",
":libgdk-pixbuf2.0-0", ":libgdk-pixbuf2.0-0",
":libglib2.0-0", ":libglib2.0-0",
...@@ -462,13 +460,6 @@ if (use_locally_built_instrumented_libraries) { ...@@ -462,13 +460,6 @@ if (use_locally_built_instrumented_libraries) {
pre_build = "scripts/pre-build/autogen.sh" pre_build = "scripts/pre-build/autogen.sh"
} }
instrumented_library("libdconf1") {
extra_configure_flags = [
"--disable-static",
"--disable-introspection",
]
}
instrumented_library("libexpat1") { instrumented_library("libexpat1") {
extra_configure_flags = [ "--disable-static" ] extra_configure_flags = [ "--disable-static" ]
} }
...@@ -489,19 +480,6 @@ if (use_locally_built_instrumented_libraries) { ...@@ -489,19 +480,6 @@ if (use_locally_built_instrumented_libraries) {
patch = "patches/libfontconfig.${instrumented_libraries_platform}.diff" 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") { instrumented_library("libgcrypt11") {
package_ldflags = [ "-Wl,-z,muldefs" ] package_ldflags = [ "-Wl,-z,muldefs" ]
extra_configure_flags = [ extra_configure_flags = [
......
...@@ -28,11 +28,9 @@ libdbus-1-3 \ ...@@ -28,11 +28,9 @@ libdbus-1-3 \
libdbus-glib-1-2 \ libdbus-glib-1-2 \
libdbusmenu \ libdbusmenu \
libdbusmenu-glib4 \ libdbusmenu-glib4 \
libdconf1 \
libexpat1 \ libexpat1 \
libffi6 \ libffi6 \
libfontconfig1 \ libfontconfig1 \
libgconf-2-4 \
libgcrypt11 \ libgcrypt11 \
libgdk-pixbuf2.0-0 \ libgdk-pixbuf2.0-0 \
libglib2.0-0 \ libglib2.0-0 \
......
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