$ git diff
diff --git a/tests/unit-tests/platforms/android/CMakeLists.txt b/tests/unit-tests/platforms/android/CMakeLists.txt
index a8cabda..237a15e 100644
--- a/tests/unit-tests/platforms/android/CMakeLists.txt
+++ b/tests/unit-tests/platforms/android/CMakeLists.txt
@@ -1,5 +1,8 @@
add_definitions(-DANDROID)
+# Seems to be a missing dependency in mirtest.pc
+find_package(Protobuf REQUIRED)
+
include_directories(
${ANDROID_HEADERS_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/platforms/android/include
@@ -16,8 +19,6 @@ mir_add_wrapped_executable(mir_unit_tests_android
${ANDROID_UNIT_TEST_SOURCES}
## $<TARGET_OBJECTS:mir-test-doubles-udev>
$<TARGET_OBJECTS:mirgl>
- ${MIR_PLATFORM_OBJECTS}
- ${MIR_SERVER_OBJECTS}
)
add_dependencies(mir_unit_tests_android GMock)
@@ -26,18 +27,18 @@ target_link_libraries(
mir_unit_tests_android
mirsharedandroid-static
- ${Boost_PROGRAM_OPTIONS_LIBRARY}
- ${LIBHARDWARE_LDFLAGS} ${LIBHARDWARE_LIBRARIES}
- ${ANDROID_PROPERTIES_LDFLAGS} ${ANDROID_PROPERTIES_LIBRARIES}
- mir-test-doubles-platform-static
-
- ${MIRTEST_LIBRARIES}
-
client_platform_common
server_platform_common
+ mir-test-doubles-platform-static
+
+ ${MIRTEST_LDFLAGS}
+ ${PROTOBUF_LITE_LIBRARIES}
${GTEST_BOTH_LIBRARIES}
${GMOCK_LIBRARY}
${GMOCK_MAIN_LIBRARY}
+ ${Boost_PROGRAM_OPTIONS_LIBRARY}
+ ${LIBHARDWARE_LDFLAGS} ${LIBHARDWARE_LIBRARIES}
+ ${ANDROID_PROPERTIES_LDFLAGS} ${ANDROID_PROPERTIES_LIBRARIES}
dl
)