Merge remote-tracking branch 'origin/rvc-gsi-dev' into rvc-qpr-dev am: 51f38d4b67 am: 3d88608d14

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mesa3d/+/13972455

Change-Id: I5c7adafdfadbf30099ecd8590fd596770da63b12

3 files changed, 0 insertions, 70 deletions

diff --git a/Android.bp b/Android.bp
index 5bbee27056a..8df7f3809da 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,47 +23,6 @@
 
 soong_namespace {}
 
-// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
-//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
-//     DEPENDING ON IT IN YOUR PROJECT. ***
-package {
-    default_applicable_licenses: ["external_mesa3d_license"],
-}
-
-// Added automatically by a large-scale-change that took the approach of
-// 'apply every license found to every target'. While this makes sure we respect
-// every license restriction, it may not be entirely correct.
-//
-// e.g. GPL in an MIT project might only apply to the contrib/ directory.
-//
-// Please consider splitting the single license below into multiple licenses,
-// taking care not to lose any license_kind information, and overriding the
-// default license using the 'licenses: [...]' property on targets as needed.
-//
-// For unused files, consider creating a 'fileGroup' with "//visibility:private"
-// to attach the license to, and including a comment whether the files may be
-// used in the current project.
-// See: http://go/android-license-faq
-license {
-    name: "external_mesa3d_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-        "SPDX-license-identifier-BSD",
-        "SPDX-license-identifier-BSL-1.0",
-        "SPDX-license-identifier-GPL-2.0",
-        "SPDX-license-identifier-ISC",
-        "SPDX-license-identifier-MIT",
-        "SPDX-license-identifier-Unlicense",
-        "legacy_by_exception_only", // by exception only
-        "legacy_notice",
-        "legacy_unencumbered",
-    ],
-    license_text: [
-        "LICENSE",
-    ],
-}
-
 build = ["Android.gen.bp"]
 
 cc_library_headers {
diff --git a/src/Android.bp b/src/Android.bp
index 877f065eaa2..741022da520 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -1,23 +1,3 @@
-// *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
-//     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
-//     DEPENDING ON IT IN YOUR PROJECT. ***
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_mesa3d_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    //   SPDX-license-identifier-BSD
-    //   SPDX-license-identifier-BSL-1.0
-    //   SPDX-license-identifier-ISC
-    //   SPDX-license-identifier-MIT
-    //   SPDX-license-identifier-Unlicense
-    //   legacy_by_exception_only (by exception only)
-    //   legacy_notice
-    //   legacy_unencumbered
-    default_applicable_licenses: ["external_mesa3d_license"],
-}
-
 cc_library_headers {
     name: "libmesa_glsl_utils_includes",
     export_include_dirs: [
diff --git a/src/mesa/Android.bp b/src/mesa/Android.bp
index f1ab7930468..d2344655bdc 100644
--- a/src/mesa/Android.bp
+++ b/src/mesa/Android.bp
@@ -20,15 +20,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-package {
-    // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "external_mesa3d_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-MIT
-    default_applicable_licenses: ["external_mesa3d_license"],
-}
-
 build = ["Android.sources.bp"]
 
 //