86bbfe9271
The filegroup is now unnecessary as files are all in the service-t/src directory. This change allows building all sources including ethernet by referencing src/**. This is done by using a general filegroup service-connectivity-tiramisu-sources, so that branches that cannot build the T+ code can change its contents without introducing merge conflicts in the rest of the build rules. Also change visibility rules to allow building the moved ethernet code, and add a filegroup to allow building its tests. Bug: 222234190 Test: TH Merged-In: I770bf8db3f4c18467934eb2184f5dc2408fc28ec Merged-In: I3e5df1bd44defbb9dd0c382c625a21e176368f2a Change-Id: I8f23a45800b1086cc5a765fd24d734ca82c339a8
90 lines
3.0 KiB
Plaintext
90 lines
3.0 KiB
Plaintext
//
|
|
// 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 {
|
|
// See: http://go/android-license-faq
|
|
default_applicable_licenses: ["Android-Apache-2.0"],
|
|
}
|
|
|
|
// Include build rules from Sources.bp
|
|
build = ["Sources.bp"]
|
|
|
|
filegroup {
|
|
name: "service-connectivity-tiramisu-sources",
|
|
srcs: [
|
|
"src/**/*.java",
|
|
],
|
|
visibility: ["//visibility:private"],
|
|
}
|
|
// The above filegroup can be used to specify different sources depending
|
|
// on the branch, while minimizing merge conflicts in the rest of the
|
|
// build rules.
|
|
|
|
// This builds T+ services depending on framework-connectivity-t
|
|
// hidden symbols separately from the S+ services, to ensure that S+
|
|
// services cannot accidentally depend on T+ hidden symbols from
|
|
// framework-connectivity-t.
|
|
java_library {
|
|
name: "service-connectivity-tiramisu-pre-jarjar",
|
|
sdk_version: "system_server_current",
|
|
// TODO(b/210962470): Bump this to at least S, and then T.
|
|
min_sdk_version: "30",
|
|
srcs: [
|
|
":service-connectivity-tiramisu-sources",
|
|
],
|
|
libs: [
|
|
"framework-annotations-lib",
|
|
"framework-connectivity-pre-jarjar",
|
|
"framework-connectivity-t-pre-jarjar",
|
|
"framework-tethering.stubs.module_lib",
|
|
"service-connectivity-pre-jarjar",
|
|
"service-nearby-pre-jarjar",
|
|
"ServiceConnectivityResources",
|
|
"unsupportedappusage",
|
|
],
|
|
static_libs: [
|
|
// Do not add static_libs here if they are already included in framework-connectivity
|
|
// or in service-connectivity. They are not necessary (included via
|
|
// service-connectivity-pre-jarjar), and in the case of code that is already in
|
|
// framework-connectivity, the classes would be included in the apex twice.
|
|
"modules-utils-statemachine",
|
|
],
|
|
apex_available: [
|
|
"com.android.tethering",
|
|
],
|
|
visibility: [
|
|
"//frameworks/base/tests/vcn",
|
|
"//packages/modules/Connectivity/service",
|
|
"//packages/modules/Connectivity/tests:__subpackages__",
|
|
"//packages/modules/IPsec/tests/iketests",
|
|
],
|
|
}
|
|
|
|
// Ethernet related libraries.
|
|
// TODO: remove when ethernet tests are merged into connectivity tests
|
|
filegroup {
|
|
name: "ethernet-service-test-sources",
|
|
srcs: [
|
|
"src/com/android/server/ethernet/**/*.java",
|
|
"src/com/android/server/net/DelayedDiskWrite.java",
|
|
"src/com/android/server/net/IpConfigStore.java",
|
|
],
|
|
path: "src",
|
|
visibility: [
|
|
"//packages/modules/Connectivity/tests:__subpackages__",
|
|
],
|
|
}
|