Merge branch 'dev'

xxr0ss · Nov 7, 2022 · 0b8d76e · 0b8d76e
2 parents 4f07287 + 70753f2
commit 0b8d76e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/jni/Android.mk b/jni/Android.mk
@@ -1,6 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 
-### inotify
+
+#### inotifywait
 include $(CLEAR_VARS)
 
 # build PIE (for Android 4.1.2 - 4.4 / 5.0 or later)
@@ -10,14 +11,14 @@ LOCAL_LDFLAGS += -fPIE -pie
 # build non-PIE (for Android 4.0.3 or earlier)
 #LOCAL_CFLAGS   = -std=c99
 
-LOCAL_C_INCLUDES := \
-	./jni/libinotifytools
-
+LOCAL_C_INCLUDES := ./jni/libinotifytools
 LOCAL_MODULE    := inotifywait
 LOCAL_SRC_FILES := wrap_inotifywait.c common.c libinotifytools/inotifytools.c libinotifytools/redblack.c
 
 include $(BUILD_EXECUTABLE)
 
+
+
 #### inotifywatch
 include $(CLEAR_VARS)
 
@@ -28,9 +29,7 @@ LOCAL_LDFLAGS += -fPIE -pie
 # build non-PIE (for Android 4.0.3 or earlier)
 #LOCAL_CFLAGS   = -std=c99
 
-LOCAL_C_INCLUDES := \
-	./jni/libinotifytools
-
+LOCAL_C_INCLUDES := ./jni/libinotifytools
 LOCAL_MODULE    := inotifywatch
 LOCAL_SRC_FILES := wrap_inotifywatch.c common.c libinotifytools/inotifytools.c libinotifytools/redblack.c
 

diff --git a/jni/Application.mk b/jni/Application.mk
@@ -1 +1 @@
-APP_ABI := arm64-v8a
+APP_ABI := arm64-v8a armeabi-v7a
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		APP_ABI := arm64-v8a
		APP_ABI := arm64-v8a armeabi-v7a