Skip to content

Commit

Permalink
Merge pull request #1122 from Esri/jared/AR_ABI
Browse files Browse the repository at this point in the history
only target arm64-v8a.
  • Loading branch information
jared-2016 authored Aug 12, 2020
2 parents c1861d6 + daea8ee commit d620375
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ android {
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD

ANDROID_ABIS = arm64-v8a

DISTFILES += \
android/AndroidManifest.xml \
android/build.gradle \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,16 @@ include($$AR_TOOLKIT_SOURCE_PATH/Plugin/CppApi/ArCppApi.pri)
#-------------------------------------------------------------------------------

android {
DISTFILES += \
android/AndroidManifest.xml \
android/build.gradle \
android/gradle/wrapper/gradle-wrapper.jar \
android/gradle/wrapper/gradle-wrapper.properties \
android/gradlew \
android/gradlew.bat \
android/res/values/libs.xml
ANDROID_ABIS = arm64-v8a

DISTFILES += \
android/AndroidManifest.xml \
android/build.gradle \
android/gradle/wrapper/gradle-wrapper.jar \
android/gradle/wrapper/gradle-wrapper.properties \
android/gradlew \
android/gradlew.bat \
android/res/values/libs.xml
}

contains(ANDROID_TARGET_ARCH,arm64-v8a) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ include($$AR_TOOLKIT_SOURCE_PATH/Plugin/QmlApi/ArQmlApi.pri)
android {
QT += androidextras

ANDROID_ABIS = arm64-v8a

DISTFILES += \
android/AndroidManifest.xml \
android/build.gradle \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,16 @@ include($$AR_TOOLKIT_SOURCE_PATH/Plugin/QmlApi/ArQmlApi.pri)
include(deployment.pri)

android {
DISTFILES += \
android/AndroidManifest.xml \
android/build.gradle \
android/gradle/wrapper/gradle-wrapper.jar \
android/gradle/wrapper/gradle-wrapper.properties \
android/gradlew \
android/gradlew.bat \
android/res/values/libs.xml
ANDROID_ABIS = arm64-v8a

DISTFILES += \
android/AndroidManifest.xml \
android/build.gradle \
android/gradle/wrapper/gradle-wrapper.jar \
android/gradle/wrapper/gradle-wrapper.properties \
android/gradlew \
android/gradlew.bat \
android/res/values/libs.xml
}

contains(ANDROID_TARGET_ARCH,arm64-v8a) {
Expand Down

0 comments on commit d620375

Please sign in to comment.