Snap for 8564071 from 147793075b9643a84fdb5dda6e40f8bc6a396969 to mainline-os-statsd-releaseaml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010aml_sta_330910000android13-mainline-os-statsd-release

Change-Id: Ib99c90df197b3f2e79502875cc97893c087a7694

7 files changed, 93 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 7f25a9135..150418730 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,35 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["device_generic_opengl-transport_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: "device_generic_opengl-transport_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-GPL-2.0",
+    ],
+    // large-scale-change unable to identify any license_text files
+}
+
 subdirs = [
     "host",
 ]
diff --git a/METADATA b/METADATA
new file mode 100644
index 000000000..5ab987c3b
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,4 @@
+third_party {
+  license_note: "would be NOTICE save for host/commands/emugen/android/base/EnumFlags.h"
+  license_type: RESTRICTED
+}
diff --git a/host/Android.bp b/host/Android.bp
index b2fe7a4e8..1fabcab4a 100644
--- a/host/Android.bp
+++ b/host/Android.bp
@@ -13,6 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_generic_opengl-transport_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    //   SPDX-license-identifier-BSD
+    //   SPDX-license-identifier-GPL-2.0
+    default_applicable_licenses: ["device_generic_opengl-transport_license"],
+}
+
 subdirs = [
     "commands",
     "libs",
diff --git a/host/commands/Android.bp b/host/commands/Android.bp
index ddca16065..cc5499dca 100644
--- a/host/commands/Android.bp
+++ b/host/commands/Android.bp
@@ -13,6 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_generic_opengl-transport_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    //   SPDX-license-identifier-GPL-2.0
+    default_applicable_licenses: ["device_generic_opengl-transport_license"],
+}
+
 subdirs = [
     "emugen",
 ]
diff --git a/host/commands/emugen/Android.bp b/host/commands/emugen/Android.bp
index 516d116a0..a7bef31c6 100644
--- a/host/commands/emugen/Android.bp
+++ b/host/commands/emugen/Android.bp
@@ -1,3 +1,13 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_generic_opengl-transport_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    //   SPDX-license-identifier-GPL-2.0
+    default_applicable_licenses: ["device_generic_opengl-transport_license"],
+}
+
 cc_binary_host {
     name: "emugen_cuttlefish",
     srcs: [
diff --git a/host/libs/Android.bp b/host/libs/Android.bp
index 65e458da7..0ab4a70b3 100644
--- a/host/libs/Android.bp
+++ b/host/libs/Android.bp
@@ -13,6 +13,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_generic_opengl-transport_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    //   SPDX-license-identifier-BSD
+    default_applicable_licenses: ["device_generic_opengl-transport_license"],
+}
+
 subdirs = [
     "virglrenderer",
 ]
diff --git a/host/libs/virglrenderer/Android.bp b/host/libs/virglrenderer/Android.bp
index e66086041..c05b1e5cf 100644
--- a/host/libs/virglrenderer/Android.bp
+++ b/host/libs/virglrenderer/Android.bp
@@ -14,6 +14,16 @@
 // limitations under the License.
 //
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "device_generic_opengl-transport_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    //   SPDX-license-identifier-BSD
+    default_applicable_licenses: ["device_generic_opengl-transport_license"],
+}
+
 genrule {
   name: "glesv1_dec_cuttlefish_gensrc",
   srcs: ["GLESv1_dec/*"],
@@ -92,7 +102,7 @@ genrule {
 genrule {
   name: "gles1_core_functions_hdr",
   tool_files: ["gen_entries.py"],
-  cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)",
+  cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)",
   srcs: ["OpenGLESDispatch/gles1_core.entries"],
   out: ["gles1_core_functions.h"],
 }
@@ -100,7 +110,7 @@ genrule {
 genrule {
   name: "gles1_extensions_functions_hdr",
   tool_files: ["gen_entries.py"],
-  cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)",
+  cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)",
   srcs: ["OpenGLESDispatch/gles1_extensions.entries"],
   out: ["gles1_extensions_functions.h"],
 }
@@ -108,7 +118,7 @@ genrule {
 genrule {
   name: "egl_functions_hdr",
   tool_files: ["gen_entries.py"],
-  cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)",
+  cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)",
   srcs: ["OpenGLESDispatch/egl.entries"],
   out: ["egl_functions.h"],
 }
@@ -116,7 +126,7 @@ genrule {
 genrule {
   name: "gles3_only_functions_hdr",
   tool_files: ["gen_entries.py"],
-  cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)",
+  cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)",
   srcs: ["OpenGLESDispatch/gles3_only.entries"],
   out: ["gles3_only_functions.h"],
 }
@@ -124,7 +134,7 @@ genrule {
 genrule {
   name: "gles31_only_functions_hdr",
   tool_files: ["gen_entries.py"],
-  cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)",
+  cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)",
   srcs: ["OpenGLESDispatch/gles31_only.entries"],
   out: ["gles31_only_functions.h"],
 }
@@ -132,7 +142,7 @@ genrule {
 genrule {
   name: "gles2_extensions_functions_hdr",
   tool_files: ["gen_entries.py"],
-  cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)",
+  cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)",
   srcs: ["OpenGLESDispatch/gles2_extensions.entries"],
   out: ["gles2_extensions_functions.h"],
 }
@@ -140,7 +150,7 @@ genrule {
 genrule {
   name: "egl_extensions_functions_hdr",
   tool_files: ["gen_entries.py"],
-  cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)",
+  cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)",
   srcs: ["OpenGLESDispatch/egl_extensions.entries"],
   out: ["egl_extensions_functions.h"],
 }
@@ -148,7 +158,7 @@ genrule {
 genrule {
   name: "gles2_core_functions_hdr",
   tool_files: ["gen_entries.py"],
-  cmd: "python device/generic/opengl-transport/host/libs/virglrenderer/gen_entries.py --mode=funcargs $(in) --output $(out)",
+  cmd: "python $(location gen_entries.py) --mode=funcargs $(in) --output $(out)",
   srcs: ["OpenGLESDispatch/gles2_core.entries"],
   out: ["gles2_core_functions.h"],
 }
@@ -204,5 +214,5 @@ cc_library_host_shared {
 
     // TODO(b/118466250): Make this work on the Mac
     version_script : "libvirglrenderer.lds",
-    defaults: [ "cuttlefish_host_only" ],
+    defaults: [ "cuttlefish_buildhost_only" ],
 }