cb29c2b2c9
Our stable AIDL interfaces need to use versioned build targets,
otherwise getVersion will always return 0, which makes it
impossible to support different components at different versions.
List generated with:
find . -name Android.bp -exec egrep \
-H "(netd|dnsresolver|ipmemorystore|networkstack).aidl.interface(s?)-(java|cpp)" {} \; \
| grep -v oemnetd | grep -v tests/
Test: m
Bug: 133124190
(cherry-pick from aosp/968011)
Merged-In: Idf49e840263ef32b9ee4fafa6718d4f893ea7c87
(cherry picked from commit 433f7c4178)
Change-Id: I77e2291b52fda24ee01e1b22ddafe4fe7368959e
135 lines
4.4 KiB
Plaintext
135 lines
4.4 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-V2-java",
|
|
"networkstack-aidl-interfaces-V3-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"],
|
|
},
|
|
}
|
|
|
|
// 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",
|
|
// InProcessNetworkStack is a replacement for NetworkStack
|
|
overrides: ["NetworkStack"],
|
|
// The permission configuration *must* be included to ensure security of the device
|
|
// The InProcessNetworkStack goes together with the PlatformCaptivePortalLogin, which replaces
|
|
// the default CaptivePortalLogin.
|
|
required: ["PlatformNetworkPermissionConfig", "PlatformCaptivePortalLogin"],
|
|
}
|
|
|
|
// Updatable network stack packaged as an application
|
|
android_app {
|
|
name: "NetworkStack",
|
|
defaults: ["NetworkStackAppCommon"],
|
|
certificate: "networkstack",
|
|
manifest: "AndroidManifest.xml",
|
|
use_embedded_native_libs: true,
|
|
// The permission configuration *must* be included to ensure security of the device
|
|
required: ["NetworkPermissionConfig"],
|
|
}
|
|
|
|
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"],
|
|
}
|