enable build for x86 in Android

This commit is contained in:
shuxin   zheng 2019-10-18 16:43:32 +08:00
parent bda63febae
commit 581a3124c8
3 changed files with 9 additions and 7 deletions

View File

@ -10,7 +10,7 @@
</facet>
<facet type="native-android-gradle" name="Native-Android-Gradle">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug-armeabi" />
<option name="SELECTED_BUILD_VARIANT" value="debug-arm64-v8a" />
</configuration>
</facet>
<facet type="android" name="Android">
@ -25,7 +25,7 @@
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
<option name="PROJECT_TYPE" value="1" />
</configuration>

View File

@ -36,8 +36,9 @@ android {
//arguments "-DCMAKE_VERBOSE_MAKEFILE=ON"
arguments "-DACL_CLIENT_ONLY=YES"
//cppFlags "-fexceptions"
//abiFilters 'armeabi', 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'
abiFilters 'armeabi', 'arm64-v8a', 'armeabi-v7a'
abiFilters 'armeabi', 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'
//abiFilters 'armeabi', 'arm64-v8a', 'armeabi-v7a'
//abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'
}
cmake {
//arguments '-DANDROID_PLATFORM=android-14','-DANDROID_TOOLCHAIN=clang'

View File

@ -4,6 +4,7 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Wed Oct 16 16:42:29 CST 2019
ndk.dir=E\:\\tools\\android\\Sdk\\ndk-bundle-r16b
sdk.dir=E\:\\tools\\android\\Sdk
#Thu Oct 17 17:02:59 CST 2019
#ndk.dir=/Users/shuxinzheng/Library/Android/sdk/ndk-bundle
ndk.dir=/Users/shuxinzheng/Library/Android/android-ndk-r16b
sdk.dir=/Users/shuxinzheng/Library/Android/sdk