initial changes needed for android interface cmake

CMakeLists.txt

@@ -98,7 +98,7 @@ endif ()
 
 if (ANDROID)
   if (NOT ANDROID_QT_CMAKE_PREFIX_PATH)
-    set(QT_CMAKE_PREFIX_PATH ${ANDROID_LIB_DIR}/Qt/5.4/android_armv7/lib/cmake)
+    set(QT_CMAKE_PREFIX_PATH ${ANDROID_LIB_DIR}/Qt/5.5/android_armv7/lib/cmake)
   else ()
     set(QT_CMAKE_PREFIX_PATH ${ANDROID_QT_CMAKE_PREFIX_PATH})
   endif ()
@@ -236,6 +236,8 @@ if (NOT ANDROID)
 endif()
 
 if (ANDROID OR DESKTOP_GVR)
+  add_subdirectory(interface)
+  add_subdirectory(plugins)
   add_subdirectory(gvr-interface)
 endif ()
 

cmake/externals/hifiAudioCodec/CMakeLists.txt

@@ -5,7 +5,9 @@ set(EXTERNAL_NAME hifiAudioCodec)
 
 string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
-if (WIN32 OR APPLE)
+if (NOT ANDROID)
+
+  if (WIN32 OR APPLE)
     ExternalProject_Add(
       ${EXTERNAL_NAME}
       URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-1.zip
@@ -15,7 +17,7 @@ if (WIN32 OR APPLE)
       INSTALL_COMMAND ""
       LOG_DOWNLOAD 1
     )
-elseif(NOT ANDROID)
+  elseif ()
     ExternalProject_Add(
       ${EXTERNAL_NAME}
       URL http://s3.amazonaws.com/hifi-public/dependencies/codecSDK-linux.zip
@@ -25,19 +27,21 @@ elseif(NOT ANDROID)
       INSTALL_COMMAND ""
       LOG_DOWNLOAD 1
     )
-endif()
+  endif()
 
-# Hide this external target (for ide users)
-set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
+  # Hide this external target (for ide users)
+  set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
 
-ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
+  ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
 
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
+  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE INTERNAL)
 
-if (WIN32)
+  if (WIN32)
     set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/audio.lib CACHE TYPE INTERNAL)
-elseif(APPLE)
+  elseif(APPLE)
     set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
-elseif(NOT ANDROID)
+  elseif(NOT ANDROID)
     set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${SOURCE_DIR}/Release/libaudio.a CACHE TYPE INTERNAL)
+  endif()
+
 endif()

gvr-interface/CMakeLists.txt

@@ -83,5 +83,3 @@ if (ANDROID)
   qt_create_apk()
 
 endif (ANDROID)
-
-copy_dlls_beside_windows_executable()

interface/CMakeLists.txt

@@ -39,9 +39,18 @@ else ()
   list(REMOVE_ITEM INTERFACE_SRCS ${SPEECHRECOGNIZER_CPP})
 endif ()
 
