3 files changed, 26 insertions, 4 deletions
diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn
index 3153255..0d8d46fe 100644
--- a/device/bluetooth/BUILD.gn
+++ b/device/bluetooth/BUILD.gn
@@ -103,8 +103,6 @@ component("bluetooth") {
     "bluetooth_task_manager_win.h",
     "bluetooth_uuid.cc",
     "bluetooth_uuid.h",
-    "uribeacon/uri_encoder.cc",
-    "uribeacon/uri_encoder.h",
   ]
 
   defines = [ "DEVICE_BLUETOOTH_IMPLEMENTATION" ]
@@ -113,6 +111,7 @@ component("bluetooth") {
 
   deps = [
     ":strings",
+    "uribeacon",
     "//base",
     "//net",
     "//ui/base",
diff --git a/device/bluetooth/bluetooth.gyp b/device/bluetooth/bluetooth.gyp
index 5b3bcfd..1e4f7ed 100644
--- a/device/bluetooth/bluetooth.gyp
+++ b/device/bluetooth/bluetooth.gyp
@@ -16,6 +16,7 @@
         '../../net/net.gyp:net',
         '../../ui/base/ui_base.gyp:ui_base',
         'bluetooth_strings.gyp:device_bluetooth_strings',
+        'uribeacon',
       ],
       'defines': [
         'DEVICE_BLUETOOTH_IMPLEMENTATION',
@@ -106,8 +107,6 @@
         'bluetooth_task_manager_win.h',
         'bluetooth_uuid.cc',
         'bluetooth_uuid.h',
-        'uribeacon/uri_encoder.cc',
-        'uribeacon/uri_encoder.h',
       ],
       'conditions': [
         ['chromeos==1', {
@@ -158,6 +157,17 @@
       ],
     },
     {
+      'target_name': 'uribeacon',
+      'type': 'static_library',
+      'dependencies': [
+        '../../base/base.gyp:base',
+      ],
+      'sources': [
+        'uribeacon/uri_encoder.cc',
+        'uribeacon/uri_encoder.h'
+      ]
+    },
+    {
       # GN version: //device/bluetooth:mocks
       'target_name': 'device_bluetooth_mocks',
       'type': 'static_library',
diff --git a/device/bluetooth/uribeacon/BUILD.gn b/device/bluetooth/uribeacon/BUILD.gn
new file mode 100644
index 0000000..0c7d1d8
--- /dev/null
+++ b/device/bluetooth/uribeacon/BUILD.gn
@@ -0,0 +1,13 @@
+# Copyright 2015 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+component("uribeacon") {
+  sources = [
+    "uri_encoder.cc",
+    "uri_encoder.h",
+  ]
+  deps = [
+    "//base",
+  ]
+}