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

Commit cdbd5ea3 authored by Haibo Huang's avatar Haibo Huang Committed by android-build-merger
Browse files

Merge "Fix build with new googletest" am: a7e5d5fd 

am: 2fa0ae67

Change-Id: I2e04103fc6076790679d72564301db9ab27bead6
parents fbdb441d 2fa0ae67

boot/1.1/vts/functional/VtsHalBootV1_1TargetTest.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -81,6 +81,6 @@ TEST_P(BootHidlTest, SetSnapshotMergeStatus) { 
}

}





INSTANTIATE_TEST_SUITE_P(

INSTANTIATE_TEST_SUITE_P(

        , BootHidlTest,

        PerInstance, BootHidlTest,

        testing::ValuesIn(android::hardware::getAllHalInstanceNames(IBootControl::descriptor)),

        testing::ValuesIn(android::hardware::getAllHalInstanceNames(IBootControl::descriptor)),

        android::hardware::PrintInstanceNameToString);
 
        android::hardware::PrintInstanceNameToString);

health/2.1/vts/functional/VtsHalHealthV2_1TargetTest.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -252,7 +252,7 @@ TEST_P(HealthHidlTest, shouldKeepScreenOn) { 
}

}





INSTANTIATE_TEST_SUITE_P(

INSTANTIATE_TEST_SUITE_P(

        , HealthHidlTest,

        PerInstance, HealthHidlTest,

        testing::ValuesIn(android::hardware::getAllHalInstanceNames(IHealth::descriptor)),

        testing::ValuesIn(android::hardware::getAllHalInstanceNames(IHealth::descriptor)),

        android::hardware::PrintInstanceNameToString);

        android::hardware::PrintInstanceNameToString);

vibrator/aidl/vts/VtsHalVibratorTargetTest.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -247,7 +247,7 @@ TEST_P(VibratorAidl, ExternalControlUnsupportedMatchingCapabilities) { 
    }

    }

}

}





INSTANTIATE_TEST_SUITE_P(, VibratorAidl,

INSTANTIATE_TEST_SUITE_P(Vibrator, VibratorAidl,

                         testing::ValuesIn(android::getAidlHalInstanceNames(IVibrator::descriptor)),

                         testing::ValuesIn(android::getAidlHalInstanceNames(IVibrator::descriptor)),

                         android::PrintInstanceNameToString);

                         android::PrintInstanceNameToString);