diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-11-16 12:47:54 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-11-16 12:47:54 -0500 |
| commit | ecb827c5c4782934453054b0b94a27169a65f3d6 (patch) | |
| tree | 02eae29dacba506765cdf5469a2030d95cb18b0a /config | |
| parent | 6bc5748b00efcd5a30b5736a2f89ef21c9362869 (diff) | |
| download | uxp-ecb827c5c4782934453054b0b94a27169a65f3d6.tar.gz | |
Issue #251 - Move chrome packaging options to ac configure
Also adds options for new functionality in #1683
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.mk | 2 | ||||
| -rw-r--r-- | config/tests/src-simple/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/config.mk b/config/config.mk index 5a352e5296..6208d124e1 100644 --- a/config/config.mk +++ b/config/config.mk @@ -216,7 +216,7 @@ endif # NO_PROFILE_GUIDED_OPTIMIZE MAKE_JARS_FLAGS = \ -t $(topsrcdir) \ - -f $(MOZ_JAR_MAKER_FILE_FORMAT) \ + -f $(MOZ_CHROME_FILE_FORMAT) \ $(NULL) ifdef USE_EXTENSION_MANIFEST diff --git a/config/tests/src-simple/Makefile.in b/config/tests/src-simple/Makefile.in index 55fdfd8677..96f9a41540 100644 --- a/config/tests/src-simple/Makefile.in +++ b/config/tests/src-simple/Makefile.in @@ -22,7 +22,7 @@ REF_MANIFEST = $(if $(USE_EXTENSION_MANIFEST),chrome.manifest,test.manifest) check-%:: if test -d $(FINAL_TARGET); then rm -rf $(FINAL_TARGET); fi; - $(MAKE) realchrome MOZ_JAR_MAKER_FILE_FORMAT=$* + $(MAKE) realchrome MOZ_CHROME_FILE_FORMAT=$* @echo 'Comparing manifests...' @if ! sort $(MY_MANIFEST) | diff --text -U 0 $(srcdir)/../$(REF_MANIFEST).$* - ; then \ echo 'TEST-UNEXPECTED-FAIL | config/tests/$(REF_MANIFEST).$* | differing content in manifest!' ; \ |