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

Merge "Move VPN JNI to the bottom of srcs" am: 64512597fd am: 2442a58473

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481

Change-Id: I884a464727b8f2dbf7554926dd8a0fd9cab71176
This commit is contained in:
Remi NGUYEN VAN
2020-11-06 05:48:38 +00:00
committed by Automerger Merge Worker
parent 1cf14ba648 2442a58473
commit d60841c6e4
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 {
"stats/SubsystemSleepStatePuller.cpp",
"com_android_server_adb_AdbDebuggingManager.cpp",
"com_android_server_am_BatteryStatsService.cpp",
"com_android_server_connectivity_Vpn.cpp",
"com_android_server_ConsumerIrService.cpp",
"com_android_server_devicepolicy_CryptoTestHelper.cpp",
"com_android_server_gpu_GpuService.cpp",
@@ -60,6 +59,8 @@ cc_library_static {
"com_android_server_pm_PackageManagerShellCommandDataLoader.cpp",
"onload.cpp",
":lib_networkStatsFactory_native",
// TODO: move the file below to the connectivity APEX
"com_android_server_connectivity_Vpn.cpp",
],
include_dirs: [