Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2668220 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge branch '4966_native_libs' into 'e_16.4.1-RC-2' 

Install native libs to correct place

See merge request e/privacy-central/orbotservice!1
parents 9075c529 54e0411f

src/main/java/org/torproject/android/service/util/CustomNativeLoader.java

+4 −3
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ public class CustomNativeLoader { 
    public static File loadNativeBinary(Context context, String libname, File destLocalFile) {



        try {





            File fileNativeBin = new File(getNativeLibraryDir(context), libname + ".so");

            if (!fileNativeBin.exists())

                fileNativeBin = new File(getNativeLibraryDir(context), "lib" + libname + ".so");
@@ -93,12 +91,15 @@ public class CustomNativeLoader { 


            String folder = Build.CPU_ABI;





            String javaArch = System.getProperty("os.arch");

            if (javaArch != null && javaArch.contains("686")) {

                folder = "x86";

            }



            if (destLocalFile.exists()) {

                return destLocalFile;

            }



            if (loadFromZip(context, libname, destLocalFile, folder)) {

                return destLocalFile;

            }

src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class OrbotVpnManager implements Handler.Callback { 
    private static final String TAG = "OrbotVpnService";

    private final static int VPN_MTU = 1500;

    private final static boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;

    private final static String PDNSD_BIN = "pdnsd";

    private final static String PDNSD_BIN = "libpdnsd";

    public static int sSocksProxyServerPort = -1;

    public static String sSocksProxyLocalhost = null;

    boolean isStarted = false;

src/main/jni/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ include $(CLEAR_VARS) 


PDNSD_SOURCES  := $(wildcard $(LOCAL_PATH)/pdnsd/src/*.c)



LOCAL_MODULE    := pdnsd

LOCAL_MODULE    := libpdnsd

LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)/%=%)

LOCAL_CFLAGS    := -Wall -O2 -I$(LOCAL_PATH)/pdnsd -DHAVE_STPCPY

LOCAL_CFLAGS    := -Wall -O2 -I$(LOCAL_PATH)/libpdnsd -DHAVE_STPCPY





include $(BUILD_EXECUTABLE)