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

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

Merge "binder: declare main in global NS, w/o extern "C"" into main am: e963fbdf am: 9a58b483 

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



Change-Id: I737ff6efd6a1ce16b5629ec8712ead0802e1befa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d1ef19b 9a58b483

libs/binder/tests/binderSafeInterfaceTest.cpp

+7 −4
Original line number Diff line number Diff line
@@ -858,7 +858,13 @@ TEST_F(SafeInterfaceTest, TestIncrementTwo) { 
    ASSERT_EQ(b + 1, bPlusOne);

}



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

} // namespace tests

} // namespace android



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

    using namespace android;

    using namespace android::tests;



    testing::InitGoogleTest(&argc, argv);



    if (fork() == 0) {
@@ -875,6 +881,3 @@ extern "C" int main(int argc, char **argv) { 


    return RUN_ALL_TESTS();

}
 


} // namespace tests

} // namespace android

libs/binderdebug/stats.cpp

+2 −4
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 


#include <inttypes.h>



namespace android {

int main() {

    using namespace android;



extern "C" int main() {

    // ignore args - we only print csv



    // we should use a csv library here for escaping, because
@@ -58,5 +58,3 @@ extern "C" int main() { 
    }

    return 0;

}
 


} // namespace android

libs/binderdebug/tests/binderdebug_test.cpp

+8 −5
Original line number Diff line number Diff line
@@ -60,8 +60,15 @@ TEST(BinderDebugTests, BinderThreads) { 
    EXPECT_GE(pidInfo.threadCount, 1);

}



extern "C" {

} // namespace  test

} // namespace  binderdebug

} // namespace  android



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

    using namespace android;

    using namespace android::binderdebug;

    using namespace android::binderdebug::test;



    ::testing::InitGoogleTest(&argc, argv);



    // Create a child/client process to call into the main process so we can ensure
@@ -84,7 +91,3 @@ int main(int argc, char** argv) { 


    return RUN_ALL_TESTS();

}
 
} // extern "C"

} // namespace  test

} // namespace  binderdebug

} // namespace  android