From d44b090ecd7fbe6e3e22d98684140759797a2b89 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sun, 17 Mar 2019 21:16:08 +0100
Subject: [PATCH] CMake: update for latest Android NDK; fix missing Android
 sources

---
 dtool/Config.cmake               | 12 ++++++------
 dtool/src/prc/CMakeLists.txt     |  9 +++++++++
 panda/src/express/CMakeLists.txt |  9 +++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/dtool/Config.cmake b/dtool/Config.cmake
index 47c0e94690..55ee41a2c7 100644
--- a/dtool/Config.cmake
+++ b/dtool/Config.cmake
@@ -12,7 +12,7 @@ include(CMakeDependentOption)
 # The values "UNIX", "WIN32", "MINGW", "MSYS", and "CYGWIN"
 # are automatically provided by CMAKE.  "APPLE" is also provided by
 # CMAKE but may be True on systems that are not OS X.
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+if(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android")
   set(IS_LINUX 1)
 endif()
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -378,14 +378,14 @@ set(ANDROID_NDK_HOME "" CACHE STRING
   "The location of the Android NDK directory. ANDROID_NDK_HOME may
 not contain any spaces.")
 
-set(ANDROID_ABI "armeabi" CACHE STRING
-  "Can be be set to armeabi, armeabi-v7a, x86, or mips,
+set(ANDROID_ABI "armeabi-v7a" CACHE STRING
+  "Can be be set to armeabi-v7a, arm64-v8a, x86, or x86_64,
 depending on which architecture should be targeted.")
 set_property(CACHE ANDROID_ABI PROPERTY STRINGS
-  armeabi armeabi-v7a x86 mips)
+  armeabi-v7a arm64-v8a x86 x86_64)
 
-set(ANDROID_STL "gnustl_shared" CACHE STRING "")
-set(ANDROID_PLATFORM "android-9" CACHE STRING "")
+set(ANDROID_STL "c++_shared" CACHE STRING "")
+set(ANDROID_PLATFORM "android-14" CACHE STRING "")
 set(ANDROID_ARCH "arm" CACHE STRING "")
 if(ANDROID_ARCH STREQUAL "arm")
   set(ANDROID_TOOLCHAIN "arm-linux-androideabi")
diff --git a/dtool/src/prc/CMakeLists.txt b/dtool/src/prc/CMakeLists.txt
index 3ca67a007d..18ead907d7 100644
--- a/dtool/src/prc/CMakeLists.txt
+++ b/dtool/src/prc/CMakeLists.txt
@@ -63,6 +63,11 @@ set(P3PRC_SOURCES
   reversedNumericData.cxx
   streamReader.cxx streamWrapper.cxx streamWriter.cxx)
 
+if(ANDROID)
+  set(P3PRC_SOURCES ${P3PRC_SOURCES}
+    androidLogStream.cxx)
+endif()
+
 set(P3PRC_IGATEEXT
   streamReader_ext.cxx
   streamReader_ext.h
@@ -77,6 +82,10 @@ target_include_directories(p3prc PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY
 target_link_libraries(p3prc p3dtool PKG::OPENSSL)
 target_interrogate(p3prc ALL EXTENSIONS ${P3PRC_IGATEEXT})
 
+if(ANDROID)
+  target_link_libraries(p3prc log)
+endif()
+
 if(NOT BUILD_METALIBS)
   install(TARGETS p3prc
     EXPORT Core COMPONENT Core
diff --git a/panda/src/express/CMakeLists.txt b/panda/src/express/CMakeLists.txt
index 2e1c1c28b2..9f179d0752 100644
--- a/panda/src/express/CMakeLists.txt
+++ b/panda/src/express/CMakeLists.txt
@@ -118,6 +118,11 @@ set(P3EXPRESS_SOURCES
   windowsRegistry.cxx
   zStream.cxx zStreamBuf.cxx)
 
+if(ANDROID)
+  set(P3EXPRESS_SOURCES ${P3EXPRESS_SOURCES}
+    virtualFileMountAndroidAsset.cxx)
+endif()
+
 set(P3EXPRESS_IGATEEXT
   datagram_ext.h
   memoryUsagePointers_ext.cxx
@@ -143,6 +148,10 @@ if(WIN32)
   target_link_libraries(p3express advapi32.lib ws2_32.lib)
 endif()
 
+if(ANDROID)
+  target_link_libraries(p3express android)
+endif()
+
 if(NOT BUILD_METALIBS)
   install(TARGETS p3express
     EXPORT Core COMPONENT Core