Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move VPN JNI to the bottom of srcs

Browse Source 
This is a no-op change in preparation of a bigger topic to create the
tethering+connectivity APEXes. This change allows the topic to avoid
merge conflicts between branches.

Bug: 171540887
Test: m
Change-Id: I3ab497f2133c9020131ca4392f34aedb8da99cc9
This commit is contained in:
Remi NGUYEN VAN
2020-10-29 15:25:01 +09:00
parent 72ea549909
commit 3fcb538e6f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/jni/Android.bp
View File

@@ -26,7 +26,6 @@ cc_library_static {
"com_android_server_adb_AdbDebuggingManager.cpp", "com_android_server_adb_AdbDebuggingManager.cpp",
"com_android_server_am_BatteryStatsService.cpp", "com_android_server_am_BatteryStatsService.cpp",
"com_android_server_biometrics_SurfaceToNativeHandleConverter.cpp", "com_android_server_biometrics_SurfaceToNativeHandleConverter.cpp",
"com_android_server_connectivity_Vpn.cpp",
"com_android_server_ConsumerIrService.cpp", "com_android_server_ConsumerIrService.cpp",
"com_android_server_devicepolicy_CryptoTestHelper.cpp", "com_android_server_devicepolicy_CryptoTestHelper.cpp",
"com_android_server_gpu_GpuService.cpp", "com_android_server_gpu_GpuService.cpp",
@@ -62,6 +61,8 @@ cc_library_static {
"com_android_server_pm_PackageManagerShellCommandDataLoader.cpp", "com_android_server_pm_PackageManagerShellCommandDataLoader.cpp",
"onload.cpp", "onload.cpp",
":lib_networkStatsFactory_native", ":lib_networkStatsFactory_native",
// TODO: move the file below to the connectivity APEX
"com_android_server_connectivity_Vpn.cpp",
], ],
include_dirs: [ include_dirs: [