Skip to content
Permalink
Browse files

Android Studio Fixes

These are a number of fixes that help with Android development.
  • Loading branch information
greenfire27 committed Feb 11, 2020
1 parent 0a9bbbf commit 4293a3f2090a2950664f3f27c56eb96d1075ecec
Showing with 25,474 additions and 70 deletions.
  1. BIN engine/compilers/VisualStudio 2017/.vs/Torque 2D/v15/Browse.VC.db
  2. +1 −1 engine/compilers/android-studio/android-studio.iml
  3. +1,978 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/arm64-v8a/android_gradle_build.json
  4. +18 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/arm64-v8a/android_gradle_build_mini.json
  5. +17 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/arm64-v8a/build_command.txt
  6. +60 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/arm64-v8a/build_model.json
  7. +1,052 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/arm64-v8a/build_output.txt
  8. +62 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/arm64-v8a/json_generation_record.json
  9. +1,978 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/armeabi-v7a/android_gradle_build.json
  10. +18 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/armeabi-v7a/android_gradle_build_mini.json
  11. +14 −0 ...-studio/app/.cxx/ndkBuild/debug/armeabi-v7a/android_gradle_build_torque2d_armeabi-v7a.command.txt
  12. 0 ...d-studio/app/.cxx/ndkBuild/debug/armeabi-v7a/android_gradle_build_torque2d_armeabi-v7a.stderr.txt
  13. 0 ...d-studio/app/.cxx/ndkBuild/debug/armeabi-v7a/android_gradle_build_torque2d_armeabi-v7a.stdout.txt
  14. +17 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/armeabi-v7a/build_command.txt
  15. +58 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/armeabi-v7a/build_model.json
  16. +1,053 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/armeabi-v7a/build_output.txt
  17. +14 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/armeabi-v7a/json_generation_record.json
  18. +1,978 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/x86/android_gradle_build.json
  19. +18 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/x86/android_gradle_build_mini.json
  20. +17 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/x86/build_command.txt
  21. +60 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/x86/build_model.json
  22. +1,053 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/x86/build_output.txt
  23. +14 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/x86/json_generation_record.json
  24. +1,978 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/x86_64/android_gradle_build.json
  25. +18 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/x86_64/android_gradle_build_mini.json
  26. +17 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/x86_64/build_command.txt
  27. +60 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/x86_64/build_model.json
  28. +1,052 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/x86_64/build_output.txt
  29. +62 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/debug/x86_64/json_generation_record.json
  30. +1,978 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/arm64-v8a/android_gradle_build.json
  31. +18 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/arm64-v8a/android_gradle_build_mini.json
  32. +17 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/arm64-v8a/build_command.txt
  33. +60 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/arm64-v8a/build_model.json
  34. +1,047 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/arm64-v8a/build_output.txt
  35. +62 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/arm64-v8a/json_generation_record.json
  36. +1,978 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/armeabi-v7a/android_gradle_build.json
  37. +18 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/armeabi-v7a/android_gradle_build_mini.json
  38. +17 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/armeabi-v7a/build_command.txt
  39. +60 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/armeabi-v7a/build_model.json
  40. +1,048 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/armeabi-v7a/build_output.txt
  41. +58 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/armeabi-v7a/json_generation_record.json
  42. +1,978 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/x86/android_gradle_build.json
  43. +18 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/x86/android_gradle_build_mini.json
  44. +17 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/x86/build_command.txt
  45. +60 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/x86/build_model.json
  46. +1,048 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/x86/build_output.txt
  47. +62 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/x86/json_generation_record.json
  48. +1,978 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/x86_64/android_gradle_build.json
  49. +18 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/x86_64/android_gradle_build_mini.json
  50. +17 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/x86_64/build_command.txt
  51. +60 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/x86_64/build_model.json
  52. +1,047 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/x86_64/build_output.txt
  53. +62 −0 engine/compilers/android-studio/app/.cxx/ndkBuild/release/x86_64/json_generation_record.json
  54. +33 −0 engine/compilers/android-studio/app/.cxx/ndk_locator_record.json
  55. +27 −43 engine/compilers/android-studio/app/app.iml
  56. +0 −5 engine/compilers/android-studio/app/src/main/jni/Android.mk
  57. +2 −2 engine/compilers/android-studio/gradle/wrapper/gradle-wrapper.properties
  58. +6 −6 engine/source/graphics/dgl.cc
  59. +1 −1 engine/source/gui/containers/guiTabBookCtrl.h
  60. +1 −1 engine/source/gui/guiArrayCtrl.cc
  61. +1 −1 engine/source/gui/guiBitmapCtrl.cc
  62. +2 −2 engine/source/gui/guiCanvas.cc
  63. +2 −2 engine/source/gui/guiColorPicker.cc
  64. +5 −5 engine/source/gui/guiControl.h
  65. +1 −1 engine/source/gui/guiProgressCtrl.cc
