diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-11-20 09:47:03 +0000 |
| commit | 5165ed02285315cc0bed7977c7bac6d0a90ca43c (patch) | |
| tree | 9b761a21eb924915e51c2d803208e6c01b505a45 /config | |
| parent | e1db27e19989db11fef70f439cf95821316535b3 (diff) | |
| parent | ca9abcdf1702c37bf00048dab3f460b2252873a3 (diff) | |
| download | UXP-RELBASE_20201120.tar UXP-RELBASE_20201120.tar.gz UXP-RELBASE_20201120.tar.lz UXP-RELBASE_20201120.tar.xz UXP-RELBASE_20201120.zip | |
Merge branch 'redwood' into releaseRELBASE_20201124RELBASE_20201120RC_20201120
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.mk | 2 | ||||
| -rw-r--r-- | config/system-headers | 1 | ||||
| -rw-r--r-- | config/tests/src-simple/Makefile.in | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/config/config.mk b/config/config.mk index 5a352e529..6208d124e 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/system-headers b/config/system-headers index 3685d6d1c..015644428 100644 --- a/config/system-headers +++ b/config/system-headers @@ -526,7 +526,6 @@ hardware/lights.h hardware/power.h hardware_legacy/power.h hardware_legacy/uevent.h -hardware_legacy/vibrator.h #endif HIToolbox/HIToolbox.h hlink.h diff --git a/config/tests/src-simple/Makefile.in b/config/tests/src-simple/Makefile.in index 55fdfd867..96f9a4154 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!' ; \ |