commit cbe00014e44eeeb3f187bbcc5e0d60702201a3a5
author Lloyd Pique <lpique@google.com> Fri Feb 02 15:40:42 2018 -0800
committer Lloyd Pique <lpique@google.com> Tue Apr 17 10:48:29 2018 -0700
tree 27b79a959bf8a10975274c8471fc16b7f37af018
parent c9340b63a8ae69523b03f12aae72dab2dc7f0d16

SF: Shuffle test mocks into subdirs

This shuffles the various GMock files into a subdir mock/ that also
mirrors the subdirectory hierarchy of the implementation being mocked.

Test: libsurfaceflinger_unittest passes on Pixel XL
Bug: 74827900
Change-Id: I4c90228993a44c27708c703763e0315322fef0ce

services/surfaceflinger/tests/unittests/Android.bp

diff --git a/services/surfaceflinger/tests/unittests/Android.bp b/services/surfaceflinger/tests/unittests/Android.bp
index 8ffc5ad..bcabe0d 100644
--- a/services/surfaceflinger/tests/unittests/Android.bp
+++ b/services/surfaceflinger/tests/unittests/Android.bp
@@ -20,17 +20,17 @@
     srcs: [
         ":libsurfaceflinger_sources",
         "DisplayTransactionTest.cpp",
-        "MockComposer.cpp",
-        "MockDisplaySurface.cpp",
-        "MockEventControlThread.cpp",
-        "MockEventThread.cpp",
-        "MockGraphicBufferConsumer.cpp",
-        "MockGraphicBufferProducer.cpp",
-        "MockMessageQueue.cpp",
-        "MockNativeWindow.cpp",
-        "MockNativeWindowSurface.cpp",
-        "MockRenderEngine.cpp",
-        "MockSurfaceInterceptor.cpp",
+        "mock/DisplayHardware/MockComposer.cpp",
+        "mock/DisplayHardware/MockDisplaySurface.cpp",
+        "mock/gui/MockGraphicBufferConsumer.cpp",
+        "mock/gui/MockGraphicBufferProducer.cpp",
+        "mock/MockEventControlThread.cpp",
+        "mock/MockEventThread.cpp",
+        "mock/MockMessageQueue.cpp",
+        "mock/MockNativeWindowSurface.cpp",
+        "mock/MockSurfaceInterceptor.cpp",
+        "mock/RenderEngine/MockRenderEngine.cpp",
+        "mock/system/window/MockNativeWindow.cpp",
     ],
     static_libs: [
         "libgmock",