[AM] Clean up addon-signing build leftovers.
This commit is contained in:
parent
e5ce656e91
commit
75e5edbef3
|
@ -16,11 +16,6 @@ ac_add_options --enable-crashreporter
|
||||||
|
|
||||||
ac_add_options --enable-release
|
ac_add_options --enable-release
|
||||||
|
|
||||||
# Disable checking that add-ons are signed by the trusted root
|
|
||||||
MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-0}
|
|
||||||
# Disable enforcing that add-ons are signed by the trusted root
|
|
||||||
MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}
|
|
||||||
|
|
||||||
ac_add_options --enable-js-shell
|
ac_add_options --enable-js-shell
|
||||||
|
|
||||||
. "$topsrcdir/build/mozconfig.automation"
|
. "$topsrcdir/build/mozconfig.automation"
|
||||||
|
|
|
@ -4929,15 +4929,6 @@ AC_SUBST(MOZ_FIX_LINK_PATHS)
|
||||||
AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
|
AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
|
||||||
AC_SUBST(MOZ_LINKER_EXTRACT)
|
AC_SUBST(MOZ_LINKER_EXTRACT)
|
||||||
|
|
||||||
AC_SUBST(MOZ_ADDON_SIGNING)
|
|
||||||
if test "$MOZ_ADDON_SIGNING" = 1; then
|
|
||||||
AC_DEFINE(MOZ_ADDON_SIGNING)
|
|
||||||
fi
|
|
||||||
AC_SUBST(MOZ_REQUIRE_SIGNING)
|
|
||||||
if test "$MOZ_REQUIRE_SIGNING" = 1; then
|
|
||||||
AC_DEFINE(MOZ_REQUIRE_SIGNING)
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_SUBST(MOZ_JSDOWNLOADS)
|
AC_SUBST(MOZ_JSDOWNLOADS)
|
||||||
if test -n "$MOZ_JSDOWNLOADS"; then
|
if test -n "$MOZ_JSDOWNLOADS"; then
|
||||||
AC_DEFINE(MOZ_JSDOWNLOADS)
|
AC_DEFINE(MOZ_JSDOWNLOADS)
|
||||||
|
|
|
@ -88,8 +88,6 @@ def build_dict(config, env=os.environ):
|
||||||
d['telemetry'] = substs.get('MOZ_TELEMETRY_REPORTING') == '1'
|
d['telemetry'] = substs.get('MOZ_TELEMETRY_REPORTING') == '1'
|
||||||
d['tests_enabled'] = substs.get('ENABLE_TESTS') == "1"
|
d['tests_enabled'] = substs.get('ENABLE_TESTS') == "1"
|
||||||
d['bin_suffix'] = substs.get('BIN_SUFFIX', '')
|
d['bin_suffix'] = substs.get('BIN_SUFFIX', '')
|
||||||
d['addon_signing'] = substs.get('MOZ_ADDON_SIGNING') == '1'
|
|
||||||
d['require_signing'] = substs.get('MOZ_REQUIRE_SIGNING') == '1'
|
|
||||||
d['official'] = bool(substs.get('MC_OFFICIAL'))
|
d['official'] = bool(substs.get('MC_OFFICIAL'))
|
||||||
|
|
||||||
def guess_platform():
|
def guess_platform():
|
||||||
|
|
|
@ -194,13 +194,6 @@ MOZ_SAFE_BROWSING:
|
||||||
false,
|
false,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
MOZ_REQUIRE_SIGNING:
|
|
||||||
#ifdef MOZ_REQUIRE_SIGNING
|
|
||||||
true,
|
|
||||||
#else
|
|
||||||
false,
|
|
||||||
#endif
|
|
||||||
|
|
||||||
MENUBAR_CAN_AUTOHIDE:
|
MENUBAR_CAN_AUTOHIDE:
|
||||||
#ifdef MENUBAR_CAN_AUTOHIDE
|
#ifdef MENUBAR_CAN_AUTOHIDE
|
||||||
true,
|
true,
|
||||||
|
|
Loading…
Reference in New Issue