6ee6075685
Bundle the version of the tethering APEX in the build branch into CtsNetTestCases as a resource, and include it in the failure header on test failure. This should make it easy to identify what version of the module matches the built test when investigating test failures. Test: atest Flag: TEST_ONLY Change-Id: I15a53b3d7649ebde9706b10ee504d08aa78ee7de
238 lines
7.9 KiB
Text
238 lines
7.9 KiB
Text
//
|
|
// Copyright (C) 2019 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_team: "trendy_team_fwk_core_networking",
|
|
default_applicable_licenses: ["Android-Apache-2.0"],
|
|
}
|
|
|
|
// Defaults to enable/disable java targets which uses development APIs. "enabled" may have a
|
|
// different value depending on the branch.
|
|
java_defaults {
|
|
name: "ConnectivityNextEnableDefaults",
|
|
enabled: true,
|
|
}
|
|
|
|
java_defaults {
|
|
name: "NetworkStackApiShimSettingsForCurrentBranch",
|
|
// API shims to include in the networking modules built from the branch. Branches that disable
|
|
// the "next" targets must use stable shims (latest stable API level) instead of current shims
|
|
// (X_current API level).
|
|
static_libs: ["NetworkStackApiCurrentShims"],
|
|
}
|
|
|
|
apex_defaults {
|
|
name: "ConnectivityApexDefaults",
|
|
// Tethering app to include in the AOSP apex. Branches that disable the "next" targets may use
|
|
// a stable tethering app instead, but will generally override the AOSP apex to use updatable
|
|
// package names and keys, so that apex will be unused anyway.
|
|
apps: ["TetheringNext"], // Replace to "Tethering" if ConnectivityNextEnableDefaults is false.
|
|
}
|
|
|
|
enable_tethering_next_apex = true
|
|
// This is a placeholder comment to avoid merge conflicts
|
|
// as the above target may have different "enabled" values
|
|
// depending on the branch
|
|
|
|
apex {
|
|
name: "com.android.tethering",
|
|
defaults: [
|
|
"ConnectivityApexDefaults",
|
|
"CronetInTetheringApexDefaults",
|
|
"r-launched-apex-module",
|
|
],
|
|
compile_multilib: "both",
|
|
bootclasspath_fragments: [
|
|
"com.android.tethering-bootclasspath-fragment",
|
|
],
|
|
systemserverclasspath_fragments: [
|
|
"com.android.tethering-systemserverclasspath-fragment",
|
|
],
|
|
multilib: {
|
|
first: {
|
|
jni_libs: [
|
|
"libservice-connectivity",
|
|
"libservice-thread-jni",
|
|
"libandroid_net_connectivity_com_android_net_module_util_jni",
|
|
],
|
|
native_shared_libs: [
|
|
"libcom.android.tethering.dns_helper",
|
|
"libcom.android.tethering.connectivity_native",
|
|
"libnetd_updatable",
|
|
],
|
|
},
|
|
both: {
|
|
jni_libs: [
|
|
"libframework-connectivity-jni",
|
|
"libframework-connectivity-tiramisu-jni",
|
|
],
|
|
},
|
|
},
|
|
binaries: [
|
|
"clatd",
|
|
"ethtool",
|
|
"netbpfload",
|
|
"ot-daemon",
|
|
],
|
|
canned_fs_config: "canned_fs_config",
|
|
bpfs: [
|
|
"clatd.o",
|
|
"dscpPolicy.o",
|
|
"netd.o",
|
|
"offload.o",
|
|
"test.o",
|
|
],
|
|
apps: [
|
|
"ServiceConnectivityResources",
|
|
],
|
|
prebuilts: [
|
|
"current_sdkinfo",
|
|
"netbpfload.31rc",
|
|
"netbpfload.33rc",
|
|
"netbpfload.35rc",
|
|
"ot-daemon.34rc",
|
|
],
|
|
manifest: "manifest.json",
|
|
key: "com.android.tethering.key",
|
|
// Indicates that pre-installed version of this apex can be compressed.
|
|
// Whether it actually will be compressed is controlled on per-device basis.
|
|
compressible: true,
|
|
|
|
androidManifest: "AndroidManifest.xml",
|
|
|
|
compat_configs: [
|
|
"connectivity-platform-compat-config",
|
|
],
|
|
}
|
|
|
|
apex_key {
|
|
name: "com.android.tethering.key",
|
|
public_key: "com.android.tethering.avbpubkey",
|
|
private_key: "com.android.tethering.pem",
|
|
}
|
|
|
|
android_app_certificate {
|
|
name: "com.android.tethering.certificate",
|
|
certificate: "com.android.tethering",
|
|
}
|
|
|
|
filegroup {
|
|
name: "connectivity-hiddenapi-files",
|
|
srcs: [
|
|
":connectivity-t-hiddenapi-files",
|
|
"hiddenapi/*.txt",
|
|
],
|
|
visibility: ["//packages/modules/Connectivity:__subpackages__"],
|
|
}
|
|
|
|
// Encapsulate the contributions made by the com.android.tethering to the bootclasspath.
|
|
bootclasspath_fragment {
|
|
name: "com.android.tethering-bootclasspath-fragment",
|
|
contents: [
|
|
"framework-connectivity",
|
|
"framework-connectivity-t",
|
|
"framework-tethering",
|
|
] + select(release_flag("RELEASE_MOVE_VCN_TO_MAINLINE"), {
|
|
true: ["framework-connectivity-b"],
|
|
default: [],
|
|
}),
|
|
apex_available: ["com.android.tethering"],
|
|
|
|
// The bootclasspath_fragments that provide APIs on which this depends.
|
|
fragments: [
|
|
{
|
|
apex: "com.android.art",
|
|
module: "art-bootclasspath-fragment",
|
|
},
|
|
],
|
|
|
|
// Additional stubs libraries that this fragment's contents use which are
|
|
// not provided by another bootclasspath_fragment.
|
|
additional_stubs: [
|
|
"android-non-updatable",
|
|
],
|
|
|
|
// Additional hidden API flag files to override the defaults. This must only be
|
|
// modified by the Soong or platform compat team.
|
|
hidden_api: {
|
|
max_target_o_low_priority: [
|
|
"hiddenapi/hiddenapi-max-target-o-low-priority.txt",
|
|
],
|
|
unsupported: [
|
|
"hiddenapi/hiddenapi-unsupported.txt",
|
|
],
|
|
|
|
// The following packages contain classes from other modules on the
|
|
// bootclasspath. That means that the hidden API flags for this module
|
|
// has to explicitly list every single class this module provides in
|
|
// that package to differentiate them from the classes provided by other
|
|
// modules. That can include private classes that are not part of the
|
|
// API.
|
|
split_packages: [
|
|
"android.app.usage",
|
|
"android.nearby",
|
|
"android.net",
|
|
"android.net.http",
|
|
"android.net.netstats",
|
|
"android.net.util",
|
|
"android.net.vcn",
|
|
],
|
|
|
|
// The following packages and all their subpackages currently only
|
|
// contain classes from this bootclasspath_fragment. Listing a package
|
|
// here won't prevent other bootclasspath modules from adding classes in
|
|
// any of those packages but it will prevent them from adding those
|
|
// classes into an API surface, e.g. public, system, etc.. Doing so will
|
|
// result in a build failure due to inconsistent flags.
|
|
package_prefixes: [
|
|
"android.nearby.aidl",
|
|
"android.remoteauth.aidl",
|
|
"android.remoteauth",
|
|
"android.net.apf",
|
|
"android.net.connectivity",
|
|
"android.net.http.apihelpers",
|
|
"android.net.netstats.provider",
|
|
"android.net.nsd",
|
|
"android.net.thread",
|
|
"android.net.wear",
|
|
"android.net.http.internal",
|
|
],
|
|
},
|
|
}
|
|
|
|
systemserverclasspath_fragment {
|
|
name: "com.android.tethering-systemserverclasspath-fragment",
|
|
standalone_contents: ["service-connectivity"],
|
|
apex_available: ["com.android.tethering"],
|
|
}
|
|
|
|
// Extract the version number of the module from the manifest.json, and zip it as a raw resource for
|
|
// usage in android_test "resource_zips" build rules.
|
|
// The manifest.json is updated with new module versions in release branches when versions are cut.
|
|
java_genrule {
|
|
name: "connectivity-module-version-as-resource-zip",
|
|
srcs: [
|
|
"manifest.json",
|
|
],
|
|
out: ["connectivity-module-version-as-resource.zip"],
|
|
tools: ["soong_zip"],
|
|
|
|
cmd: "mkdir -p $(genDir)/res/raw && " +
|
|
// The manifest has a line with '"version": 361099999'. Grep for the line, then for the int.
|
|
"grep -Eo '\"version\": *[0-9]+' $(in) | grep -Eo '[0-9]+' > " +
|
|
"$(genDir)/res/raw/target_module_version && " +
|
|
"$(location soong_zip) -o $(out) -C $(genDir)/res -D $(genDir)/res",
|
|
}
|