# HG changeset patch # User Carl Byington # Date 1541706862 28800 # Node ID e6784ab8964c191d6e4fddd01a858564fe99d8f8 # Parent a5f1c68e45196e4ebab7284231b319b8ffecf191 starting update to latest toolchain diff -r a5f1c68e4519 -r e6784ab8964c Makefile --- a/Makefile Thu Nov 08 11:44:47 2018 -0800 +++ b/Makefile Thu Nov 08 11:54:22 2018 -0800 @@ -95,6 +95,3 @@ --mode=java \ $(shell find . -iname *.java | grep -v /gen/) -docs: - (cd xml; make) - diff -r a5f1c68e4519 -r e6784ab8964c app/build.gradle --- a/app/build.gradle Thu Nov 08 11:44:47 2018 -0800 +++ b/app/build.gradle Thu Nov 08 11:54:22 2018 -0800 @@ -41,17 +41,9 @@ release { minifyEnabled = false signingConfig = signingConfigs.release - ndk { - debuggable = false - abiFilters 'armeabi-v7a' - } } debug { debuggable = true - ndk { - debuggable = true - abiFilters 'armeabi-v7a' - } } } flavorDimensions "arch" @@ -63,27 +55,11 @@ dimension "arch" } } - sourceSets { - main { - jni { - srcDir "Exec" - } - } - } defaultConfig { applicationId = "com.five_ten_sg.connectbot" minSdkVersion = 8 targetSdkVersion = 15 - ndk { - moduleName = "com_google_ase_Exec" - } - } - - externalNativeBuild { - ndkBuild { - path "src/main/jni/Android.mk" - } } }