From ac4e4aaf8fb7d70665673bfd130b3a0a49776c53 Mon Sep 17 00:00:00 2001 From: Bob Badour <bbadour@google.com> Date: Thu, 28 Oct 2021 17:18:16 -0700 Subject: [PATCH] [LSC] Add LOCAL_LICENSE_KINDS to system/bt Added SPDX-license-identifier-Apache-2.0 to: le_audio/certification_tool/bap_uclient_test_tool/Android.bp le_audio/certification_tool/types/Android.bp le_audio/frameworks/base/Android.bp le_audio/frameworks/base/packages/SettingsLib/Android.bp le_audio/packages/apps/Bluetooth/Android.bp le_audio/packages/apps/Bluetooth/jni/Android.bp le_audio/packages/apps/Settings/Android.bp le_audio/system/bt/binder/Android.bp le_audio/system/bt/bta/Android.bp le_audio/system/bt/btif/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: I6c0595d8f98e8f5015e861d59fa3c29125464270 --- .../bap_uclient_test_tool/Android.bp | 9 +++++++++ le_audio/certification_tool/types/Android.bp | 9 +++++++++ le_audio/frameworks/base/Android.bp | 9 +++++++++ .../frameworks/base/packages/SettingsLib/Android.bp | 9 +++++++++ le_audio/packages/apps/Bluetooth/Android.bp | 9 +++++++++ le_audio/packages/apps/Bluetooth/jni/Android.bp | 9 +++++++++ le_audio/packages/apps/Settings/Android.bp | 9 +++++++++ le_audio/system/bt/binder/Android.bp | 10 +++++++++- le_audio/system/bt/bta/Android.bp | 9 +++++++++ le_audio/system/bt/btif/Android.bp | 9 +++++++++ 10 files changed, 90 insertions(+), 1 deletion(-) diff --git a/le_audio/certification_tool/bap_uclient_test_tool/Android.bp b/le_audio/certification_tool/bap_uclient_test_tool/Android.bp index 87fb6d8daf2..ea9b244968a 100644 --- a/le_audio/certification_tool/bap_uclient_test_tool/Android.bp +++ b/le_audio/certification_tool/bap_uclient_test_tool/Android.bp @@ -16,6 +16,15 @@ * ******************************************************************************/ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_bt_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_bt_license"], +} + cc_binary { name: "bap_uclient_test", system_ext_specific: true, diff --git a/le_audio/certification_tool/types/Android.bp b/le_audio/certification_tool/types/Android.bp index 77d1630ba0b..90679df354e 100644 --- a/le_audio/certification_tool/types/Android.bp +++ b/le_audio/certification_tool/types/Android.bp @@ -17,6 +17,15 @@ ******************************************************************************/ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_bt_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_bt_license"], +} + cc_library_static { name: "libbluetooth-types-qti", vendor_available: true, diff --git a/le_audio/frameworks/base/Android.bp b/le_audio/frameworks/base/Android.bp index 1d9cf9f9501..95d4675f568 100644 --- a/le_audio/frameworks/base/Android.bp +++ b/le_audio/frameworks/base/Android.bp @@ -16,6 +16,15 @@ * ******************************************************************************/ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_bt_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_bt_license"], +} + filegroup { name: "framework-bluetooth-adva-srcs", srcs: ["core/**/*.java",], diff --git a/le_audio/frameworks/base/packages/SettingsLib/Android.bp b/le_audio/frameworks/base/packages/SettingsLib/Android.bp index d7a2bb17fd3..ac4fdad8689 100644 --- a/le_audio/frameworks/base/packages/SettingsLib/Android.bp +++ b/le_audio/frameworks/base/packages/SettingsLib/Android.bp @@ -16,6 +16,15 @@ * ******************************************************************************/ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_bt_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_bt_license"], +} + filegroup { name: "framework-settingslib-adva-srcs", srcs: ["src/**/*.java"], diff --git a/le_audio/packages/apps/Bluetooth/Android.bp b/le_audio/packages/apps/Bluetooth/Android.bp index 76e84993eb2..8cc96c23a6c 100644 --- a/le_audio/packages/apps/Bluetooth/Android.bp +++ b/le_audio/packages/apps/Bluetooth/Android.bp @@ -16,6 +16,15 @@ * ******************************************************************************/ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_bt_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_bt_license"], +} + filegroup { name: "bluetooth-apps-adva-srcs", srcs: ["src/com/android/bluetooth/groupclient/*.java", diff --git a/le_audio/packages/apps/Bluetooth/jni/Android.bp b/le_audio/packages/apps/Bluetooth/jni/Android.bp index 009c57a9f68..5fa66427821 100644 --- a/le_audio/packages/apps/Bluetooth/jni/Android.bp +++ b/le_audio/packages/apps/Bluetooth/jni/Android.bp @@ -16,6 +16,15 @@ * ******************************************************************************/ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_bt_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_bt_license"], +} + cc_defaults { name: "libbluetoothqti_jni_adva_default", header_libs: ["libbluetooth_headers", "libnativehelper_header_only"], diff --git a/le_audio/packages/apps/Settings/Android.bp b/le_audio/packages/apps/Settings/Android.bp index ec3867dc40f..47ec0c4b6fa 100644 --- a/le_audio/packages/apps/Settings/Android.bp +++ b/le_audio/packages/apps/Settings/Android.bp @@ -16,6 +16,15 @@ * ******************************************************************************/ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_bt_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_bt_license"], +} + filegroup { name: "settings-bluetooth-adva-srcs", srcs: ["src/**/*.java"], diff --git a/le_audio/system/bt/binder/Android.bp b/le_audio/system/bt/binder/Android.bp index f246cbfed48..4744b11c321 100644 --- a/le_audio/system/bt/binder/Android.bp +++ b/le_audio/system/bt/binder/Android.bp @@ -17,6 +17,15 @@ ******************************************************************************/ // AIDL interface between libbluetooth-binder and framework.jar +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_bt_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_bt_license"], +} + filegroup { name: "libbluetooth-binder-aidl-adva", srcs: [ @@ -25,4 +34,3 @@ filegroup { "android/bluetooth/IBluetoothBroadcast.aidl", ], } - diff --git a/le_audio/system/bt/bta/Android.bp b/le_audio/system/bt/bta/Android.bp index c90b78836fb..5505ad2d78f 100644 --- a/le_audio/system/bt/bta/Android.bp +++ b/le_audio/system/bt/bta/Android.bp @@ -16,6 +16,15 @@ * ******************************************************************************/ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_bt_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_bt_license"], +} + cc_defaults { name: "fluoride_bta_defaults_qti_adva", defaults: ["fluoride_defaults"], diff --git a/le_audio/system/bt/btif/Android.bp b/le_audio/system/bt/btif/Android.bp index 134d8089bf1..f989ec4c378 100644 --- a/le_audio/system/bt/btif/Android.bp +++ b/le_audio/system/bt/btif/Android.bp @@ -16,6 +16,15 @@ * ******************************************************************************/ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "system_bt_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["system_bt_license"], +} + cc_defaults { name: "fluoride_btif_defaults_qti_adva", defaults: ["fluoride_defaults"], -- GitLab