evilsocket · evilsocket · May 30, 2015 · May 30, 2015
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 *.so
 *.pyc
 injector/injector
+libs
+obj
diff --git a/Makefile b/Makefile
@@ -1,13 +1,11 @@
-SUBDIRS=injector libhook
-
 PROCESS=com.android.chrome
 ACTIVITY=com.google.android.apps.chrome.Main
 
 all:
-	for d in $(SUBDIRS); do [ -d $$d ] && $(MAKE) -C $$d; done
+	@ndk-build -B
 
 clean:
-	for d in $(SUBDIRS); do [ -d $$d ] && $(MAKE) -C $$d clean; done
+	@rm -rf obj libs
 
 test: all
 	python test.py
diff --git a/common.mk b/common.mk
diff --git a/injector/Makefile b/injector/Makefile
diff --git a/jni/Android.mk b/jni/Android.mk
@@ -0,0 +1,3 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(call all-subdir-makefiles)
diff --git a/jni/Application.mk b/jni/Application.mk
@@ -0,0 +1,6 @@
+APP_PLATFORM := android-19
+APP_ABI := armeabi-v7a
+APP_STL := stlport_static
+APP_PIE := true
+
+APP_CXXFLAGS := -Wall -Werror -fpermissive -fpic
diff --git a/jni/injector/Android.mk b/jni/injector/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := injector
+LOCAL_SRC_FILES := main.cpp
+
+include $(BUILD_EXECUTABLE)
diff --git a/injector/main.cpp → jni/injector/main.cpp b/injector/main.cpp → jni/injector/main.cpp
diff --git a/injector/traced.hpp → jni/injector/traced.hpp b/injector/traced.hpp → jni/injector/traced.hpp
diff --git a/jni/libhook/Android.mk b/jni/libhook/Android.mk
@@ -0,0 +1,9 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := libhook
+LOCAL_SRC_FILES := main.cpp hook.cpp report.cpp hooks/io.cpp
+LOCAL_LDLIBS    := -llog
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/libhook/hook.cpp → jni/libhook/hook.cpp b/libhook/hook.cpp → jni/libhook/hook.cpp
diff --git a/libhook/hook.h → jni/libhook/hook.h b/libhook/hook.h → jni/libhook/hook.h
diff --git a/libhook/hooks/io.cpp → jni/libhook/hooks/io.cpp b/libhook/hooks/io.cpp → jni/libhook/hooks/io.cpp
diff --git a/libhook/hooks/io.h → jni/libhook/hooks/io.h b/libhook/hooks/io.h → jni/libhook/hooks/io.h
diff --git a/libhook/linker.h → jni/libhook/linker.h b/libhook/linker.h → jni/libhook/linker.h
diff --git a/libhook/main.cpp → jni/libhook/main.cpp b/libhook/main.cpp → jni/libhook/main.cpp
diff --git a/libhook/report.cpp → jni/libhook/report.cpp b/libhook/report.cpp → jni/libhook/report.cpp
diff --git a/libhook/report.h → jni/libhook/report.h b/libhook/report.h → jni/libhook/report.h
diff --git a/libhook/Makefile b/libhook/Makefile
diff --git a/test.py b/test.py
@@ -35,8 +35,8 @@
     print "@ Pushing files to /data/local/tmp ..."
 
     adb.sh( "rm -rf /data/local/tmp/injector /data/local/tmp/libhook.so" )
-    adb.push( "injector/injector",  "/data/local/tmp/injector" )
-    adb.push( "libhook/libhook.so", "/data/local/tmp/libhook.so" )
+    adb.push( "libs/armeabi-v7a/injector",  "/data/local/tmp/injector" )
+    adb.push( "libs/armeabi-v7a/libhook.so", "/data/local/tmp/libhook.so" )
     adb.sh( "chmod 777 /data/local/tmp/injector" )
 
     print "@ Starting %s/%s ..." % ( process, activity )
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,5 @@ @@
     *.so
     *.pyc
     injector/injector
+    libs
+    obj
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		LOCAL_PATH := $(call my-dir)

		include $(call all-subdir-makefiles)