Binary file not shown.
@@ -13,7 +13,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

Large diffs are not rendered by default.

@@ -0,0 +1,18 @@
{
"buildFiles": [
"C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\src\\main\\jni\\Android.mk",
"C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\src\\main\\jni\\Application.mk"
],
"cleanCommands": [
"C:\\Users\\Peter\\AppData\\Local\\Android\\Sdk\\ndk-bundle\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dC:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\src\\main\\jni\\Android.mk NDK_APPLICATION_MK\u003dC:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\src\\main\\jni\\Application.mk APP_ABI\u003darm64-v8a NDK_ALL_ABIS\u003darm64-v8a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-19 NDK_OUT\u003dC:/Users/Peter/Documents/GitHub/GGTorque2D/Torque2D/engine/compilers/android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dC:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib clean"
],
"buildTargetsCommand": "C:\\Users\\Peter\\AppData\\Local\\Android\\Sdk\\ndk-bundle\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dC:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\src\\main\\jni\\Android.mk NDK_APPLICATION_MK\u003dC:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\src\\main\\jni\\Application.mk APP_ABI\u003darm64-v8a NDK_ALL_ABIS\u003darm64-v8a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-19 NDK_OUT\u003dC:/Users/Peter/Documents/GitHub/GGTorque2D/Torque2D/engine/compilers/android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dC:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib {LIST_OF_TARGETS_TO_BUILD}",
"libraries": {
"torque2d-debug-arm64-v8a": {
"artifactName": "torque2d",
"buildCommand": "C:\\Users\\Peter\\AppData\\Local\\Android\\Sdk\\ndk-bundle\\ndk-build.cmd NDK_PROJECT_PATH\u003dnull APP_BUILD_SCRIPT\u003dC:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\src\\main\\jni\\Android.mk NDK_APPLICATION_MK\u003dC:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\src\\main\\jni\\Application.mk APP_ABI\u003darm64-v8a NDK_ALL_ABIS\u003darm64-v8a NDK_DEBUG\u003d1 APP_PLATFORM\u003dandroid-19 NDK_OUT\u003dC:/Users/Peter/Documents/GitHub/GGTorque2D/Torque2D/engine/compilers/android-studio/app/build/intermediates/ndkBuild/debug/obj NDK_LIBS_OUT\u003dC:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib C:/Users/Peter/Documents/GitHub/GGTorque2D/Torque2D/engine/compilers/android-studio/app/build/intermediates/ndkBuild/debug/obj/local/arm64-v8a/libtorque2d.so",
"abi": "arm64-v8a",
"output": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\obj\\local\\arm64-v8a\\libtorque2d.so"
}
}
}
@@ -0,0 +1,17 @@
Executable : C:\Users\Peter\AppData\Local\Android\Sdk\ndk-bundle\ndk-build.cmd
arguments :
NDK_PROJECT_PATH=null
APP_BUILD_SCRIPT=C:\Users\Peter\Documents\GitHub\GGTorque2D\Torque2D\engine\compilers\android-studio\app\src\main\jni\Android.mk
NDK_APPLICATION_MK=C:\Users\Peter\Documents\GitHub\GGTorque2D\Torque2D\engine\compilers\android-studio\app\src\main\jni\Application.mk
APP_ABI=arm64-v8a
NDK_ALL_ABIS=arm64-v8a
NDK_DEBUG=1
APP_PLATFORM=android-19
NDK_OUT=C:/Users/Peter/Documents/GitHub/GGTorque2D/Torque2D/engine/compilers/android-studio/app/build/intermediates/ndkBuild/debug/obj
NDK_LIBS_OUT=C:\Users\Peter\Documents\GitHub\GGTorque2D\Torque2D\engine\compilers\android-studio\app\build\intermediates\ndkBuild\debug\lib
APP_SHORT_COMMANDS=false
LOCAL_SHORT_COMMANDS=false
-B
-n
jvmArgs :

