From 4e738cda8495b9692ac1a35ac6b0c88021de5fe8 Mon Sep 17 00:00:00 2001
From: Geoff Brown <gbrown@mozilla.com>
Date: Thu, 9 May 2024 16:28:42 +0000
Subject: [PATCH] Bug 1881094 - 7. cleanup firefox-android exclusions in
 license.yml r=gl,android-reviewers

Cleanup license.yml by:
 - adding license headers to gradle.properties: some gradle.properties files already have license headers; I have just copied those headers to files where they were missing
 - adding license headers for a few .xml files
 - moving the .../src/main/res/ exclusions to Generated.txt; these exclusions are primarily needed for the strings.xml files, which are updated from the android-l10n repo, so they seem more appropriate for Generated.txt

Differential Revision: https://phabricator.services.mozilla.com/D209818
---
 gradle.properties                             |  4 ++
 gradle/wrapper/gradle-wrapper.properties      |  4 ++
 .../gradle/wrapper/gradle-wrapper.properties  |  4 ++
 .../benchmark/src/main/AndroidManifest.xml    |  3 ++
 .../gradle/wrapper/gradle-wrapper.properties  |  4 ++
 .../focus-android/app/lint-baseline.xml       |  3 ++
 .../gradle/wrapper/gradle-wrapper.properties  |  4 ++
 .../dotgradle-offline/gradle.properties       |  4 ++
 .../gradle/dotgradle-online/gradle.properties |  4 ++
 tools/lint/license.yml                        | 54 +------------------
 tools/rewriting/Generated.txt                 | 38 +++++++++++++
 11 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 8fce83a44374..bfc5ce2e275d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 org.gradle.parallel=true
 org.gradle.daemon=true
 # Be careful when changing org.gradle.jvmargs below. It will clobber
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23a4f05..23e87f9b0b22 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
diff --git a/mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties b/mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties
index b82aa23a4f05..23e87f9b0b22 100644
--- a/mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties
+++ b/mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
diff --git a/mobile/android/fenix/benchmark/src/main/AndroidManifest.xml b/mobile/android/fenix/benchmark/src/main/AndroidManifest.xml
index 251d1c7b2136..f3783c33ae11 100644
--- a/mobile/android/fenix/benchmark/src/main/AndroidManifest.xml
+++ b/mobile/android/fenix/benchmark/src/main/AndroidManifest.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <queries>
diff --git a/mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties b/mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties
index b82aa23a4f05..23e87f9b0b22 100644
--- a/mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties
+++ b/mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
diff --git a/mobile/android/focus-android/app/lint-baseline.xml b/mobile/android/focus-android/app/lint-baseline.xml
index b230739f6825..3686530fbd33 100644
--- a/mobile/android/focus-android/app/lint-baseline.xml
+++ b/mobile/android/focus-android/app/lint-baseline.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <issues format="6" by="lint 8.2.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.2.2)" variant="all" version="8.2.2">
 
     <issue
diff --git a/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties b/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties
index b82aa23a4f05..23e87f9b0b22 100644
--- a/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties
+++ b/mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
diff --git a/mobile/android/gradle/dotgradle-offline/gradle.properties b/mobile/android/gradle/dotgradle-offline/gradle.properties
index 3f77ec9a2ff3..bc2b01e1e527 100644
--- a/mobile/android/gradle/dotgradle-offline/gradle.properties
+++ b/mobile/android/gradle/dotgradle-offline/gradle.properties
@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 // Per https://docs.gradle.org/current/userguide/build_environment.html, this
 // overrides the gradle.properties in topsrcdir.
 org.gradle.daemon=false
diff --git a/mobile/android/gradle/dotgradle-online/gradle.properties b/mobile/android/gradle/dotgradle-online/gradle.properties
index 3f77ec9a2ff3..bc2b01e1e527 100644
--- a/mobile/android/gradle/dotgradle-online/gradle.properties
+++ b/mobile/android/gradle/dotgradle-online/gradle.properties
@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 // Per https://docs.gradle.org/current/userguide/build_environment.html, this
 // overrides the gradle.properties in topsrcdir.
 org.gradle.daemon=false
