Merge branch 'master' of github.com:NeoTerm/NeoTerm

This commit is contained in:
imkiva
2018-11-08 23:31:49 +08:00
3 changed files with 4 additions and 2 deletions

View File

@ -16,7 +16,7 @@ android {
externalNativeBuild { externalNativeBuild {
cmake { cmake {
cppFlags "-std=c++11" cppFlags "-std=c++11"
abiFilters 'x86_64', 'arm64-v8a', 'armeabi-v7a' abiFilters 'x86', 'x86_64', 'arm64-v8a', 'armeabi-v7a'
} }
} }
sourceSets { sourceSets {

View File

@ -7,6 +7,8 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <termios.h> #include <termios.h>
#include <unistd.h>
#include <string.h>
#define __neoterm_no_return __attribute__((__noreturn__)) #define __neoterm_no_return __attribute__((__noreturn__))

View File

@ -22,7 +22,7 @@ android {
} }
dependencies { dependencies {
compile 'com.github.michael-rapp:android-util:1.15.0' api 'com.github.michael-rapp:android-util:1.15.0'
implementation rootProject.ext.deps["annotations"] implementation rootProject.ext.deps["annotations"]
implementation rootProject.ext.deps["appcompat-v7"] implementation rootProject.ext.deps["appcompat-v7"]
testImplementation rootProject.ext.deps["junit"] testImplementation rootProject.ext.deps["junit"]