Going forward targetSdkVersion would be set by build system. It would be by default set to 10000 before SDK finalization, and updated to the new API level after finalization. Effectively it would mean: 1. '10000' in aosp and internal master 2. Finalized number in development branches like "33" in "tm-dev" 3. As sdk hasn't been finalised in "udc-dev", it would be "10000" which would be automatically updated to finalized version after sdk finalization. Removing the target sdk version declaration from the blueprint and manifest files. More details can be found here go/mainline-modules-target-sdk-version-fix Bug: b/242296003 Test: croot; sdks=`find ./out -name 'TetheringGoogle.apk' | grep -v .intermediates`; echo $sdks; for sdk in $sdks;do aapt2 dump badging `echo $sdk` | grep targetSdkVersion:; done 1. outputs 33 in tm-mainline-prod 2. outputs 10000 in master Change-Id: I2657901f066a5220ae0f807846b32b9c41afcce9
268 lines
8.4 KiB
Plaintext
268 lines
8.4 KiB
Plaintext
//
|
|
// 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_applicable_licenses: ["Android-Apache-2.0"],
|
|
}
|
|
|
|
java_defaults {
|
|
name: "TetheringApiLevel",
|
|
sdk_version: "module_current",
|
|
min_sdk_version: "30",
|
|
}
|
|
|
|
java_defaults {
|
|
name: "TetheringReleaseTargetSdk",
|
|
target_sdk_version: "33",
|
|
}
|
|
|
|
java_defaults {
|
|
name: "TetheringExternalLibs",
|
|
// Libraries not including Tethering's own framework-tethering (different flavors of that one
|
|
// are needed depending on the build rule)
|
|
libs: [
|
|
"framework-connectivity.stubs.module_lib",
|
|
"framework-connectivity-t.stubs.module_lib",
|
|
"framework-statsd.stubs.module_lib",
|
|
"framework-wifi",
|
|
"framework-bluetooth",
|
|
"unsupportedappusage",
|
|
],
|
|
defaults_visibility: ["//visibility:private"],
|
|
}
|
|
|
|
java_defaults {
|
|
name: "TetheringAndroidLibraryDefaults",
|
|
srcs: [
|
|
"apishim/**/*.java",
|
|
"src/**/*.java",
|
|
":framework-connectivity-shared-srcs",
|
|
":services-tethering-shared-srcs",
|
|
":statslog-tethering-java-gen",
|
|
],
|
|
static_libs: [
|
|
"androidx.annotation_annotation",
|
|
"connectivity-net-module-utils-bpf",
|
|
"modules-utils-build",
|
|
"modules-utils-statemachine",
|
|
"networkstack-client",
|
|
"android.hardware.tetheroffload.config-V1.0-java",
|
|
"android.hardware.tetheroffload.control-V1.0-java",
|
|
"android.hardware.tetheroffload.control-V1.1-java",
|
|
"net-utils-framework-common",
|
|
"net-utils-device-common",
|
|
"net-utils-device-common-bpf",
|
|
"net-utils-device-common-ip",
|
|
"net-utils-device-common-netlink",
|
|
"netd-client",
|
|
"tetheringstatsprotos",
|
|
],
|
|
defaults: ["TetheringExternalLibs"],
|
|
libs: [
|
|
"framework-tethering.impl",
|
|
],
|
|
plugins: ["java_api_finder"],
|
|
manifest: "AndroidManifestBase.xml",
|
|
lint: { strict_updatability_linting: true },
|
|
}
|
|
|
|
// build tethering static library, used to compile both variants of the tethering.
|
|
android_library {
|
|
name: "TetheringApiCurrentLib",
|
|
defaults: [
|
|
"ConnectivityNextEnableDefaults",
|
|
"TetheringAndroidLibraryDefaults",
|
|
"TetheringApiLevel",
|
|
"TetheringReleaseTargetSdk"
|
|
],
|
|
static_libs: [
|
|
"NetworkStackApiCurrentShims",
|
|
],
|
|
apex_available: ["com.android.tethering"],
|
|
lint: { strict_updatability_linting: true },
|
|
}
|
|
|
|
android_library {
|
|
name: "TetheringApiStableLib",
|
|
defaults: [
|
|
"TetheringAndroidLibraryDefaults",
|
|
"TetheringApiLevel",
|
|
"TetheringReleaseTargetSdk"
|
|
],
|
|
static_libs: [
|
|
"NetworkStackApiStableShims",
|
|
],
|
|
apex_available: ["com.android.tethering"],
|
|
lint: { strict_updatability_linting: true },
|
|
}
|
|
|
|
// Due to b/143733063, APK can't access a jni lib that is in APEX (but not in the APK).
|
|
cc_library {
|
|
name: "libcom_android_networkstack_tethering_util_jni",
|
|
sdk_version: "30",
|
|
apex_available: [
|
|
"//apex_available:platform", // Used by InProcessTethering
|
|
"com.android.tethering",
|
|
],
|
|
min_sdk_version: "30",
|
|
header_libs: [
|
|
"bpf_connectivity_headers",
|
|
],
|
|
srcs: [
|
|
"jni/*.cpp",
|
|
],
|
|
shared_libs: [
|
|
"liblog",
|
|
"libnativehelper_compat_libc++",
|
|
],
|
|
static_libs: [
|
|
"libnet_utils_device_common_bpfjni",
|
|
"libnetjniutils",
|
|
],
|
|
|
|
// We cannot use plain "libc++" here to link libc++ dynamically because it results in:
|
|
// java.lang.UnsatisfiedLinkError: dlopen failed: library "libc++_shared.so" not found
|
|
// even if "libc++" is added into jni_libs below. Adding "libc++_shared" into jni_libs doesn't
|
|
// build because soong complains of:
|
|
// module Tethering missing dependencies: libc++_shared
|
|
//
|
|
// So, link libc++ statically. This means that we also need to ensure that all the C++ libraries
|
|
// we depend on do not dynamically link libc++. This is currently the case, because liblog is
|
|
// C-only and libnativehelper_compat_libc also uses stl: "c++_static".
|
|
stl: "c++_static",
|
|
|
|
cflags: [
|
|
"-Wall",
|
|
"-Werror",
|
|
"-Wno-unused-parameter",
|
|
"-Wthread-safety",
|
|
],
|
|
|
|
ldflags: ["-Wl,--exclude-libs=ALL,--error-limit=0"],
|
|
}
|
|
|
|
// Common defaults for compiling the actual APK.
|
|
java_defaults {
|
|
name: "TetheringAppDefaults",
|
|
privileged: true,
|
|
jni_libs: [
|
|
"libcom_android_networkstack_tethering_util_jni",
|
|
],
|
|
resource_dirs: [
|
|
"res",
|
|
],
|
|
// Libs are not actually needed to build here since build rules using these defaults are just
|
|
// packaging the TetheringApiXLibs in APKs, but they are necessary so that R8 has the right
|
|
// references to optimize the code. Without these, there will be missing class warnings and code
|
|
// may be wrongly optimized.
|
|
// R8 runs after jarjar, so the framework-X libraries need to be the post-jarjar artifacts
|
|
// (framework-tethering.impl), if they are not just stubs, so that the name of jarjared
|
|
// classes match.
|
|
// TODO(b/229727645): ensure R8 fails the build fully if libraries are missing
|
|
defaults: ["TetheringExternalLibs"],
|
|
libs: [
|
|
"framework-tethering.impl",
|
|
],
|
|
jarjar_rules: "jarjar-rules.txt",
|
|
optimize: {
|
|
proguard_flags_files: ["proguard.flags"],
|
|
},
|
|
lint: { strict_updatability_linting: true },
|
|
}
|
|
|
|
// Non-updatable tethering running in the system server process for devices not using the module
|
|
android_app {
|
|
name: "InProcessTethering",
|
|
defaults: [
|
|
"TetheringAppDefaults",
|
|
"TetheringApiLevel",
|
|
"ConnectivityNextEnableDefaults",
|
|
"TetheringReleaseTargetSdk"
|
|
],
|
|
static_libs: ["TetheringApiCurrentLib"],
|
|
certificate: "platform",
|
|
manifest: "AndroidManifest_InProcess.xml",
|
|
// InProcessTethering is a replacement for Tethering
|
|
overrides: ["Tethering"],
|
|
apex_available: ["com.android.tethering"],
|
|
lint: { strict_updatability_linting: true },
|
|
}
|
|
|
|
// Updatable tethering packaged for finalized API
|
|
android_app {
|
|
name: "Tethering",
|
|
defaults: ["TetheringAppDefaults", "TetheringApiLevel"],
|
|
static_libs: ["TetheringApiStableLib"],
|
|
certificate: "networkstack",
|
|
manifest: "AndroidManifest.xml",
|
|
use_embedded_native_libs: true,
|
|
// The network stack *must* be included to ensure security of the device
|
|
required: [
|
|
"NetworkStack",
|
|
"privapp_allowlist_com.android.tethering",
|
|
],
|
|
apex_available: ["com.android.tethering"],
|
|
lint: { strict_updatability_linting: true },
|
|
}
|
|
|
|
android_app {
|
|
name: "TetheringNext",
|
|
defaults: [
|
|
"TetheringAppDefaults",
|
|
"TetheringApiLevel",
|
|
"ConnectivityNextEnableDefaults",
|
|
],
|
|
static_libs: ["TetheringApiCurrentLib"],
|
|
certificate: "networkstack",
|
|
manifest: "AndroidManifest.xml",
|
|
use_embedded_native_libs: true,
|
|
// The network stack *must* be included to ensure security of the device
|
|
required: [
|
|
"NetworkStackNext",
|
|
"privapp_allowlist_com.android.tethering",
|
|
],
|
|
apex_available: ["com.android.tethering"],
|
|
lint: { strict_updatability_linting: true },
|
|
}
|
|
|
|
sdk {
|
|
name: "tethering-module-sdk",
|
|
apexes: [
|
|
// Adds exportable dependencies of the APEX to the sdk,
|
|
// e.g. *classpath_fragments.
|
|
"com.android.tethering",
|
|
],
|
|
}
|
|
|
|
java_library_static {
|
|
name: "tetheringstatsprotos",
|
|
proto: {type: "lite"},
|
|
srcs: [
|
|
"src/com/android/networkstack/tethering/metrics/stats.proto",
|
|
],
|
|
static_libs: ["tetheringprotos"],
|
|
apex_available: ["com.android.tethering"],
|
|
min_sdk_version: "30",
|
|
}
|
|
|
|
genrule {
|
|
name: "statslog-tethering-java-gen",
|
|
tools: ["stats-log-api-gen"],
|
|
cmd: "$(location stats-log-api-gen) --java $(out) --module network_tethering" +
|
|
" --javaPackage com.android.networkstack.tethering.metrics --javaClass TetheringStatsLog",
|
|
out: ["com/android/networkstack/tethering/metrics/TetheringStatsLog.java"],
|
|
}
|