[tor-commits] [orbot/master] fix paths for new module layout

[n8fr8@xxxxxxxxxxxxxx]

commit 5a4e00a1863b6961fb4cddb9ca8125f55bcdf525
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
Date:   Mon Sep 19 16:08:31 2016 -0400

    fix paths for new module layout
---
 app/src/main/jni/Android.mk     | 4 ++--
 app/src/main/jni/Application.mk | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index f4af1d9..c4448db 100644
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -15,7 +15,7 @@
 #
 LOCAL_PATH := $(call my-dir)
 ROOT_PATH := $(LOCAL_PATH)
-EXTERN_PATH := $(LOCAL_PATH)/../external
+EXTERN_PATH := $(LOCAL_PATH)/../../../../external
 
 ########################################################
 ## pdnsd library
@@ -136,7 +136,7 @@ LOCAL_MODULE := tun2socks
 
 LOCAL_LDLIBS := -ldl -llog
 
-LOCAL_SRC_FILES := $(addprefix ../external/badvpn/, $(TUN2SOCKS_SOURCES))
+LOCAL_SRC_FILES := $(addprefix ../../../../external/badvpn/, $(TUN2SOCKS_SOURCES))
 
 ##include $(BUILD_EXECUTABLE)
 include $(BUILD_SHARED_LIBRARY)
diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk
index a52bf0f..2fab495 100644
--- a/app/src/main/jni/Application.mk
+++ b/app/src/main/jni/Application.mk
@@ -1,4 +1,5 @@
-APP_ABI      			:= armeabi x86
-APP_PLATFORM 			:= android-9
+#APP_ABI      			:= armeabi x86
+APP_ABI      			:= armeabi
+APP_PLATFORM 			:= android-10
 APP_STL      			:= stlport_static
 NDK_TOOLCHAIN_VERSION 	:= 4.8



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits