Fix test breakage due to naming collision in the linker.
Test: hwui_unit_tests in question now run successfully. Change-Id: If99865cd1cfa5c819338d062f5685700380a60a6
This commit is contained in:
@@ -43,6 +43,10 @@ RENDERTHREAD_TEST(CanvasContext, create) {
|
||||
canvasContext->destroy(nullptr);
|
||||
}
|
||||
|
||||
// This must be in an anonymous namespace as this class name is used in multiple
|
||||
// cpp files for different purposes and without the namespace the linker can
|
||||
// arbitrarily choose which class to link against.
|
||||
namespace {
|
||||
class TestFunctor : public Functor {
|
||||
public:
|
||||
bool didProcess = false;
|
||||
@@ -52,6 +56,7 @@ public:
|
||||
return DrawGlInfo::kStatusDone;
|
||||
}
|
||||
};
|
||||
}; // end anonymous namespace
|
||||
|
||||
RENDERTHREAD_TEST(CanvasContext, invokeFunctor) {
|
||||
TestFunctor functor;
|
||||
|
||||
@@ -91,6 +91,10 @@ TEST(SkiaDisplayList, reuseDisplayList) {
|
||||
ASSERT_EQ(availableList.get(), nullptr);
|
||||
}
|
||||
|
||||
// This must be in an anonymous namespace as this class name is used in multiple
|
||||
// cpp files for different purposes and without the namespace the linker can
|
||||
// arbitrarily choose which class to link against.
|
||||
namespace {
|
||||
class TestFunctor : public Functor {
|
||||
public:
|
||||
bool didSync = false;
|
||||
@@ -100,6 +104,7 @@ public:
|
||||
return DrawGlInfo::kStatusDone;
|
||||
}
|
||||
};
|
||||
}; // end anonymous namespace
|
||||
|
||||
TEST(SkiaDisplayList, syncContexts) {
|
||||
SkRect bounds = SkRect::MakeWH(200, 200);
|
||||
|
||||
Reference in New Issue
Block a user