-find_package(Qt5 COMPONENTS
+if (ANDROID)
+  set(PLATFORM_QT_COMPONENTS AndroidExtras)
+else ()
+  set(PLATFORM_QT_COMPONENTS WebEngine WebEngineWidgets WebKitWidgets)
+endif ()
+
+find_package(
+  Qt5 COMPONENTS
   Gui Multimedia Network OpenGL Qml Quick Script ScriptTools Svg
-    WebChannel WebEngine WebEngineWidgets WebKitWidgets WebSockets)
+  ${QT_WEBENGINE_COMPONENTS}
+  WebChannel WebSockets
+)
 
 # grab the ui files in resources/ui
 file (GLOB_RECURSE QT_UI_FILES ui/*.ui)
@@ -57,6 +66,25 @@ set(INTERFACE_SRCS ${INTERFACE_SRCS} "${QT_UI_HEADERS}" "${QT_RESOURCES}")
 # set(TS ${TARGET_NAME}_en.ts)
 # qt5_create_translation_custom(${QM} ${INTERFACE_SRCS} ${QT_UI_FILES} ${TS})
 
+# setup the android parameters that will help us produce an APK
+if (ANDROID)
+  set(ANDROID_APK_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/apk-build")
+  set(ANDROID_APK_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/apk")
+
+  set(ANDROID_SDK_ROOT $ENV{ANDROID_HOME})
+  set(ANDROID_APP_DISPLAY_NAME Interface)
+  set(ANDROID_API_LEVEL 19)
+  set(ANDROID_APK_PACKAGE io.highfidelity.interface)
+  set(ANDROID_ACTIVITY_NAME io.highfidelity.interface.InterfaceActivity)
+  set(ANDROID_APK_VERSION_NAME "0.1")
+  set(ANDROID_APK_VERSION_CODE 1)
+  set(ANDROID_APK_FULLSCREEN TRUE)
+  set(ANDROID_DEPLOY_QT_INSTALL "--install")
+
+  set(BUILD_SHARED_LIBS ON)
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${ANDROID_APK_OUTPUT_DIR}/libs/${ANDROID_ABI}")
+endif ()
+
 if (APPLE)
 
   # configure CMake to use a custom Info.plist
@@ -95,7 +123,7 @@ if (APPLE)
 
   # make sure the output name for the .app bundle is correct
   set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME ${INTERFACE_BUNDLE_NAME})
-elseif(WIN32)
+elseif (WIN32)
   # configure an rc file for the chosen icon
   set(CONFIGURE_ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/icon/${INTERFACE_ICON_FILENAME}")
   set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc")
@@ -104,7 +132,7 @@ elseif(WIN32)
   # add an executable that also has the icon itself and the configured rc file as resources
   add_executable(${TARGET_NAME} WIN32 ${INTERFACE_SRCS} ${QM} ${CONFIGURE_ICON_RC_OUTPUT})
 
-  if ( NOT DEV_BUILD )
+  if (NOT DEV_BUILD)
     add_custom_command(
       TARGET ${TARGET_NAME}
       POST_BUILD
@@ -113,9 +141,12 @@ elseif(WIN32)
     )
   endif()
 
-else()
+elseif (ANDROID)
+  # on android the Interface target is a library that gets linked/used by the APK shell that qtcreateapk produces
+  add_library(${TARGET_NAME} ${INTERFACE_SRCS} ${QM})
+else ()
   add_executable(${TARGET_NAME} ${INTERFACE_SRCS} ${QM})
-endif()
+endif ()
 
 target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/includes")
 
@@ -135,12 +166,19 @@ if (WIN32)
   set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY LINK_FLAGS_DEBUG "/OPT:NOREF /OPT:NOICF")
 endif()
 
+if (NOT ANDROID)
+  set(${STEAM_WRAPPER} steamworks-wrapper)
+endif ()
+
 # link required hifi libraries
-link_hifi_libraries(shared octree gpu gl gpu-gl procedural model render
+link_hifi_libraries(
+  shared octree gpu gl gpu-gl procedural model render
   recording fbx networking model-networking entities avatars
   audio audio-client animation script-engine physics
   render-utils entities-renderer ui auto-updater
-                    controllers plugins ui-plugins display-plugins input-plugins steamworks-wrapper)
+  controllers plugins ui-plugins display-plugins input-plugins
+  ${STEAM_WRAPPER}
+)
 
 # include the binary directory of render-utils for shader includes
 target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/libraries/render-utils")
@@ -291,3 +329,17 @@ if (WIN32)
 
     package_libraries_for_deployment()
 endif()
+
+if (ANDROID)
+  set(HIFI_URL_INTENT "<intent-filter>\
+    \n        <action android:name='android.intent.action.VIEW' />\
+    \n        <category android:name='android.intent.category.DEFAULT' />\
+    \n        <category android:name='android.intent.category.BROWSABLE' />\
+    \n        <data android:scheme='hifi' />\
+    \n      </intent-filter>"
+  )
+
+  set(ANDROID_EXTRA_ACTIVITY_XML "${HIFI_URL_INTENT}")
+
+  qt_create_apk()
+endif ()

plugins/hifiSixense/CMakeLists.txt

@@ -6,7 +6,9 @@
 #  See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html
 #
 
-set(TARGET_NAME hifiSixense)
-setup_hifi_plugin(Script Qml Widgets)
-link_hifi_libraries(shared controllers ui plugins ui-plugins input-plugins)
-target_sixense()
+if (NOT ANDROID)
+  set(TARGET_NAME hifiSixense)
+  setup_hifi_plugin(Script Qml Widgets)
+  link_hifi_libraries(shared controllers ui plugins ui-plugins input-plugins)
+  target_sixense()
+endif ()