Android: Link appcompat so we can ask for audio capture permissions

This commit is contained in:
Nevyn Bengtsson 2020-11-30 16:54:44 +01:00 committed by Bjorn
parent 6f803ad3f0
commit e54629dfb0
3 changed files with 8 additions and 0 deletions

View File

@ -610,6 +610,13 @@ elseif(ANDROID)
endif()
endif()
# Shared dependencies between platforms
set(ANDROID_SUPPORT_V4 "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/android-libs/support-compat-v4-26.0.0.jar")
set(ANDROID_APPCOMPAT_V7 "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/android-libs/appcompat-v7-26.0.0.jar")
set(ANDROID_CLASSPATH "${ANDROID_CLASSPATH}:${ANDROID_SUPPORT_V4}:${ANDROID_APPCOMPAT_V7}")
set(EXTRA_JAR ${EXTRA_JAR} ${ANDROID_SUPPORT_V4} ${ANDROID_APPCOMPAT_V7})
set(ANDROID_EXTRAPACKAGES "android.support.v7.appcompat")
set(ANDROID_MANIFEST "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/AndroidManifest_${MANIFEST}.xml" CACHE STRING "The AndroidManifest.xml file to use")
if (ANDROID_KEYSTORE_PASS) # Trick so that --ks-pass is not passed if no password is given.
@ -632,6 +639,7 @@ elseif(ANDROID)
-M AndroidManifest.xml
-I ${ANDROID_JAR}
-F lovr.unaligned.apk
--extra-packages ${ANDROID_EXTRAPACKAGES}
${ANDROID_ASSETS}
raw
COMMAND ${ANDROID_TOOLS}/zipalign -f -p 4 lovr.unaligned.apk lovr.unsigned.apk

Binary file not shown.