diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /toolkit/components/passwordmgr/moz.build | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'toolkit/components/passwordmgr/moz.build')
| -rw-r--r-- | toolkit/components/passwordmgr/moz.build | 42 |
1 files changed, 11 insertions, 31 deletions
diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build index e54e6ba2d..79777a981 100644 --- a/toolkit/components/passwordmgr/moz.build +++ b/toolkit/components/passwordmgr/moz.build @@ -7,17 +7,6 @@ if CONFIG['MOZ_PHOENIX']: DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True -MOCHITEST_MANIFESTS += ['test/mochitest.ini', 'test/mochitest/mochitest.ini'] -MOCHITEST_CHROME_MANIFESTS += ['test/chrome/chrome.ini'] -BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini'] -XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini'] - -TESTING_JS_MODULES += [ - # Make this file available from the "resource:" URI of the test environment. - 'test/browser/form_basic.html', - 'test/LoginTestUtils.jsm', -] - XPIDL_SOURCES += [ 'nsILoginInfo.idl', 'nsILoginManager.idl', @@ -34,10 +23,7 @@ EXTRA_COMPONENTS += [ 'nsLoginInfo.js', 'nsLoginManager.js', 'nsLoginManagerPrompter.js', -] - -EXTRA_PP_COMPONENTS += [ - 'passwordmgr.manifest', + 'passwordmgr.manifest' ] EXTRA_JS_MODULES += [ @@ -46,21 +32,18 @@ EXTRA_JS_MODULES += [ 'LoginManagerContent.jsm', 'LoginManagerParent.jsm', 'LoginRecipes.jsm', - 'OSCrypto.jsm', ] -if CONFIG['OS_TARGET'] == 'Android': - EXTRA_COMPONENTS += [ - 'storage-mozStorage.js', - ] -else: - EXTRA_COMPONENTS += [ - 'storage-json.js', - ] - EXTRA_JS_MODULES += [ - 'LoginImport.jsm', - 'LoginStore.jsm', - ] +EXTRA_PP_JS_MODULES += ['OSCrypto.jsm'] + +EXTRA_COMPONENTS += [ + 'storage-json.js', +] + +EXTRA_JS_MODULES += [ + 'LoginImport.jsm', + 'LoginStore.jsm', +] if CONFIG['OS_TARGET'] == 'WINNT': EXTRA_JS_MODULES += [ @@ -73,6 +56,3 @@ if CONFIG['MOZ_PHOENIX']: ] JAR_MANIFESTS += ['jar.mn'] - -with Files('**'): - BUG_COMPONENT = ('Toolkit', 'Password Manager') |