diff options
author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-02-24 17:51:16 +0000 |
---|---|---|
committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-02-24 17:51:16 +0000 |
commit | 9f9c02592610e9c2bea6c9a2a2e361de38d32e2c (patch) | |
tree | 5a14900c65cc5b3e18e60e60f6363d0e08f2c109 | |
parent | 02bf48a55d7a4cb5a2c848ae7abc94e56a37b242 (diff) | |
parent | d2988069c83ee719955a5f288a5229bab4ae87b9 (diff) | |
download | device_generic_opengl-transport-9f9c02592610e9c2bea6c9a2a2e361de38d32e2c.tar.gz device_generic_opengl-transport-9f9c02592610e9c2bea6c9a2a2e361de38d32e2c.tar.bz2 device_generic_opengl-transport-9f9c02592610e9c2bea6c9a2a2e361de38d32e2c.zip |
Snap for 7168215 from d2988069c83ee719955a5f288a5229bab4ae87b9 to simpleperf-release
Change-Id: Ifab922bc03ce142a9917b4a9dcc27ecb66eb0b75
-rw-r--r-- | Android.bp | 29 | ||||
-rw-r--r-- | host/Android.bp | 11 | ||||
-rw-r--r-- | host/commands/Android.bp | 10 | ||||
-rw-r--r-- | host/commands/emugen/Android.bp | 10 | ||||
-rw-r--r-- | host/libs/Android.bp | 10 | ||||
-rw-r--r-- | host/libs/virglrenderer/Android.bp | 10 |
6 files changed, 80 insertions, 0 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/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 715ecca21..3791f7aa6 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/*"], |