Backed out changeset 80987d26adfb (bug 1129650) for intermittent OSX packaging failures.

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2015-02-25 11:15:44 -05:00
parent 6e9dbbe5ea
commit 336d47fdb2
4 changed files with 16 additions and 7 deletions

View File

@ -536,6 +536,9 @@
@RESPATH@/components/Webapps.manifest
@RESPATH@/components/AppsService.js
@RESPATH@/components/AppsService.manifest
@RESPATH@/components/nsDOMIdentity.js
@RESPATH@/components/nsIDService.js
@RESPATH@/components/Identity.manifest
@RESPATH@/components/recording-cmdline.js
@RESPATH@/components/recording-cmdline.manifest
@RESPATH@/components/htmlMenuBuilder.js

View File

@ -89,6 +89,7 @@ DIRS += [
'indexedDB',
'system',
'ipc',
'identity',
'workers',
'camera',
'audiochannel',
@ -140,7 +141,6 @@ if CONFIG['MOZ_SECUREELEMENT']:
if CONFIG['MOZ_B2G']:
DIRS += [
'downloads',
'identity',
'mobileid',
'engineeringmode'
]

View File

@ -241,6 +241,7 @@ WEBIDL_FILES = [
'IDBRequest.webidl',
'IDBTransaction.webidl',
'IDBVersionChangeEvent.webidl',
'Identity.webidl',
'ImageCapture.webidl',
'ImageData.webidl',
'ImageDocument.webidl',
@ -823,8 +824,3 @@ if CONFIG['MOZ_PAY']:
WEBIDL_FILES += [
'MozPaymentProvider.webidl'
]
if CONFIG['MOZ_B2G']:
WEBIDL_FILES += [
'Identity.webidl'
]

View File

@ -1,7 +1,7 @@
[DEFAULT]
head = head_identity.js
tail = tail_identity.js
skip-if = (appname != "b2g" || toolkit == 'gonk')
skip-if = toolkit == 'gonk'
support-files =
data/idp_1/.well-known/browserid
data/idp_invalid_1/.well-known/browserid
@ -14,11 +14,21 @@ support-files =
[test_identity_utils.js]
[test_log_utils.js]
[test_authentication.js]
# Identity modules aren't packaged on Android.
skip-if = os == "android"
[test_crypto_service.js]
skip-if = os == "android"
[test_identity.js]
skip-if = os == "android"
[test_jwcrypto.js]
skip-if = os == "android"
[test_observer_topics.js]
skip-if = os == "android"
[test_provisioning.js]
skip-if = os == "android"
[test_relying_party.js]
skip-if = os == "android"
[test_store.js]
[test_well-known.js]
# Bug 905340 - http port dependency causes failure on Android 4.0
skip-if = os == "android"