drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
android_frameworks_base/tests/net/Android.bp

73 lines
1.8 KiB
Plaintext
Raw Normal View History

Convert tests/**/Android.mk files to Android.bp See build/soong/README.md for more information. Note: tests/ImfTest/Android.mk causes conflict as it hasn't been yet ported to internal master. Do it later. Note: the conversion in the following directories has to be done in the internal master first because of the conflicts: * tests/ActivityManagerPerfTests * tests/AppLaunch * tests/AppLaunchWear * tests/BackgroundDexOptServiceIntegrationTests * tests/Camera2Tests/CameraToo * tests/Camera2Tests/SmartCamera/SimpleCamera * tests/Compatibility * tests/Internal * tests/RcsTests * tests/ServiceCrashTest * tests/UsbTests Bug: 122332340 Test: treehugger Change-Id: Ie17590c6a96aee5caa80d38092a3de5c1b6efe8d
2019-02-20 16:52:48 -08:00
//########################################################################
// Build FrameworksNetTests package
//########################################################################
Move NetworkStatsFactory into service directory In order to notify netd to swap eBPF maps before pulling the networkStats from eBPF maps, NetworkStatsFactory need to use the NetdServices to issue binder calls. So it need to be moved from framework/base/core to framework/base/service since object in framework/base/core cannot get any system services. This change is also necessary for setting up a lock inside NetworkStatsFactory to prevent racing between two netstats caller since the lock need to be hold before netd trigger the map swap. Also fix the compile problem caused by moving the NetworkStatsFactory and the related tests. Rename the packages and the jni functions to a more proper name. Bug: 124764595 Bug: 128900919 Test: NetworkStatsFactoryTest android.app.usage.cts.NetworkUsageStatsTest android.net.cts.TrafficStatsTest Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 Change-Id: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
2019-03-01 15:07:24 -08:00
java_defaults {
name: "FrameworksNetTests-jni-defaults",
jni_libs: [
"ld-android",
"libbacktrace",
"libbase",
"libbinder",
"libbinderthreadstate",
"libbpf",
"libbpf_android",
"libc++",
Reland: Add FrameworksNetTests dependency on libcgrouprc Original CL description: Add FrameworksNetTests dependency on libcgrouprc The tests are currently broken without this dependency. Bug: 132925169 Test: atest FrameworksNetTests Change-Id: I473b250587d871158e1e9595d56183a0342238d8 Merged-In: If9c8aa41c4e96a79b71c88f199a4f3b0483e31cd
2019-05-10 10:53:50 -07:00
"libcgrouprc",
Move NetworkStatsFactory into service directory In order to notify netd to swap eBPF maps before pulling the networkStats from eBPF maps, NetworkStatsFactory need to use the NetdServices to issue binder calls. So it need to be moved from framework/base/core to framework/base/service since object in framework/base/core cannot get any system services. This change is also necessary for setting up a lock inside NetworkStatsFactory to prevent racing between two netstats caller since the lock need to be hold before netd trigger the map swap. Also fix the compile problem caused by moving the NetworkStatsFactory and the related tests. Rename the packages and the jni functions to a more proper name. Bug: 124764595 Bug: 128900919 Test: NetworkStatsFactoryTest android.app.usage.cts.NetworkUsageStatsTest android.net.cts.TrafficStatsTest Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 Change-Id: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
2019-03-01 15:07:24 -08:00
"libcrypto",
"libcutils",
"libdl_android",
"libhidl-gen-utils",
"libhidlbase",
"libjsoncpp",
"liblog",
"liblzma",
"libnativehelper",
"libnetdbpf",
"libnetdutils",
Correct FrameworksNetTests-jni-defaults lib FrameworksNetTests-jni-defaults lib should only contain jni dependencies. Remove static_libs/libs from it and update FrameworksNetTests/FrameworksNetSmokeTests libs as well. Bug: NA Test: atest FrameworksNetSmokeTests FrameworksNetTests Change-Id: I705e949e4c00035c9734b6a240529d1c2216eb6b
2019-07-01 15:34:28 +08:00
"libnetworkstatsfactorytestjni",
Move NetworkStatsFactory into service directory In order to notify netd to swap eBPF maps before pulling the networkStats from eBPF maps, NetworkStatsFactory need to use the NetdServices to issue binder calls. So it need to be moved from framework/base/core to framework/base/service since object in framework/base/core cannot get any system services. This change is also necessary for setting up a lock inside NetworkStatsFactory to prevent racing between two netstats caller since the lock need to be hold before netd trigger the map swap. Also fix the compile problem caused by moving the NetworkStatsFactory and the related tests. Rename the packages and the jni functions to a more proper name. Bug: 124764595 Bug: 128900919 Test: NetworkStatsFactoryTest android.app.usage.cts.NetworkUsageStatsTest android.net.cts.TrafficStatsTest Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 Change-Id: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
2019-03-01 15:07:24 -08:00
"libpackagelistparser",
"libpcre2",
"libprocessgroup",
"libselinux",
"libtinyxml2",
Correct FrameworksNetTests-jni-defaults lib FrameworksNetTests-jni-defaults lib should only contain jni dependencies. Remove static_libs/libs from it and update FrameworksNetTests/FrameworksNetSmokeTests libs as well. Bug: NA Test: atest FrameworksNetSmokeTests FrameworksNetTests Change-Id: I705e949e4c00035c9734b6a240529d1c2216eb6b
2019-07-01 15:34:28 +08:00
"libui",
Move NetworkStatsFactory into service directory In order to notify netd to swap eBPF maps before pulling the networkStats from eBPF maps, NetworkStatsFactory need to use the NetdServices to issue binder calls. So it need to be moved from framework/base/core to framework/base/service since object in framework/base/core cannot get any system services. This change is also necessary for setting up a lock inside NetworkStatsFactory to prevent racing between two netstats caller since the lock need to be hold before netd trigger the map swap. Also fix the compile problem caused by moving the NetworkStatsFactory and the related tests. Rename the packages and the jni functions to a more proper name. Bug: 124764595 Bug: 128900919 Test: NetworkStatsFactoryTest android.app.usage.cts.NetworkUsageStatsTest android.net.cts.TrafficStatsTest Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 Change-Id: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
2019-03-01 15:07:24 -08:00
"libunwindstack",
Correct FrameworksNetTests-jni-defaults lib FrameworksNetTests-jni-defaults lib should only contain jni dependencies. Remove static_libs/libs from it and update FrameworksNetTests/FrameworksNetSmokeTests libs as well. Bug: NA Test: atest FrameworksNetSmokeTests FrameworksNetTests Change-Id: I705e949e4c00035c9734b6a240529d1c2216eb6b
2019-07-01 15:34:28 +08:00
"libutils",
Move NetworkStatsFactory into service directory In order to notify netd to swap eBPF maps before pulling the networkStats from eBPF maps, NetworkStatsFactory need to use the NetdServices to issue binder calls. So it need to be moved from framework/base/core to framework/base/service since object in framework/base/core cannot get any system services. This change is also necessary for setting up a lock inside NetworkStatsFactory to prevent racing between two netstats caller since the lock need to be hold before netd trigger the map swap. Also fix the compile problem caused by moving the NetworkStatsFactory and the related tests. Rename the packages and the jni functions to a more proper name. Bug: 124764595 Bug: 128900919 Test: NetworkStatsFactoryTest android.app.usage.cts.NetworkUsageStatsTest android.net.cts.TrafficStatsTest Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 Change-Id: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
2019-03-01 15:07:24 -08:00
"libutilscallstack",
Correct FrameworksNetTests-jni-defaults lib FrameworksNetTests-jni-defaults lib should only contain jni dependencies. Remove static_libs/libs from it and update FrameworksNetTests/FrameworksNetSmokeTests libs as well. Bug: NA Test: atest FrameworksNetSmokeTests FrameworksNetTests Change-Id: I705e949e4c00035c9734b6a240529d1c2216eb6b
2019-07-01 15:34:28 +08:00
"libvndksupport",
Move NetworkStatsFactory into service directory In order to notify netd to swap eBPF maps before pulling the networkStats from eBPF maps, NetworkStatsFactory need to use the NetdServices to issue binder calls. So it need to be moved from framework/base/core to framework/base/service since object in framework/base/core cannot get any system services. This change is also necessary for setting up a lock inside NetworkStatsFactory to prevent racing between two netstats caller since the lock need to be hold before netd trigger the map swap. Also fix the compile problem caused by moving the NetworkStatsFactory and the related tests. Rename the packages and the jni functions to a more proper name. Bug: 124764595 Bug: 128900919 Test: NetworkStatsFactoryTest android.app.usage.cts.NetworkUsageStatsTest android.net.cts.TrafficStatsTest Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 Change-Id: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
2019-03-01 15:07:24 -08:00
"libziparchive",
"libz",
Change AIDL module name Naming rule for aidl module is changed to make using unstable AIDL module more explicit So, to use unstable version AIDL module, use "-unstable" suffix version And also, module name without any suffix means latest frozen version. But wrt modules for C++ and NDK, module name with latest frozen version is not available for now. In b/139280289, more background is explained Test: m Bug: 139280289 Change-Id: Ib38e2cb114cc373ef50652f421ddaff9b4fbe5b9
2019-10-15 17:03:51 +09:00
"netd_aidl_interface-cpp",
Move NetworkStatsFactory into service directory In order to notify netd to swap eBPF maps before pulling the networkStats from eBPF maps, NetworkStatsFactory need to use the NetdServices to issue binder calls. So it need to be moved from framework/base/core to framework/base/service since object in framework/base/core cannot get any system services. This change is also necessary for setting up a lock inside NetworkStatsFactory to prevent racing between two netstats caller since the lock need to be hold before netd trigger the map swap. Also fix the compile problem caused by moving the NetworkStatsFactory and the related tests. Rename the packages and the jni functions to a more proper name. Bug: 124764595 Bug: 128900919 Test: NetworkStatsFactoryTest android.app.usage.cts.NetworkUsageStatsTest android.net.cts.TrafficStatsTest Merged-In: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 Change-Id: Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8
2019-03-01 15:07:24 -08:00
],
}
android_test {
name: "FrameworksNetTests",
defaults: ["FrameworksNetTests-jni-defaults"],
[Tether02] Migrate TetheringConfiguration into module TetheringConfiguration is a utility class to encapsulate the various configuration elements. Bug: 136040414 Test: -build, flash, boot -atest TetheringTests Change-Id: I9434ab213bc5e0fca59f14a6c8cea554abefc3a4
2019-09-03 15:58:06 +08:00
srcs: [
":tethering-tests-src",
"java/**/*.java",
"java/**/*.kt",
],
Convert tests/**/Android.mk files to Android.bp See build/soong/README.md for more information. Note: tests/ImfTest/Android.mk causes conflict as it hasn't been yet ported to internal master. Do it later. Note: the conversion in the following directories has to be done in the internal master first because of the conflicts: * tests/ActivityManagerPerfTests * tests/AppLaunch * tests/AppLaunchWear * tests/BackgroundDexOptServiceIntegrationTests * tests/Camera2Tests/CameraToo * tests/Camera2Tests/SmartCamera/SimpleCamera * tests/Compatibility * tests/Internal * tests/RcsTests * tests/ServiceCrashTest * tests/UsbTests Bug: 122332340 Test: treehugger Change-Id: Ie17590c6a96aee5caa80d38092a3de5c1b6efe8d
2019-02-20 16:52:48 -08:00
platform_apis: true,
test_suites: ["device-tests"],
certificate: "platform",
Correct FrameworksNetTests-jni-defaults lib FrameworksNetTests-jni-defaults lib should only contain jni dependencies. Remove static_libs/libs from it and update FrameworksNetTests/FrameworksNetSmokeTests libs as well. Bug: NA Test: atest FrameworksNetSmokeTests FrameworksNetTests Change-Id: I705e949e4c00035c9734b6a240529d1c2216eb6b
2019-07-01 15:34:28 +08:00
static_libs: [
"androidx.test.rules",
"FrameworksNetCommonTests",
"frameworks-base-testutils",
Extract test utilities for ConnectivityService The utilities help using ConnectivityService in tests, and will be used to write integration tests for ConnectivityService. Test: atest FrameworksNetTests Change-Id: Ie895ad05139cd5768d3d8a9bd5589d72571f47e6
2019-06-13 16:12:02 +09:00
"frameworks-net-integration-testutils",
Correct FrameworksNetTests-jni-defaults lib FrameworksNetTests-jni-defaults lib should only contain jni dependencies. Remove static_libs/libs from it and update FrameworksNetTests/FrameworksNetSmokeTests libs as well. Bug: NA Test: atest FrameworksNetSmokeTests FrameworksNetTests Change-Id: I705e949e4c00035c9734b6a240529d1c2216eb6b
2019-07-01 15:34:28 +08:00
"framework-protos",
"mockito-target-minus-junit4",
"net-tests-utils",
"platform-test-annotations",
"services.core",
"services.net",
],
libs: [
"android.test.runner",
"android.test.base",
"android.test.mock",
],
Convert tests/**/Android.mk files to Android.bp See build/soong/README.md for more information. Note: tests/ImfTest/Android.mk causes conflict as it hasn't been yet ported to internal master. Do it later. Note: the conversion in the following directories has to be done in the internal master first because of the conflicts: * tests/ActivityManagerPerfTests * tests/AppLaunch * tests/AppLaunchWear * tests/BackgroundDexOptServiceIntegrationTests * tests/Camera2Tests/CameraToo * tests/Camera2Tests/SmartCamera/SimpleCamera * tests/Compatibility * tests/Internal * tests/RcsTests * tests/ServiceCrashTest * tests/UsbTests Bug: 122332340 Test: treehugger Change-Id: Ie17590c6a96aee5caa80d38092a3de5c1b6efe8d
2019-02-20 16:52:48 -08:00
}
Reference in New Issue Copy Permalink