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

Commit a0e44756 authored by Roopa Sattiraju's avatar Roopa Sattiraju
Browse files

Merge changes from topic "migrate-aosp-bt" am: a1aa6390 am: 726224a8 

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

Merged-In: If51a7d232501d15a50e69d25875f0de9df490314
Change-Id: I1ca9aaf1e756eeadd5552b48c21023e60aedf5aa
parents 94d833d3 726224a8

framework/Android.bp

0 → 100644
+13 −0
Original line number Diff line number Diff line 
package {

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

}



filegroup {

    name: "framework-bluetooth-sources",

    srcs: [

        "java/**/*.java",

        "java/**/*.aidl",

    ],

    path: "java",

    visibility: ["//frameworks/base"],

}

framework/java/android/bluetooth/OWNERS

+3 −1
Original line number Diff line number Diff line 
# Bug component: 27441



rahulsabnis@google.com

sattiraju@google.com

baligh@google.com
 
siyuanh@google.com

zachoverflow@google.com

framework/tests/Android.bp

+1 −6
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_base_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_base_license"],

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

}



android_test {

service/Android.bp

0 → 100644
+28 −0
Original line number Diff line number Diff line 
// Copyright (C) 2021 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package {

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

}



filegroup {

    name: "services.bluetooth-sources",

    srcs: [

        "java/**/*.java",

    ],

    visibility: [

        "//frameworks/base/services",

        "//frameworks/base/services/core",

    ],

}

service/tests/Android.bp

0 → 100644
+30 −0
Original line number Diff line number Diff line 
// Copyright (C) 2021 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



// ============================================================

package {

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

}



filegroup {

    name: "service-bluetooth-tests-sources",

    srcs: [

        "src/**/*.java",

    ],

    visibility: [

        "//frameworks/base",

        "//frameworks/base/services",

        "//frameworks/base/services/tests/servicestests",

    ],

}