3d680e887b
The Java code was already using sdk_version: "current", but the JNI library did not have an sdk_version attribute, and had forbidden dependencies on internal libraries such as libcutils, liblog and libnativehelper. This CL fixes things as follows: - Use the NDK log functions, and switch to the NDK liblog. - Switch to the NDK libnativehelper. - Drop the dependencies on libcutils and libpcap, which were unused. - Use the libc++ STL, and set the sdk_version of the library to current. Bug: 131703417 Test: m Test: installed NetworkStack APK via "adb install --staged" results in working networking Test: builds, boots, wifi works Test: atest FrameworksNetTests NetworkStackTests Change-Id: I1a7bd7fe2809b90a66073d8c5d5dcdff646c4286
128 lines
4.0 KiB
Plaintext
128 lines
4.0 KiB
Plaintext
//
|
|
// Copyright (C) 2018 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.
|
|
//
|
|
|
|
java_library {
|
|
name: "captiveportal-lib",
|
|
srcs: ["common/**/*.java"],
|
|
libs: [
|
|
"androidx.annotation_annotation",
|
|
],
|
|
sdk_version: "system_current",
|
|
}
|
|
|
|
java_defaults {
|
|
name: "NetworkStackCommon",
|
|
sdk_version: "system_current",
|
|
min_sdk_version: "28",
|
|
}
|
|
|
|
// Library including the network stack, used to compile both variants of the network stack
|
|
android_library {
|
|
name: "NetworkStackBase",
|
|
defaults: ["NetworkStackCommon"],
|
|
srcs: [
|
|
"src/**/*.java",
|
|
":framework-networkstack-shared-srcs",
|
|
":services-networkstack-shared-srcs",
|
|
":statslog-networkstack-java-gen",
|
|
],
|
|
static_libs: [
|
|
"androidx.annotation_annotation",
|
|
"ipmemorystore-client",
|
|
"netd_aidl_interface-java",
|
|
"networkstack-aidl-interfaces-java",
|
|
"datastallprotosnano",
|
|
"networkstackprotosnano",
|
|
"captiveportal-lib",
|
|
],
|
|
manifest: "AndroidManifestBase.xml",
|
|
}
|
|
|
|
cc_library_shared {
|
|
name: "libnetworkstackutilsjni",
|
|
srcs: [
|
|
"jni/network_stack_utils_jni.cpp"
|
|
],
|
|
sdk_version: "current",
|
|
shared_libs: [
|
|
"liblog",
|
|
"libnativehelper_compat_libc++",
|
|
],
|
|
|
|
// 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 NetworkStack 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".
|
|
//
|
|
// TODO: find a better solution for this in R.
|
|
stl: "c++_static",
|
|
cflags: [
|
|
"-Wall",
|
|
"-Werror",
|
|
"-Wno-unused-parameter",
|
|
],
|
|
}
|
|
|
|
java_defaults {
|
|
name: "NetworkStackAppCommon",
|
|
defaults: ["NetworkStackCommon"],
|
|
privileged: true,
|
|
static_libs: [
|
|
"NetworkStackBase",
|
|
],
|
|
jni_libs: [
|
|
"libnativehelper_compat_libc++",
|
|
"libnetworkstackutilsjni",
|
|
],
|
|
// Resources already included in NetworkStackBase
|
|
resource_dirs: [],
|
|
jarjar_rules: "jarjar-rules-shared.txt",
|
|
optimize: {
|
|
proguard_flags_files: ["proguard.flags"],
|
|
},
|
|
// The permission configuration *must* be included to ensure security of the device
|
|
required: ["NetworkPermissionConfig"],
|
|
}
|
|
|
|
// Non-updatable network stack running in the system server process for devices not using the module
|
|
android_app {
|
|
name: "InProcessNetworkStack",
|
|
defaults: ["NetworkStackAppCommon"],
|
|
certificate: "platform",
|
|
manifest: "AndroidManifest_InProcess.xml",
|
|
}
|
|
|
|
// Updatable network stack packaged as an application
|
|
android_app {
|
|
name: "NetworkStack",
|
|
defaults: ["NetworkStackAppCommon"],
|
|
certificate: "networkstack",
|
|
manifest: "AndroidManifest.xml",
|
|
}
|
|
|
|
genrule {
|
|
name: "statslog-networkstack-java-gen",
|
|
tools: ["stats-log-api-gen"],
|
|
cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +
|
|
" --javaPackage com.android.networkstack.metrics --javaClass NetworkStackStatsLog",
|
|
out: ["com/android/networkstack/metrics/NetworkStackStatsLog.java"],
|
|
}
|