diff --git a/tools/lint/license.yml b/tools/lint/license.yml
index e193085139d9..00490b3028cc 100644
--- a/tools/lint/license.yml
+++ b/tools/lint/license.yml
@@ -26,13 +26,6 @@ license:
         - config/external/nspr/_pr_bld.h
         # Unknown origin
         - gfx/2d/MMIHelpers.h
-        # might not work with license
-        - gradle.properties
-        # might not work with license
-        - gradle/wrapper/gradle-wrapper.properties
-        - mobile/android/android-components/gradle/wrapper/gradle-wrapper.properties
-        - mobile/android/fenix/gradle/wrapper/gradle-wrapper.properties
-        - mobile/android/focus-android/gradle/wrapper/gradle-wrapper.properties
         # ICU4X data
         - intl/icu_segmenter_data
         # Imported code that is dual Apache2 / MIT licensed
@@ -44,53 +37,8 @@ license:
         - mobile/android/geckoview_example/src/main
         - testing/webcompat/interventions/
         - testing/webcompat/shims/
-        # TODO - Bug 1881094: temporarily ignored for firefox-android migration
-        - mobile/android/android-components/components/browser/engine-system/src/main/res/
-        - mobile/android/android-components/components/browser/errorpages/src/main/res/
-        - mobile/android/android-components/components/browser/menu/src/main/res/
-        - mobile/android/android-components/components/browser/menu2/src/main/res/
-        - mobile/android/android-components/components/browser/toolbar/src/main/res/
-        - mobile/android/android-components/components/browser/toolbar2/src/main/res/
-        - mobile/android/android-components/components/compose/awesomebar/src/main/res/
-        - mobile/android/android-components/components/compose/browser-toolbar/src/main/res/
-        - mobile/android/android-components/components/compose/cfr/src/main/res/
-        - mobile/android/android-components/components/compose/tabstray/src/main/res/
-        - mobile/android/android-components/components/feature/addons/src/main/res/
-        - mobile/android/android-components/components/feature/app-links/src/main/res/
-        - mobile/android/android-components/components/feature/autofill/src/main/res/
-        - mobile/android/android-components/components/feature/awesomebar/src/main/res/
-        - mobile/android/android-components/components/feature/contextmenu/src/main/res/
-        - mobile/android/android-components/components/feature/customtabs/src/main/res/
-        - mobile/android/android-components/components/feature/downloads/src/main/res/
-        - mobile/android/android-components/components/feature/findinpage/src/main/res/
-        - mobile/android/android-components/components/feature/fxsuggest/src/main/res/
-        - mobile/android/android-components/components/feature/media/src/main/res/
-        - mobile/android/android-components/components/feature/privatemode/src/main/res/
-        - mobile/android/android-components/components/feature/prompts/src/main/res/
-        - mobile/android/android-components/components/feature/pwa/src/main/res/
-        - mobile/android/android-components/components/feature/qr/src/main/res/
-        - mobile/android/android-components/components/feature/readerview/src/main/res/
-        - mobile/android/android-components/components/feature/search/src/main/res/
-        - mobile/android/android-components/components/feature/sitepermissions/
-        - mobile/android/android-components/components/feature/tabs/src/main/res/
-        - mobile/android/android-components/components/feature/webcompat/src/main/assets/extensions/webcompat/injections/
-        - mobile/android/android-components/components/feature/webnotifications/src/main/res/
-        - mobile/android/android-components/components/lib/crash/src/main/res/
-        - mobile/android/android-components/components/service/nimbus/src/main/res/
-        - mobile/android/android-components/components/support/base/src/main/res/
-        - mobile/android/android-components/components/support/ktx/src/main/res/
-        - mobile/android/android-components/components/support/utils/src/main/res/
-        - mobile/android/android-components/components/ui/tabcounter/src/main/res/
-        - mobile/android/android-components/components/ui/widgets/src/main/res/
+        # TODO - Bug 1882443: temporarily ignored for firefox-android migration
         - mobile/android/android-components/docs/
