From 27b574cf14cb9b2a53026b61dde3c87596358c41 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 30 Jul 2019 14:09:04 -0700
Subject: [PATCH] disable webrtc for android

---
 cmake/macros/TargetWebRTC.cmake       | 17 +++++++++--------
 cmake/ports/hifi-deps/CONTROL         |  2 +-
 libraries/audio-client/CMakeLists.txt |  5 ++++-
 libraries/shared/src/shared/WebRTC.h  |  5 +++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/cmake/macros/TargetWebRTC.cmake b/cmake/macros/TargetWebRTC.cmake
index fd5db5fcbe..d2821528df 100644
--- a/cmake/macros/TargetWebRTC.cmake
+++ b/cmake/macros/TargetWebRTC.cmake
@@ -6,18 +6,19 @@
 #
 macro(TARGET_WEBRTC)
     if (ANDROID)
-        include(SelectLibraryConfigurations)
-        set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/webrtc/webrtc)
-        set(WEBRTC_INCLUDE_DIRS "${INSTALL_DIR}/include/webrtc")
-        set(WEBRTC_LIBRARY_DEBUG ${INSTALL_DIR}/debug/lib/libwebrtc.a)
-        set(WEBRTC_LIBRARY_RELEASE ${INSTALL_DIR}/lib/libwebrtc.a)
-        select_library_configurations(WEBRTC)
+        # I don't yet have working libwebrtc for android
+        # include(SelectLibraryConfigurations)
+        # set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/webrtc/webrtc)
+        # set(WEBRTC_INCLUDE_DIRS "${INSTALL_DIR}/include/webrtc")
+        # set(WEBRTC_LIBRARY_DEBUG ${INSTALL_DIR}/debug/lib/libwebrtc.a)
+        # set(WEBRTC_LIBRARY_RELEASE ${INSTALL_DIR}/lib/libwebrtc.a)
+        # select_library_configurations(WEBRTC)
     else()
         set(WEBRTC_INCLUDE_DIRS "${VCPKG_INSTALL_ROOT}/include/webrtc")
         find_library(WEBRTC_LIBRARY NAMES webrtc PATHS ${VCPKG_INSTALL_ROOT}/lib/ NO_DEFAULT_PATH)
+        target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${WEBRTC_INCLUDE_DIRS})
+        target_link_libraries(${TARGET_NAME} ${WEBRTC_LIBRARY})
     endif()
 
-    target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${WEBRTC_INCLUDE_DIRS})
-    target_link_libraries(${TARGET_NAME} ${WEBRTC_LIBRARY})
 
 endmacro()
diff --git a/cmake/ports/hifi-deps/CONTROL b/cmake/ports/hifi-deps/CONTROL
index 0a3d194ea1..2441de9002 100644
--- a/cmake/ports/hifi-deps/CONTROL
+++ b/cmake/ports/hifi-deps/CONTROL
@@ -1,4 +1,4 @@
 Source: hifi-deps
 Version: 0.1
 Description: Collected dependencies for High Fidelity applications
-Build-Depends: bullet3, draco, etc2comp, glm, nvtt, openexr (!android), openssl (windows), tbb (!android&!osx), zlib, webrtc
+Build-Depends: bullet3, draco, etc2comp, glm, nvtt, openexr (!android), openssl (windows), tbb (!android&!osx), zlib, webrtc (!android)
diff --git a/libraries/audio-client/CMakeLists.txt b/libraries/audio-client/CMakeLists.txt
index 48d3d74cd6..6b88292dd4 100644
--- a/libraries/audio-client/CMakeLists.txt
+++ b/libraries/audio-client/CMakeLists.txt
@@ -7,7 +7,10 @@ link_hifi_libraries(audio plugins)
 include_hifi_library_headers(shared)
 include_hifi_library_headers(networking)
 
-target_webrtc()
+if (ANDROID)
+else ()
+  target_webrtc()
+endif ()
 
 # append audio includes to our list of includes to bubble
 target_include_directories(${TARGET_NAME} PUBLIC "${HIFI_LIBRARY_DIR}/audio/src")
diff --git a/libraries/shared/src/shared/WebRTC.h b/libraries/shared/src/shared/WebRTC.h
index 6f05d38a3d..2f0e444bff 100644
--- a/libraries/shared/src/shared/WebRTC.h
+++ b/libraries/shared/src/shared/WebRTC.h
@@ -20,8 +20,9 @@
 #  define NOMINMAX 1
 #  define WIN32_LEAN_AND_MEAN 1
 #elif defined(Q_OS_ANDROID)
-#  define WEBRTC_ENABLED 1
-#  define WEBRTC_POSIX 1
+// I don't yet have a working libwebrtc for android
+// #  define WEBRTC_ENABLED 1
+// #  define WEBRTC_POSIX 1
 #elif defined(Q_OS_LINUX)
 #  define WEBRTC_ENABLED 1
 #  define WEBRTC_POSIX 1