Backed out 2 changesets (bug 1596911) for license failures on several files. CLOSED TREE

Backed out changeset b17ea5cb7714 (bug 1596911)
Backed out changeset 394f75b9488a (bug 1596911)

tools/lint/license.yml

@@ -8,32 +8,19 @@ license:
         - build/pgo/js-input
         - build/workspace-hack/src/lib.rs
         - browser/app/blocklist.xml
-        # License not super clear
-        - browser/branding/aurora/content/
-        - browser/components/newtab/css/
         - browser/components/pocket/content/panels/
         - browser/components/shell/ScreenshotChild.jsm
-        - browser/extensions/pdfjs/content/web/images/
         - browser/extensions/webcompat/about-compat/aboutCompat.html
         - browser/extensions/webcompat/injections/js
-        # Different license
-        - build/pgo/blueprint/print.css
-        # Different license
-        - build/pgo/blueprint/screen.css
         - config/external/ffi/preprocess_libffi_asm.py
         - config/external/ffi/subst_header.py
         - config/external/nspr/_pl_bld.h
         - config/external/nspr/_pr_bld.h
         - config/system_header_util.py
-        - dom/docs/Fission-IPC-Diagram.svg
         # Unknown origin
         - gfx/2d/MMIHelpers.h
         # Generated code
         - gfx/2d/ShadersD2D1.h
-        # might not work with license
-        - gradle.properties
-        # might not work with license
-        - gradle/wrapper/gradle-wrapper.properties
         - intl/l10n/L10nRegistry.jsm
         - ipc/ipdl/ipdl/cxx/code.py
         - media/libdav1d/vcs_version.h
@@ -42,10 +29,6 @@ license:
         - mobile/android/geckoview/src/main/AndroidManifest.xml
         - mobile/android/geckoview/src/main/res/drawable/ic_generic_file.xml
         - mobile/android/geckoview_example/src/main
-        # might not work with license
-        - mobile/android/gradle/dotgradle-offline/gradle.properties
-        # might not work with license
-        - mobile/android/gradle/dotgradle-online/gradle.properties
         # Almost empty file
         - modules/libpref/greprefs.js
         - mozglue/android/NativeCrypto.h
@@ -80,9 +63,6 @@ license:
         - .c
         - .cc
         - .cpp
-        - .css
-        - .dtd
-        - .ftl
         - .h
         - .html
         - .js
@@ -90,10 +70,8 @@ license:
         - .jsx
         - .m
         - .mm
-        - .properties
         - .py
         - .rs
-        - .svg
         - .xhtml
         - .xml
         - .xul

tools/lint/license/__init__.py

@@ -135,11 +135,7 @@ def fix_me(filename):
             if i == 2 or (i == 1 and test):
                 # Last line, we end by -->
                 end = " -->"
-            license.append(start + l.strip() + end)
-            if ext != '.svg' or end == "":
-                # When dealing with an svg, we should not have a space between
-                # the license and the content
-                license.append("\n")
+            license.append(start + l.strip() + end + "\n")
         add_header(filename, license)
         return