this greatly simplifies the assembly of the android application. moreover, ndk will be downloaded automatically via sdk-manager.master
| @@ -379,16 +379,13 @@ phsource/phonemes.stamp: \ | |||
| ##### android targets: | |||
| jni: | |||
| cd android && ndk-build | |||
| apk-release: jni espeakdata | |||
| apk-release: espeakdata | |||
| cd android && $(GRADLE) assembleRelease | |||
| apk-debug: jni espeakdata | |||
| apk-debug: espeakdata | |||
| cd android && $(GRADLE) assembleDebug | |||
| apk-check: jni espeakdata | |||
| apk-check: espeakdata | |||
| cd android && $(GRADLE) connectedCheck | |||
| android/res/raw/espeakdata.zip: espeak-ng-data/phontab dictionaries | |||
| @@ -21,7 +21,6 @@ dependencies { | |||
| } | |||
| android { | |||
| buildToolsVersion '28.0.3' | |||
| compileSdkVersion 26 | |||
| defaultConfig { | |||
| @@ -31,12 +30,17 @@ android { | |||
| versionName "1.52-dev" | |||
| } | |||
| externalNativeBuild { | |||
| ndkBuild { | |||
| path "jni/Android.mk" | |||
| } | |||
| } | |||
| sourceSets { | |||
| main { | |||
| manifest.srcFile 'AndroidManifest.xml' | |||
| java.srcDirs = ['src'] | |||
| res.srcDirs = ['res'] | |||
| jniLibs.srcDir 'libs' | |||
| } | |||
| androidTest.setRoot('eSpeakTests') | |||
| androidTest { | |||
| @@ -1,4 +1 @@ | |||
| APP_OPTIM := release | |||
| APP_PLATFORM := android-26 | |||
| APP_TOOLCHAIN_VERSION := 4.6.3 | |||
| APP_ABI := armeabi-v7a x86 | |||
| @@ -74,8 +74,6 @@ AC_PROG_MAKE_SET | |||
| AC_PROG_LIBTOOL | |||
| AC_PROG_LN_S | |||
| AC_CHECK_PROG(NDKBUILD_CHECK,[ndk-build],yes) | |||
| dnl ================================================================ | |||
| dnl gradle checks. | |||
| dnl ================================================================ | |||
| @@ -362,7 +360,6 @@ AC_MSG_NOTICE([ | |||
| PCAudioLib: ${have_pcaudiolib} | |||
| gradle (Android): ${GRADLE} | |||
| ndk-build (Android): ${NDKBUILD_CHECK} | |||
| Klatt: ${have_klatt} | |||
| speechPlayer: ${have_speechplayer} | |||