From a346e43352743f6501def421c181fd1d22e0c929 Mon Sep 17 00:00:00 2001 From: Garner Lee Date: Thu, 7 May 2015 17:21:00 -0400 Subject: [PATCH] Bug 884594 - Part 3 - Build support for ACE components. r=allstars.chh --- b2g/installer/package-manifest.in | 4 ++++ dom/secureelement/DOMSecureElement.manifest | 7 ------- dom/secureelement/moz.build | 7 +++++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in index 38009786f9c..c20e64db87e 100644 --- a/b2g/installer/package-manifest.in +++ b/b2g/installer/package-manifest.in @@ -439,6 +439,10 @@ @RESPATH@/components/TCPPresentationServer.js #ifdef MOZ_SECUREELEMENT +@RESPATH@/components/ACEService.js +@RESPATH@/components/ACEService.manifest +@RESPATH@/components/GPAccessRulesManager.js +@RESPATH@/components/GPAccessRulesManager.manifest @RESPATH@/components/SecureElement.js @RESPATH@/components/SecureElement.manifest @RESPATH@/components/UiccConnector.js diff --git a/dom/secureelement/DOMSecureElement.manifest b/dom/secureelement/DOMSecureElement.manifest index 9198dde1442..858227496ec 100644 --- a/dom/secureelement/DOMSecureElement.manifest +++ b/dom/secureelement/DOMSecureElement.manifest @@ -10,12 +10,5 @@ contract @mozilla.org/secureelement/session;1 {2b1809f8-17bd-4947-abd7-bdef14985 component {181ebcf4-5164-4e28-99f2-877ec6fa83b9} DOMSecureElement.js contract @mozilla.org/secureelement/channel;1 {181ebcf4-5164-4e28-99f2-877ec6fa83b9} -# component {cb8ccb1c-0e99-4a62-bf7d-11acc13848e0} DOMSecureElement.js -# contract @mozilla.org/secureelement/command;1 {cb8ccb1c-0e99-4a62-bf7d-11acc13848e0} - component {58bc6c7b-686c-47cc-8867-578a6ed23f4e} DOMSecureElement.js contract @mozilla.org/secureelement/response;1 {58bc6c7b-686c-47cc-8867-578a6ed23f4e} - - - - diff --git a/dom/secureelement/moz.build b/dom/secureelement/moz.build index 449badf3076..a38de8efa2e 100644 --- a/dom/secureelement/moz.build +++ b/dom/secureelement/moz.build @@ -13,14 +13,21 @@ if CONFIG['MOZ_SECUREELEMENT']: if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_SECUREELEMENT']: EXTRA_COMPONENTS += [ + 'gonk/ACEService.js', + 'gonk/ACEService.manifest', + 'gonk/GPAccessRulesManager.js', + 'gonk/GPAccessRulesManager.manifest', 'gonk/SecureElement.js', 'gonk/SecureElement.manifest', ] XPIDL_MODULE = 'dom_secureelement' XPIDL_SOURCES += [ + 'gonk/nsIAccessControlEnforcer.idl', + 'gonk/nsIAccessRulesManager.idl', 'gonk/nsISecureElementConnector.idl', ] EXTRA_JS_MODULES += [ + 'gonk/gp_consts.js', 'gonk/se_consts.js', 'SEUtils.jsm' ]