Remove the dependency to dbus-glib from from the remaining places.
BUG=156018 R=satorux@chromium.org TBR=jam@chromium.org,ben@chromium.org Review URL: https://codereview.chromium.org/11235031 git-svn-id: http://src.chromium.org/svn/trunk/src/build@163475 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
tfarina@chromium.org
Родитель
538ae8c633
Коммит
7e2f5ca539
|
|
@ -58,15 +58,15 @@ chromeos_dev_list="libbluetooth-dev libpulse-dev"
|
|||
# Packages need for development
|
||||
dev_list="apache2.2-bin bison curl elfutils fakeroot flex g++ gperf
|
||||
language-pack-fr libapache2-mod-php5 libasound2-dev libbz2-dev
|
||||
libcairo2-dev libcups2-dev libcurl4-gnutls-dev libdbus-glib-1-dev
|
||||
libelf-dev libgconf2-dev libgl1-mesa-dev libglib2.0-dev
|
||||
libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev
|
||||
libkrb5-dev libnspr4-dev libnss3-dev libpam0g-dev libsctp-dev
|
||||
libsqlite3-dev libssl-dev libudev-dev libwww-perl libxslt1-dev
|
||||
libxss-dev libxt-dev libxtst-dev mesa-common-dev patch
|
||||
perl php5-cgi pkg-config python python-cherrypy3 python-dev
|
||||
python-psutil rpm ruby subversion ttf-dejavu-core ttf-indic-fonts
|
||||
ttf-kochi-gothic ttf-kochi-mincho ttf-thai-tlwg wdiff git-core
|
||||
libcairo2-dev libcups2-dev libcurl4-gnutls-dev libelf-dev
|
||||
libgconf2-dev libgl1-mesa-dev libglib2.0-dev libglu1-mesa-dev
|
||||
libgnome-keyring-dev libgtk2.0-dev libkrb5-dev libnspr4-dev
|
||||
libnss3-dev libpam0g-dev libsctp-dev libsqlite3-dev libssl-dev
|
||||
libudev-dev libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev
|
||||
mesa-common-dev patch perl php5-cgi pkg-config python python-cherrypy3
|
||||
python-dev python-psutil rpm ruby subversion ttf-dejavu-core
|
||||
ttf-indic-fonts ttf-kochi-gothic ttf-kochi-mincho ttf-thai-tlwg wdiff
|
||||
git-core
|
||||
$chromeos_dev_list"
|
||||
|
||||
# 64-bit systems need a minimum set of 32-bit compat packages for the pre-built
|
||||
|
|
@ -80,8 +80,8 @@ fi
|
|||
chromeos_lib_list="libpulse0 libbz2-1.0 libcurl4-gnutls-dev"
|
||||
|
||||
# Full list of required run-time libraries
|
||||
lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libcups2 libdbus-glib-1-2
|
||||
libexpat1 libfontconfig1 libfreetype6 libglib2.0-0 libgnome-keyring0
|
||||
lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libcups2 libexpat1
|
||||
libfontconfig1 libfreetype6 libglib2.0-0 libgnome-keyring0
|
||||
libgtk2.0-0 libpam0g libpango1.0-0 libpcre3 libpixman-1-0
|
||||
libpng12-0 libstdc++6 libsqlite3-0 libudev0 libx11-6 libxau6 libxcb1
|
||||
libxcomposite1 libxcursor1 libxdamage1 libxdmcp6 libxext6 libxfixes3
|
||||
|
|
@ -89,14 +89,12 @@ lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libcups2 libdbus-glib-1-2
|
|||
$chromeos_lib_list"
|
||||
|
||||
# Debugging symbols for all of the run-time libraries
|
||||
dbg_list="libatk1.0-dbg libc6-dbg libcairo2-dbg libdbus-glib-1-2-dbg
|
||||
libfontconfig1-dbg libglib2.0-0-dbg libgtk2.0-0-dbg
|
||||
libpango1.0-0-dbg libpcre3-dbg libpixman-1-0-dbg
|
||||
libsqlite3-0-dbg
|
||||
libx11-6-dbg libxau6-dbg libxcb1-dbg libxcomposite1-dbg
|
||||
libxcursor1-dbg libxdamage1-dbg libxdmcp6-dbg libxext6-dbg
|
||||
libxfixes3-dbg libxi6-dbg libxinerama1-dbg libxrandr2-dbg
|
||||
libxrender1-dbg libxtst6-dbg zlib1g-dbg"
|
||||
dbg_list="libatk1.0-dbg libc6-dbg libcairo2-dbg libfontconfig1-dbg
|
||||
libglib2.0-0-dbg libgtk2.0-0-dbg libpango1.0-0-dbg libpcre3-dbg
|
||||
libpixman-1-0-dbg libsqlite3-0-dbg libx11-6-dbg libxau6-dbg
|
||||
libxcb1-dbg libxcomposite1-dbg libxcursor1-dbg libxdamage1-dbg
|
||||
libxdmcp6-dbg libxext6-dbg libxfixes3-dbg libxi6-dbg libxinerama1-dbg
|
||||
libxrandr2-dbg libxrender1-dbg libxtst6-dbg zlib1g-dbg"
|
||||
|
||||
# Plugin lists needed for tests.
|
||||
plugin_list="flashplugin-installer"
|
||||
|
|
|
|||
|
|
@ -112,28 +112,7 @@
|
|||
],
|
||||
},
|
||||
], # targets
|
||||
}, { # chromeos==1
|
||||
'targets': [
|
||||
{
|
||||
# TODO(satorux): Remove this once dbus-glib clients are gone.
|
||||
'target_name': 'dbus-glib',
|
||||
'type': 'none',
|
||||
'direct_dependent_settings': {
|
||||
'cflags': [
|
||||
'<!@(<(pkg-config) --cflags dbus-glib-1)',
|
||||
],
|
||||
},
|
||||
'link_settings': {
|
||||
'ldflags': [
|
||||
'<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',
|
||||
],
|
||||
'libraries': [
|
||||
'<!@(<(pkg-config) --libs-only-l dbus-glib-1)',
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
}]
|
||||
}],
|
||||
], # conditions
|
||||
'targets': [
|
||||
{
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче