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

Commit 1b490875 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: split out ProcessInfoService" am: e8fa8e34 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1663089

Change-Id: I30d7cf2517a243c05d2562185fc12877f66375d7
parents 44f85ee1 e8fa8e34

libs/binder/Android.bp

+14 −2
Original line number Diff line number Diff line
@@ -66,11 +66,9 @@ libbinder_device_interface_sources = [ 
    "IAppOpsCallback.cpp",

    "IAppOpsService.cpp",

    "IPermissionController.cpp",

    "IProcessInfoService.cpp",

    "IUidObserver.cpp",

    "PermissionCache.cpp",

    "PermissionController.cpp",

    "ProcessInfoService.cpp",

    "IpPrefix.cpp",

    ":activity_manager_procstate_aidl",

]
@@ -285,3 +283,17 @@ cc_library { 
        "libutils",

    ],

}



cc_library {

    name: "libprocessinfoservice_aidl",

    srcs: [

        "IProcessInfoService.cpp",

        "ProcessInfoService.cpp",

    ],

    export_include_dirs: ["include_processinfo"],

    shared_libs: [

        "libbinder",

        "libutils",

        "liblog",

    ],

}

libs/binder/IProcessInfoService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include <binder/IProcessInfoService.h>

#include <processinfo/IProcessInfoService.h>

#include <binder/Parcel.h>

#include <utils/Errors.h>

#include <sys/types.h>

libs/binder/ProcessInfoService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include <binder/ProcessInfoService.h>

#include <processinfo/ProcessInfoService.h>

#include <binder/IServiceManager.h>



#include <utils/Log.h>

libs/binder/include/binder/ProcessInfoService.h→libs/binder/include_processinfo/processinfo/ProcessInfoService.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#ifndef __ANDROID_VNDK__



#include <binder/IProcessInfoService.h>

#include <processinfo/IProcessInfoService.h>

#include <utils/Errors.h>

#include <utils/Singleton.h>

#include <sys/types.h>