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

Commit 9be9c396 authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

Merge "Declare main in global NS, without extern "C"" into main am: 9995f07b 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3448290



Change-Id: I2bb57f6ff05282c473f848211768ac5fa5053ea2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62dc307d 9995f07b

automotive/can/aidl/default/service.cpp

+2 −4
Original line number Diff line number Diff line
@@ -20,12 +20,11 @@ 
#include <android/binder_manager.h>

#include <android/binder_process.h>



namespace android::hardware::automotive::can {



using namespace std::string_literals;

using namespace android;

using ::aidl::android::hardware::automotive::can::CanController;



extern "C" int main() {

int main() {

    base::SetDefaultTag("CanController");

    base::SetMinimumLogSeverity(base::VERBOSE);
@@ -40,4 +39,3 @@ extern "C" int main() { 
    LOG(FATAL) << "CanController exited unexpectedly!";

    return EXIT_FAILURE;

}
 
}  // namespace android::hardware::automotive::can

automotive/can/aidl/default/tools/configurator/canhalconfigurator.cpp

+5 −3
Original line number Diff line number Diff line
@@ -98,7 +98,11 @@ static bool configuratorStart(const std::string& filepath) { 
    return true;

}



extern "C" int main(int argc, char* argv[]) {

}  // namespace android::hardware::automotive::can



int main(int argc, char* argv[]) {

    using namespace android::hardware::automotive::can;



    std::string configFilepath = static_cast<std::string>(kDefaultConfigPath);



    // allow for CLI specification of a config file.
@@ -114,5 +118,3 @@ extern "C" int main(int argc, char* argv[]) { 
    }

    return 0;

}
 


}  // namespace android::hardware::automotive::can

macsec/aidl/default/service.cpp

+2 −4
Original line number Diff line number Diff line
@@ -20,12 +20,11 @@ 
#include <android/binder_manager.h>

#include <android/binder_process.h>



namespace android::hardware::macsec {



using namespace std::string_literals;

using namespace android;

using ::aidl::android::hardware::macsec::MacsecPskPlugin;



extern "C" int main() {

int main() {

    base::SetDefaultTag("MacsecPskPlugin");

    base::SetMinimumLogSeverity(base::VERBOSE);
@@ -40,4 +39,3 @@ extern "C" int main() { 
    LOG(FATAL) << "MacsecPskPlugin exited unexpectedly!";

    return EXIT_FAILURE;

}
 
}  // namespace android::hardware::macsec