Bug 789217 - 0001. Add skeleton for keystore. r=khuey
authorChuck Lee <chulee@mozilla.com>
Tue, 01 Oct 2013 12:09:54 +0800
changeset 150643 fc2078bb8fb16af57ea87c8d3758d2fba79aa58c
parent 150642 8983fa259bd34b76a89fd9ff725ae60ecd418439
child 150644 f671257977b28b1ff7e8e8cd60092347d56dc851
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewerskhuey
bugs789217
milestone27.0a1
Bug 789217 - 0001. Add skeleton for keystore. r=khuey
ipc/keystore/Makefile.in
ipc/keystore/moz.build
ipc/moz.build
toolkit/library/Makefile.in
new file mode 100644
--- /dev/null
+++ b/ipc/keystore/Makefile.in
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+EXPORT_LIBRARY = 1
+include $(topsrcdir)/config/rules.mk
+include $(topsrcdir)/ipc/chromium/chromium-config.mk
new file mode 100644
--- /dev/null
+++ b/ipc/keystore/moz.build
@@ -0,0 +1,19 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+MODULE = 'ipc'
+
+EXPORTS.mozilla.ipc += [
+]
+
+CPP_SOURCES += [
+]
+
+FAIL_ON_WARNINGS = True
+
+LIBXUL_LIBRARY = True
+
+LIBRARY_NAME = 'mozkeystore_s'
--- a/ipc/moz.build
+++ b/ipc/moz.build
@@ -13,14 +13,14 @@ DIRS += [
 
 if CONFIG['MOZ_B2G_RIL']:
     DIRS += ['ril']
 
 if CONFIG['MOZ_B2G_BT']:
     DIRS += ['dbus']
 
 if CONFIG['MOZ_B2G_RIL'] or CONFIG['MOZ_B2G_BT']:
-    DIRS += ['unixsocket']
+    DIRS += ['unixsocket', 'keystore']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     DIRS += ['netd']
 
 TOOL_DIRS += ['app']
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -92,17 +92,17 @@ endif #}
 ifdef MOZ_B2G_BT #{
 STATIC_LIBS += mozdbus_s
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 OS_LIBS += -ldbus
 endif
 endif #}
 
 ifneq ($(strip $(MOZ_B2G_RIL)$(MOZ_B2G_BT)),) #{
-STATIC_LIBS += mozipcunixsocket_s
+STATIC_LIBS += mozipcunixsocket_s mozkeystore_s
 endif #}
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 STATIC_LIBS += moznetd_s
 endif
 
 ifdef MOZ_B2G_CAMERA #{
 OS_LIBS += -lstagefright -lstagefright_omx