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

imkiva · imkiva · commit 1a0fecdeb85c · 2018-11-08T23:31:49.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++11"
-                abiFilters 'x86_64', 'arm64-v8a', 'armeabi-v7a'
+                abiFilters 'x86', 'x86_64', 'arm64-v8a', 'armeabi-v7a'
             }
         }
         sourceSets {
diff --git a/app/src/main/cpp/neoterm.cpp b/app/src/main/cpp/neoterm.cpp
@@ -7,6 +7,8 @@
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <termios.h>
+#include <unistd.h>
+#include <string.h>
 
 #define __neoterm_no_return __attribute__((__noreturn__))
 
diff --git a/chrome-tabs/build.gradle b/chrome-tabs/build.gradle
@@ -22,7 +22,7 @@ android {
 }
 
 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["appcompat-v7"]
     testImplementation rootProject.ext.deps["junit"]

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ android {`
`16`	`16`	`externalNativeBuild {`
`17`	`17`	`cmake {`
`18`	`18`	`cppFlags "-std=c++11"`
`19`		`- abiFilters 'x86_64', 'arm64-v8a', 'armeabi-v7a'`
	`19`	`+ abiFilters 'x86', 'x86_64', 'arm64-v8a', 'armeabi-v7a'`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`sourceSets {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ android {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`dependencies {`
`25`		`- compile 'com.github.michael-rapp:android-util:1.15.0'`
	`25`	`+ api 'com.github.michael-rapp:android-util:1.15.0'`
`26`	`26`	`implementation rootProject.ext.deps["annotations"]`
`27`	`27`	`implementation rootProject.ext.deps["appcompat-v7"]`
`28`	`28`	`testImplementation rootProject.ext.deps["junit"]`