Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62170574 authored by Bob Badour's avatar Bob Badour Committed by Automerger Merge Worker
Browse files

Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Bluetooth" am:... 

Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Bluetooth" am: 00d0b704 am: 42828b70 am: 9b4f5978

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1588386

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b0e1303c47f69d0e9ba5c511ffa37b804ad1487
parents 19177e97 9b4f5978

android/app/Android.bp

+28 −0
Original line number Diff line number Diff line 
// MAP API module



package {

    default_applicable_licenses: ["packages_apps_Bluetooth_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: "packages_apps_Bluetooth_license",

    visibility: [":__subpackages__"],

    license_kinds: [

        "SPDX-license-identifier-Apache-2.0",

        "SPDX-license-identifier-BSD",

    ],

    // large-scale-change unable to identify any license_text files

}



java_library {

    name: "bluetooth.mapsapi",

android/app/tests/robotests/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ LOCAL_PATH := $(call my-dir) 
include $(CLEAR_VARS)



LOCAL_MODULE := BluetoothRoboTests

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice



LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -32,6 +34,8 @@ include $(BUILD_STATIC_JAVA_LIBRARY) 
include $(CLEAR_VARS)



LOCAL_MODULE := RunBluetoothRoboTests

LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0

LOCAL_LICENSE_CONDITIONS := notice



LOCAL_JAVA_LIBRARIES := \

    BluetoothRoboTests \

android/app/tests/unit/Android.bp

+4 −0
Original line number Diff line number Diff line 
package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



android_test {

    name: "BluetoothInstrumentationTests",