From 1df2a63f0ba2dc48eaea0cb95333969b1a8048de Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 1 May 2020 08:06:28 -0700 Subject: Add METADATA to opengl-transport: Apache2+BSD=NOTICE Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ic76fdec7c61a05ca35e4f01c0cbd774726daf048 --- METADATA | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 METADATA diff --git a/METADATA b/METADATA new file mode 100644 index 000000000..d97975ca3 --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} -- cgit v1.2.3 From 17e80680b85c7a72f4d870553400b47b1ad78e7a Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 5 Jan 2021 16:30:31 +0900 Subject: cuttlefish_host_only -> cuttlefish_buildhost_only The term (1) "host" in the context of cuttlefish (and more broadly in the context of VMs) means the OS that directly talks to the hardware and is responsible for managing the (guest) VMs. However, in the context of the Android build system, the same term (2) "host" means the OS that isn't Android (which is referred to as "target"), like the Ubuntu OS where the build system itself runs on, or the Windows or Mac OSes that we cross-build SDKs for. Previously when cuttlefish doesn't support nested virtualization, the two different "host"s meant the same; host-side components (like crosvm, run_cvd, etc.) were only built for the build-host OS (Ubuntu or gLinux). However, that is no longer true as we aim to support running cuttlefish (and other OS payloads as well) on Android devices as well. Then the host-side VM managing components have to be built for the target (Android) OS. In order to better reflect the new situation, cuttlefish_* cc_defaults modules are renamed as follows: 1) cuttlefish_guest_only: for the guest OS (i.e. cuttlefish) 2) cuttlefish_host: for the host OSes (either Ubuntu or Android) This was previously "cuttlefish_host_and_guest", where "guest" there actually meant the Android OS which doesn't necessarily need to be cuttlefish. 3) cuttlefish_buildhost_only: for non-Android host OSes (i.e. Ubuntu) Bug: 167675429 Test: mma under /device/google/cuttlefish Change-Id: I0a3cc47c69edab660a0b4d9c2315051ba2dcd6a5 --- host/libs/virglrenderer/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/libs/virglrenderer/Android.bp b/host/libs/virglrenderer/Android.bp index e66086041..715ecca21 100644 --- a/host/libs/virglrenderer/Android.bp +++ b/host/libs/virglrenderer/Android.bp @@ -204,5 +204,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" ], } -- cgit v1.2.3 From f91ca3e504a88e5c04f9feffffae8d423645f66c Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Thu, 21 Jan 2021 10:31:01 -0800 Subject: Fix license_type. Contains GPL See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: Ic1f61026934e06de444f7ef28041eec9b43d280b --- METADATA | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/METADATA b/METADATA index d97975ca3..51ff1b58e 100644 --- a/METADATA +++ b/METADATA @@ -1,3 +1,4 @@ third_party { - license_type: NOTICE + # would be NOTICE save for host/commands/emugen/android/base/EnumFlags.h + license_type: RESTRICTED } -- cgit v1.2.3 From d2988069c83ee719955a5f288a5229bab4ae87b9 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 15:09:23 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to device/generic/opengl-transport Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: host/libs/Android.bp host/libs/virglrenderer/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL-2.0 to: Android.bp host/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 to: host/commands/Android.bp host/commands/emugen/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I266e23952ef9ef89f2973af6e2e67eacf98cb62f --- Android.bp | 29 +++++++++++++++++++++++++++++ host/Android.bp | 11 +++++++++++ host/commands/Android.bp | 10 ++++++++++ host/commands/emugen/Android.bp | 10 ++++++++++ host/libs/Android.bp | 10 ++++++++++ host/libs/virglrenderer/Android.bp | 10 ++++++++++ 6 files changed, 80 insertions(+) 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/*"], -- cgit v1.2.3 From 681a6f9804d295915d1ee6dfbbc13bd4e802a5a2 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 23 Mar 2021 22:49:58 -0700 Subject: Use $(location) to find path to tools Hardcoding the full path to the tool is incorrect when the tool is sandboxed, use $(location) instead. Test: builds Change-Id: I5d150a52b84f6926726768ba7aadfc2522d561fd --- host/libs/virglrenderer/Android.bp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/host/libs/virglrenderer/Android.bp b/host/libs/virglrenderer/Android.bp index 3791f7aa6..c05b1e5cf 100644 --- a/host/libs/virglrenderer/Android.bp +++ b/host/libs/virglrenderer/Android.bp @@ -102,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"], } @@ -110,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"], } @@ -118,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"], } @@ -126,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"], } @@ -134,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"], } @@ -142,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"], } @@ -150,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"], } @@ -158,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"], } -- cgit v1.2.3 From 85d31622702cef02c5ee94c7c2b97829fa356d5f Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Thu, 3 Mar 2022 14:49:59 -0800 Subject: Move comment to license_note Comments not preserved during refresh. Test: m nothing Change-Id: I467bbc466e09c79aa75dfd3ca4c77b7f86304bd1 --- METADATA | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/METADATA b/METADATA index 51ff1b58e..5ab987c3b 100644 --- a/METADATA +++ b/METADATA @@ -1,4 +1,4 @@ third_party { - # would be NOTICE save for host/commands/emugen/android/base/EnumFlags.h + license_note: "would be NOTICE save for host/commands/emugen/android/base/EnumFlags.h" license_type: RESTRICTED } -- cgit v1.2.3