Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2442a584 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I8c03acd5af53d8dccd183d791a1acaf434d81169
parents 98a2cb47 64512597

services/core/jni/Android.bp

+2 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ cc_library_static { 
        "stats/SubsystemSleepStatePuller.cpp",

        "stats/SubsystemSleepStatePuller.cpp",

        "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_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",
@@ -60,6 +59,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: [