Merge "Move VPN JNI to the bottom of srcs"

2020-11-06 05:04:53 +00:00
parent bc99f76305 4d19a9efa7
commit 64512597fd
1 changed files with 2 additions and 1 deletions
--- 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: [