TBR syncslides: fixing discovery
Change-Id: I5a033201b9f14d886923f5db14ed86ec5fa88381
diff --git a/dart/Makefile b/dart/Makefile
index 0b8308a..4a06db5 100644
--- a/dart/Makefile
+++ b/dart/Makefile
@@ -37,7 +37,7 @@
APP_FLX_FILE := $(PWD)/build/app.flx
SYNCBASE_MOJO_DIR := $(PWD)/packages/syncbase/mojo_services/android
-DISCOVERY_MOJO_DIR := $(PWD)/packages/v23discovery/mojo_services/android
+DISCOVERY_MOJO_DIR := $(PWD)/packages/v23discovery/mojo_services/arm_android
MOJO_SHELL_CMD_PATH := /data/local/tmp/org.chromium.mojo.shell.cmd
SYNCSLIDES_SHORTCUT_NAME := SyncSlides
diff --git a/dart/lib/discovery/client.dart b/dart/lib/discovery/client.dart
index 0f84a39..02d790c 100644
--- a/dart/lib/discovery/client.dart
+++ b/dart/lib/discovery/client.dart
@@ -40,8 +40,10 @@
serviceAttrs['name'] = presentation.deck.name;
serviceAttrs['thumbnailkey'] = presentation.deck.thumbnail.key;
serviceAttrs['presentationid'] = presentation.key;
- discovery.Advertisement service = new discovery.Advertisement('s/v', []);
- ..attributes = serviceAttrs;
+ discovery.Advertisement service = new discovery.Advertisement(
+ _presentationInterfaceName,
+ [presentation.syncgroupName, presentation.thumbnailSyncgroupName])
+ ..attributes = serviceAttrs;
_advertisers[presentation.key] = await _discoveryClient.advertise(service);
diff --git a/dart/pubspec.lock b/dart/pubspec.lock
index 15d2911..a6f9cb3 100644
--- a/dart/pubspec.lock
+++ b/dart/pubspec.lock
@@ -390,7 +390,7 @@
name: syncbase
url: "https://pub.dartlang.org"
source: hosted
- version: "0.0.35"
+ version: "0.0.36"
test:
description:
name: test
@@ -417,9 +417,9 @@
version: "0.5.1"
v23discovery:
description:
- path: "../../../mojo/discovery"
- relative: true
- source: path
+ name: v23discovery
+ url: "https://pub.dartlang.org"
+ source: hosted
version: "0.0.17"
vector_math:
description:
diff --git a/dart/pubspec.yaml b/dart/pubspec.yaml
index 93d94a0..ac52bfa 100644
--- a/dart/pubspec.yaml
+++ b/dart/pubspec.yaml
@@ -5,7 +5,7 @@
path: "../../../../../flutter/packages/flutter"
logging: ">=0.11.2 <0.12.0"
mojo_services: ">=0.4.5 <0.5.0"
- syncbase: ">=0.0.34 <0.1.0"
+ syncbase: ">=0.0.36 <0.1.0"
v23discovery: ">=0.0.17 < 0.1.0"
uuid: ">=0.5.0 <0.6.0"
dev_dependencies: