From 9dbf0d04f77325b655fe88f04e25ce85292b9bf8 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Wed, 31 Mar 2021 12:46:09 -0700 Subject: [LSC] Add LOCAL_LICENSE_KINDS to device/ti/beagle_x15 Added SPDX-license-identifier-Apache-2.0 to: recovery/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT to: Android.bp gralloc/Android.bp Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT to: gpu/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I6713f4168cf65f270f3fb5d60feb6116c448f671 --- Android.bp | 29 +++++++++++++++++++++++++++++ MODULE_LICENSE_APACHE2 | 0 MODULE_LICENSE_BSD | 0 MODULE_LICENSE_MIT | 0 gpu/Android.bp | 30 ++++++++++++++++++++++++++++++ gralloc/Android.bp | 11 +++++++++++ recovery/Android.bp | 9 +++++++++ 7 files changed, 79 insertions(+) create mode 100644 MODULE_LICENSE_APACHE2 create mode 100644 MODULE_LICENSE_BSD create mode 100644 MODULE_LICENSE_MIT diff --git a/Android.bp b/Android.bp index 64cdc29..75eb523 100644 --- a/Android.bp +++ b/Android.bp @@ -13,3 +13,32 @@ // limitations under the License. soong_namespace {} + +package { + default_applicable_licenses: ["device_ti_beagle_x15_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_ti_beagle_x15_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-MIT", + ], + // large-scale-change unable to identify any license_text files +} diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2 new file mode 100644 index 0000000..e69de29 diff --git a/MODULE_LICENSE_BSD b/MODULE_LICENSE_BSD new file mode 100644 index 0000000..e69de29 diff --git a/MODULE_LICENSE_MIT b/MODULE_LICENSE_MIT new file mode 100644 index 0000000..e69de29 diff --git a/gpu/Android.bp b/gpu/Android.bp index 0d8941e..e9f04a7 100644 --- a/gpu/Android.bp +++ b/gpu/Android.bp @@ -15,6 +15,36 @@ // Core dependencies +package { + default_applicable_licenses: ["device_ti_beagle_x15_gpu_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_ti_beagle_x15_gpu_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-MIT", + ], + license_text: [ + "NOTICE", + ], +} + cc_prebuilt_library_shared { name: "libIMGegl", srcs: ["libIMGegl.so"], diff --git a/gralloc/Android.bp b/gralloc/Android.bp index 30c0402..64cecff 100644 --- a/gralloc/Android.bp +++ b/gralloc/Android.bp @@ -1,3 +1,14 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "device_ti_beagle_x15_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-BSD + // SPDX-license-identifier-MIT + default_applicable_licenses: ["device_ti_beagle_x15_license"], +} + cc_library_shared { name: "hwcomposer.drm_imagination", defaults: ["hwcomposer.drm_defaults"], diff --git a/recovery/Android.bp b/recovery/Android.bp index b2eab67..373445a 100644 --- a/recovery/Android.bp +++ b/recovery/Android.bp @@ -14,6 +14,15 @@ // 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_ti_beagle_x15_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["device_ti_beagle_x15_license"], +} + cc_library_static { name: "librecovery_ui_beagle_x15", owner: "ti", -- cgit v1.2.3 From a441f56a28414b94270d3dfc9d52202309f3412b Mon Sep 17 00:00:00 2001 From: Yu Shan Date: Fri, 2 Jul 2021 16:33:17 -0700 Subject: Use default VHAL for beagle-x15. This is not an emulator, so use default VHAL implementation. Test: Presubmit Bug: 192276902 Change-Id: Ib3ac86ccf132157cf3bd82a4602a786604f33f03 --- auto/device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto/device.mk b/auto/device.mk index 51b7e04..76634e7 100644 --- a/auto/device.mk +++ b/auto/device.mk @@ -16,7 +16,7 @@ #Automotive PRODUCT_PACKAGES += \ - android.hardware.automotive.vehicle@2.0-service \ + android.hardware.automotive.vehicle@2.0-default-service \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.type.automotive.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.type.automotive.xml \ -- cgit v1.2.3 From 7badbbc4542f240045d42bce6c5f3d7e56317429 Mon Sep 17 00:00:00 2001 From: Yu Shan Date: Thu, 3 Feb 2022 18:28:09 -0800 Subject: Use AIDL default VHAL for beagle-x15. Test: Presubmit Bug: 170400618 Change-Id: I882ed3e819500e884b2eae649350d09043e69041 --- auto/device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto/device.mk b/auto/device.mk index 76634e7..1bf8acc 100644 --- a/auto/device.mk +++ b/auto/device.mk @@ -16,7 +16,7 @@ #Automotive PRODUCT_PACKAGES += \ - android.hardware.automotive.vehicle@2.0-default-service \ + android.hardware.automotive.vehicle@V1-default-service PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.type.automotive.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.type.automotive.xml \ -- cgit v1.2.3 From d4fb55bc79620852ffc2b3b90e812c40d3bee6d3 Mon Sep 17 00:00:00 2001 From: Oscar Azucena Date: Fri, 11 Feb 2022 04:58:16 +0000 Subject: Revert "Use AIDL default VHAL for beagle-x15." Revert "Use AIDL default VHAL in aosp_phone_car." Revert "Use AIDL emulator VHAL for cuttlefish." Revert submission 16788928-aidl_vhal Reason for revert: broken test Reverted Changes: I687387ead:Use AIDL emulator VHAL for cuttlefish. I7670cf097:Use AIDL default VHAL in aosp_phone_car. I6804aa2da:Use AIDL default VHAL in ospery. I882ed3e81:Use AIDL default VHAL for beagle-x15. Bug: 218924258 Test: atest AudioFocusTest# requestAudioFocus_forRequestWithDelayedFocus_whileOneCall_requestDelayed Change-Id: I40f7a22f8927a50a533cafc870a89daa362e3400 --- auto/device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto/device.mk b/auto/device.mk index 1bf8acc..76634e7 100644 --- a/auto/device.mk +++ b/auto/device.mk @@ -16,7 +16,7 @@ #Automotive PRODUCT_PACKAGES += \ - android.hardware.automotive.vehicle@V1-default-service + android.hardware.automotive.vehicle@2.0-default-service \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.type.automotive.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.type.automotive.xml \ -- cgit v1.2.3 From bb25e7539679732e9de05ed092e2a463f7fb8947 Mon Sep 17 00:00:00 2001 From: Yu Shan Date: Thu, 3 Feb 2022 18:28:09 -0800 Subject: [Reland] Use AIDL default VHAL for beagle-x15. Test: Presubmit Bug: 170400618 Change-Id: I73d520a70abf900f820e16d3aa9798367245981d --- auto/device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto/device.mk b/auto/device.mk index 76634e7..1bf8acc 100644 --- a/auto/device.mk +++ b/auto/device.mk @@ -16,7 +16,7 @@ #Automotive PRODUCT_PACKAGES += \ - android.hardware.automotive.vehicle@2.0-default-service \ + android.hardware.automotive.vehicle@V1-default-service PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.type.automotive.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.type.automotive.xml \ -- cgit v1.2.3 From de15023292b7184c7ed8a59ebed3d4b9021fdc06 Mon Sep 17 00:00:00 2001 From: Yu Shan Date: Wed, 16 Feb 2022 02:51:35 +0000 Subject: Revert "[Reland] Use AIDL default VHAL for beagle-x15." Revert "[Reland] Use AIDL default VHAL in aosp_phone_car." Revert "[Reland] Use AIDL emulator VHAL for cuttlefish." Revert submission 16872877-aidl_vhal Reason for revert: break api_test which was not included in presubmit for the original CL. Possibly due to the new AIDL implementation revealing some existing hidden problems in power service. Reverted Changes: Ie024dda62:[Reland] Use AIDL default VHAL in aosp_phone_car. If35e8fd30:[Reland] Use AIDL emulator VHAL for cuttlefish. I5e45d85dd:[Reland] Use AIDL default VHAL in ospery. I73d520a70:[Reland] Use AIDL default VHAL for beagle-x15. Change-Id: I6dcbaebdacf9a9f745a84397f290e76701e8f361 --- auto/device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto/device.mk b/auto/device.mk index 1bf8acc..76634e7 100644 --- a/auto/device.mk +++ b/auto/device.mk @@ -16,7 +16,7 @@ #Automotive PRODUCT_PACKAGES += \ - android.hardware.automotive.vehicle@V1-default-service + android.hardware.automotive.vehicle@2.0-default-service \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.type.automotive.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.type.automotive.xml \ -- cgit v1.2.3