From 4d19a9efa7612b9118dbac609ab739ce87d020c9 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Thu, 29 Oct 2020 15:25:01 +0900 Subject: [PATCH] Move VPN JNI to the bottom of srcs 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 Merged-In: I3ab497f2133c9020131ca4392f34aedb8da99cc9 Change-Id: I3ab497f2133c9020131ca4392f34aedb8da99cc9 --- services/core/jni/Android.bp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index e8972742f8e2b..22b51ccd1a63a 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -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: [