c73cc60d57
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
(cherry picked from commit 3d680e887b)
Change-Id: I8a0a8d4b4e8872cb88ee526772ae519a8e6df615
104 lines
2.5 KiB
Plaintext
104 lines
2.5 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.
|
|
//
|
|
|
|
android_test {
|
|
name: "NetworkStackTests",
|
|
certificate: "platform",
|
|
srcs: ["src/**/*.java"],
|
|
test_suites: ["device-tests"],
|
|
resource_dirs: ["res"],
|
|
static_libs: [
|
|
"androidx.test.rules",
|
|
"mockito-target-extended-minus-junit4",
|
|
"NetworkStackBase",
|
|
"testables",
|
|
],
|
|
libs: [
|
|
"android.test.runner",
|
|
"android.test.base",
|
|
"android.test.mock",
|
|
],
|
|
jni_libs: [
|
|
// For mockito extended
|
|
"libdexmakerjvmtiagent",
|
|
"libstaticjvmtiagent",
|
|
// For ApfTest
|
|
"libartbase",
|
|
"libbacktrace",
|
|
"libbase",
|
|
"libbinder",
|
|
"libbinderthreadstate",
|
|
"libc++",
|
|
"libcgrouprc",
|
|
"libcrypto",
|
|
"libcutils",
|
|
"libdexfile",
|
|
"ld-android",
|
|
"libdl_android",
|
|
"libhidl-gen-utils",
|
|
"libhidlbase",
|
|
"libhidltransport",
|
|
"libhwbinder",
|
|
"libjsoncpp",
|
|
"liblog",
|
|
"liblzma",
|
|
"libnativehelper",
|
|
"libnativehelper_compat_libc++",
|
|
"libnetworkstacktestsjni",
|
|
"libnetworkstackutilsjni",
|
|
"libpackagelistparser",
|
|
"libpcre2",
|
|
"libprocessgroup",
|
|
"libselinux",
|
|
"libui",
|
|
"libutils",
|
|
"libvintf",
|
|
"libvndksupport",
|
|
"libtinyxml2",
|
|
"libunwindstack",
|
|
"libutilscallstack",
|
|
"libziparchive",
|
|
"libz",
|
|
"netd_aidl_interface-cpp",
|
|
],
|
|
}
|
|
|
|
cc_library_shared {
|
|
name: "libnetworkstacktestsjni",
|
|
srcs: [
|
|
"jni/**/*.cpp"
|
|
],
|
|
cflags: [
|
|
"-Wall",
|
|
"-Wextra",
|
|
"-Werror",
|
|
],
|
|
include_dirs: [
|
|
"hardware/google/apf",
|
|
],
|
|
shared_libs: [
|
|
"libbinder",
|
|
"liblog",
|
|
"libcutils",
|
|
"libnativehelper",
|
|
"netd_aidl_interface-cpp",
|
|
],
|
|
static_libs: [
|
|
"libapf",
|
|
"libpcap",
|
|
],
|
|
}
|