-        - mobile/android/fenix/app/src/main/res/
-        - mobile/android/fenix/benchmark/src/main/AndroidManifest.xml
-        - mobile/android/focus-android/app/lint-baseline.xml
-        - mobile/android/focus-android/app/src/main/res/
-        # 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
         - parser/html/java/named-character-references.html
diff --git a/tools/rewriting/Generated.txt b/tools/rewriting/Generated.txt
index 0b4fd84c6dd6..c657d1d24db7 100644
--- a/tools/rewriting/Generated.txt
+++ b/tools/rewriting/Generated.txt
@@ -31,9 +31,47 @@ mobile/android/**/generated
 mobile/android/**\/local.properties
 mobile/android/**\/manifest.json
 mobile/android/android-components/components/feature/search/src/main/assets/search/search_telemetry_v2.json
+mobile/android/android-components/components/browser/engine-system/src/main/res/
+mobile/android/android-components/components/browser/errorpages/src/main/res/
+mobile/android/android-components/components/browser/menu/src/main/res/
+mobile/android/android-components/components/browser/menu2/src/main/res/
+mobile/android/android-components/components/browser/toolbar/src/main/res/
+mobile/android/android-components/components/browser/toolbar2/src/main/res/
+mobile/android/android-components/components/compose/awesomebar/src/main/res/
+mobile/android/android-components/components/compose/browser-toolbar/src/main/res/
+mobile/android/android-components/components/compose/cfr/src/main/res/
+mobile/android/android-components/components/compose/tabstray/src/main/res/
+mobile/android/android-components/components/feature/addons/src/main/res/
+mobile/android/android-components/components/feature/app-links/src/main/res/
+mobile/android/android-components/components/feature/autofill/src/main/res/
+mobile/android/android-components/components/feature/awesomebar/src/main/res/
+mobile/android/android-components/components/feature/contextmenu/src/main/res/
+mobile/android/android-components/components/feature/customtabs/src/main/res/
+mobile/android/android-components/components/feature/downloads/src/main/res/
+mobile/android/android-components/components/feature/findinpage/src/main/res/
+mobile/android/android-components/components/feature/fxsuggest/src/main/res/
+mobile/android/android-components/components/feature/media/src/main/res/
+mobile/android/android-components/components/feature/privatemode/src/main/res/
+mobile/android/android-components/components/feature/prompts/src/main/res/
+mobile/android/android-components/components/feature/pwa/src/main/res/
+mobile/android/android-components/components/feature/qr/src/main/res/
+mobile/android/android-components/components/feature/readerview/src/main/res/
+mobile/android/android-components/components/feature/search/src/main/res/
+mobile/android/android-components/components/feature/sitepermissions/
+mobile/android/android-components/components/feature/tabs/src/main/res/
+mobile/android/android-components/components/feature/webnotifications/src/main/res/
+mobile/android/android-components/components/lib/crash/src/main/res/
+mobile/android/android-components/components/service/nimbus/src/main/res/
+mobile/android/android-components/components/support/base/src/main/res/
+mobile/android/android-components/components/support/ktx/src/main/res/
+mobile/android/android-components/components/support/utils/src/main/res/
+mobile/android/android-components/components/ui/tabcounter/src/main/res/
+mobile/android/android-components/components/ui/widgets/src/main/res/
 mobile/android/android-components/samples/glean/src/main/res/raw/initial_experiments.json
 mobile/android/fenix/app/src/debug/res/raw/initial_experiments.json
+mobile/android/fenix/app/src/main/res/
 mobile/android/fenix/app/src/main/res/raw/initial_experiments.json
+mobile/android/focus-android/app/src/main/res/
 mobile/locales/l10n-changesets.json
 mobile/locales/l10n-onchange-changesets.json
 node_modules/