diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2016-01-28 14:43:22 -0800 |
|---|---|---|
| committer | Alex Vakulenko <avakulenko@google.com> | 2016-01-28 14:51:29 -0800 |
| commit | c5ba7e6da1a053ec9e90458e43a9b9eb5c947dfa (patch) | |
| tree | f602210fab1160807d0f39f32b04acea9a265598 | |
| parent | ec0b139f40c4b0b16025239e2710f349d1ea14f8 (diff) | |
| download | example-ledflasher-c5ba7e6da1a053ec9e90458e43a9b9eb5c947dfa.tar.gz | |
ledflasher: Removing brillo::Any from weaved's public APIs
Weaved replaces brillo::Any with base::Value in its client library,
so need to update clients.
Also this removes last D-Bus dependencies from ledflasher.
Bug: 26558300
Change-Id: I8265e06aca6f707dde6edbebeafe0b28b8eb17ff
| -rw-r--r-- | src/ledflasher/Android.mk | 3 | ||||
| -rw-r--r-- | src/ledflasher/ledflasher.cpp | 7 | ||||
| -rw-r--r-- | src/ledflasher/ledflasher.rc | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/ledflasher/Android.mk b/src/ledflasher/Android.mk index c385423..fde8150 100644 --- a/src/ledflasher/Android.mk +++ b/src/ledflasher/Android.mk @@ -30,11 +30,8 @@ LOCAL_SHARED_LIBRARIES := \ libbinderwrapper \ libbrillo \ libbrillo-binder \ - libbrillo-dbus \ libbrillo-stream \ libchrome \ - libchrome-dbus \ - libdbus \ libutils \ libweaved \ diff --git a/src/ledflasher/ledflasher.cpp b/src/ledflasher/ledflasher.cpp index 269c5be..de495f3 100644 --- a/src/ledflasher/ledflasher.cpp +++ b/src/ledflasher/ledflasher.cpp @@ -274,10 +274,9 @@ void Daemon::UpdateDeviceState() { if (!weave_service) return; - brillo::VariantDictionary state_change{ - {"_ledflasher.status", status_}, - {"_ledflasher.leds", leds}, - }; + base::DictionaryValue state_change; + state_change.SetString("_ledflasher.status", status_); + state_change.Set("_ledflasher.leds", brillo::ToValue(leds).release()); weave_service->SetStateProperties(kWeaveComponent, state_change, nullptr); } diff --git a/src/ledflasher/ledflasher.rc b/src/ledflasher/ledflasher.rc index a2c4fe9..8e2ac9d 100644 --- a/src/ledflasher/ledflasher.rc +++ b/src/ledflasher/ledflasher.rc @@ -1,4 +1,4 @@ service ledflasher /system/bin/ledflasher class late_start user system - group system dbus + group system |