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

Commit ed0f3469 authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

Merge "Add separate 'vndservice' binary." into oc-dev 

am: cde29667

Change-Id: Iae0d0a37df6afdbd9f99b139afbcd6aa8a8c0c5a
parents e0656e5a cde29667

cmds/service/Android.bp

+14 −1
Original line number Diff line number Diff line
@@ -9,5 +9,18 @@ cc_binary { 
    ],



    cflags: ["-DXP_UNIX"],

    //shared_libs: ["librt"],

}



cc_binary {

    name: "vndservice",



    proprietary: true,

    srcs: ["service.cpp"],



    shared_libs: [

        "libutils",

        "libbinder",

    ],



    cflags: ["-DXP_UNIX", "-DVENDORSERVICES"],

}

cmds/service/service.cpp

+4 −9
Original line number Diff line number Diff line
@@ -69,11 +69,10 @@ static String8 good_old_string(const String16& src) 
int main(int argc, char* const argv[])

{

    bool wantsUsage = false;

    bool wantsVendorServices = false;

    int result = 0;

    

    while (1) {

        int ic = getopt(argc, argv, "vh?");

        int ic = getopt(argc, argv, "h?");

        if (ic < 0)

            break;
@@ -82,9 +81,6 @@ int main(int argc, char* const argv[]) 
        case '?':

            wantsUsage = true;

            break;

        case 'v':

            wantsVendorServices = true;

            break;

        default:

            aerr << "service: Unknown option -" << ic << endl;

            wantsUsage = true;
@@ -92,10 +88,9 @@ int main(int argc, char* const argv[]) 
            break;

        }

    }



    if (wantsVendorServices) {

#ifdef VENDORSERVICES

    ProcessState::initWithDriver("/dev/vndbinder");

    }

#endif

    sp<IServiceManager> sm = defaultServiceManager();

    fflush(stdout);

    if (sm == NULL) {