Merge lp:~robertcarr/mir/build-droidinput-as-shared-lib into lp:~mir-team/mir/trunk

[Robert Carr]

Build android input library as shared lib so it can be used by both the client library (for input receiver and batching) and the server.

Build android input library as shared lib so it can be used by both the client library (for input receiver and batching) and the server.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:461
http://s-jenkins:8080/job/mir-ci/1129/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/mir-ci/./build=pbuilder,distribution=quantal,flavor=amd64/1129/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1129//rebuild/?

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

I see link errors with MIR_INPUT_USE_ANDROID_TYPES on:

../../../lib/libandroid-input.so: undefined reference to `pthread_key_create'
../../../lib/libandroid-input.so: undefined reference to `pthread_attr_setstacksize'
../../../lib/libandroid-input.so: undefined reference to `pthread_once'
../../../lib/libandroid-input.so: undefined reference to `pthread_getspecific'
../../../lib/libandroid-input.so: undefined reference to `pthread_create'
../../../lib/libandroid-input.so: undefined reference to `pthread_setspecific'

[Alan Griffiths (alan-griffiths)]

> I see link errors with MIR_INPUT_USE_ANDROID_TYPES on:
>
> ../../../lib/libandroid-input.so: undefined reference to `pthread_key_create'
> ../../../lib/libandroid-input.so: undefined reference to
> `pthread_attr_setstacksize'
> ../../../lib/libandroid-input.so: undefined reference to `pthread_once'
> ../../../lib/libandroid-input.so: undefined reference to `pthread_getspecific'
> ../../../lib/libandroid-input.so: undefined reference to `pthread_create'
> ../../../lib/libandroid-input.so: undefined reference to `pthread_setspecific'

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:465
http://s-jenkins:8080/job/mir-ci/1138/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/mir-ci/./build=pbuilder,distribution=quantal,flavor=amd64/1138/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1138//rebuild/?

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

I see link compile with MIR_INPUT_USE_ANDROID_TYPES on: but these don't originate with the MP.

The fix is:

  3rd_party/android-input/android/frameworks/native/include/utils/Condition.h => 3rd_party/android-deps/utils/Condition.h
  3rd_party/android-input/android/frameworks/native/include/utils/Mutex.h => 3rd_party/android-deps/utils/Mutex.h

(I'll create an MP)

review: Approve

=== modified file '3rd_party/android-input/android/CMakeLists.txt'
--- 3rd_party/android-input/android/CMakeLists.txt	2013-03-01 00:20:50 +0000
+++ 3rd_party/android-input/android/CMakeLists.txt	2013-03-05 18:23:20 +0000
@@ -49,7 +49,7 @@
 
 
 add_library(
-  android-input
+  android-input SHARED
   # The stuff that we want
   frameworks/base/services/input/EventHub.cpp
   frameworks/base/services/input/InputApplication.cpp
@@ -85,14 +85,19 @@
     skia)
 endif()
 
-if(NOT MIR_INPUT_USE_ANDROID_TYPES)
-  target_link_libraries(
-    android-input
-    ${Boost_LIBRARIES})
-endif()
+target_link_libraries(
+  android-input
+
+  ${Boost_LIBRARIES}
+  -lpthread
+)
 
 set_target_properties(
   android-input
   PROPERTIES
   COMPILE_FLAGS ${ANDROID_INPUT_COMPILE_FLAGS}
-  )
+)
+
+install(
+  TARGETS android-input
+  LIBRARY DESTINATION lib)

=== modified file '3rd_party/android-input/tools/CMakeLists.txt'
--- 3rd_party/android-input/tools/CMakeLists.txt	2013-02-11 12:50:00 +0000
+++ 3rd_party/android-input/tools/CMakeLists.txt	2013-03-05 18:23:20 +0000
@@ -25,15 +25,15 @@
 if(MIR_PLATFORM STREQUAL "gbm")
   target_link_libraries(
     raw-event-printer
+
     android-input
-    -lrt
-    -lpthread
     )
 endif()
 
 if(MIR_PLATFORM STREQUAL "android")
   target_link_libraries(
     raw-event-printer
+
     android-input
     )
 endif()
@@ -55,8 +55,6 @@
   target_link_libraries(
     cooked-event-printer
     android-input
-    -lrt
-    -lpthread
     )
 endif()