Compile delta_generator and payload_consumer when "dbus" is disabled.
delta_generator and payload_consumer should not depend on any DBus
library. This patch now builds those even when "dbus" is disabled.
Bug: 25773375
TEST=`mma` on a target with DBus disabled.
Change-Id: Ia44cb9eed847e6d2eeb43a12373929128ae67d1c
diff --git a/update_engine.gyp b/update_engine.gyp
index 2f1144b..c21edc2 100644
--- a/update_engine.gyp
+++ b/update_engine.gyp
@@ -46,6 +46,7 @@
'defines': [
'_FILE_OFFSET_BITS=64',
'_POSIX_C_SOURCE=199309L',
+ 'USE_DBUS=<(USE_dbus)',
'USE_HWID_OVERRIDE=<(USE_hwid_override)',
'USE_MTD=<(USE_mtd)',
'USE_POWER_MANAGEMENT=<(USE_power_management)',
@@ -118,7 +119,6 @@
'type': 'static_library',
'dependencies': [
'update_metadata-protos',
- 'update_engine-other-dbus-proxies',
],
#TODO(deymo): Remove unused dependencies once we stop including files
# from the root directory.
@@ -126,13 +126,7 @@
'exported_deps': [
'libcrypto',
'libcurl',
- 'libdebugd-client',
- 'libsession_manager-client',
- 'libpower_manager-client',
- 'libupdate_engine-client',
- 'libshill-client',
'libssl',
- 'expat',
'xz-embedded',
],
'deps': ['<@(exported_deps)'],
@@ -152,7 +146,6 @@
},
'libraries': [
'-lbz2',
- '-lpolicy-<(libbase_ver)',
'-lrootdev',
'-lrt',
'-lvboot_host',
@@ -217,17 +210,13 @@
'variables': {
'exported_deps': [
'dbus-1',
- 'libcrypto',
- 'libcurl',
'libdebugd-client',
'libsession_manager-client',
'libmetrics-<(libbase_ver)',
'libpower_manager-client',
'libupdate_engine-client',
'libshill-client',
- 'libssl',
'expat',
- 'xz-embedded',
],
'deps': ['<@(exported_deps)'],
},
@@ -318,7 +307,7 @@
'target_name': 'libpayload_generator',
'type': 'static_library',
'dependencies': [
- 'libupdate_engine',
+ 'libpayload_consumer',
'update_metadata-protos',
],
'variables': {
@@ -370,7 +359,7 @@
'target_name': 'delta_generator',
'type': 'executable',
'dependencies': [
- 'libupdate_engine',
+ 'libpayload_consumer',
'libpayload_generator',
],
'link_settings': {