@@ -0,0 +1,60 @@
{
"variant": {
"module": {
"rootBuildGradleFolder": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio",
"sdkFolder": "C:\\Users\\Peter\\AppData\\Local\\Android\\Sdk",
"isNativeCompilerSettingsCacheEnabled": false,
"isBuildOnlyTargetAbiEnabled": true,
"splitsAbiFilterSet": [],
"intermediatesFolder": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\build\\intermediates",
"gradleModulePathName": ":app",
"moduleRootFolder": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app",
"makeFile": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\src\\main\\jni\\Android.mk",
"buildSystem": "NDK_BUILD",
"compilerSettingsCacheFolder": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\.cxx",
"cxxFolder": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\.cxx",
"ndkFolder": "C:\\Users\\Peter\\AppData\\Local\\Android\\Sdk\\ndk-bundle",
"ndkVersion": "20.0.5594570",
"ndkSupportedAbiList": [
"ARMEABI_V7A",
"ARM64_V8A",
"X86",
"X86_64"
],
"ndkDefaultAbiList": [
"ARMEABI_V7A",
"ARM64_V8A",
"X86",
"X86_64"
],
"cmakeToolchainFile": "."
},
"buildSystemArgumentList": [],
"cFlagList": [],
"cppFlagsList": [],
"variantName": "debug",
"soFolder": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\lib",
"objFolder": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\obj\\local",
"jsonFolder": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\.cxx\\ndkBuild\\debug",
"gradleBuildOutputFolder": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\.cxx\\cxx\\debug",
"isDebuggableEnabled": true,
"validAbiList": [
"ARMEABI_V7A",
"ARM64_V8A",
"X86",
"X86_64"
],
"buildTargetSet": []
},
"abi": "ARM64_V8A",
"abiPlatformVersion": 19,
"cxxBuildFolder": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\.cxx\\ndkBuild\\debug\\arm64-v8a",
"jsonFile": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\.cxx\\ndkBuild\\debug\\arm64-v8a\\android_gradle_build.json",
"gradleBuildOutputFolder": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\.cxx\\cxx\\debug\\arm64-v8a",
"objFolder": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\build\\intermediates\\ndkBuild\\debug\\obj\\local\\arm64-v8a",
"buildCommandFile": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\.cxx\\ndkBuild\\debug\\arm64-v8a\\build_command.txt",
"buildOutputFile": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\.cxx\\ndkBuild\\debug\\arm64-v8a\\build_output.txt",
"modelOutputFile": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\.cxx\\ndkBuild\\debug\\arm64-v8a\\build_model.json",
"jsonGenerationLoggingRecordFile": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\.cxx\\ndkBuild\\debug\\arm64-v8a\\json_generation_record.json",
"compileCommandsJsonFile": "C:\\Users\\Peter\\Documents\\GitHub\\GGTorque2D\\Torque2D\\engine\\compilers\\android-studio\\app\\.cxx\\ndkBuild\\debug\\arm64-v8a\\compile_commands.json"
}

0 comments on commit 4293a3f

Please sign in to comment.
You can’t perform that action at this time.