Use git submodules to pull dependencies

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "submodules/nDPI"]
+	path = submodules/nDPI
+  url = https://github.com/ntop/nDPI
+[submodule "submodules/zdtun"]
+	path = submodules/zdtun
+	url = https://github.com/emanuele-f/zdtun

README.md

@@ -68,10 +68,7 @@ PCAPdroid integrates [nDPI](https://github.com/ntop/nDPI) to detect the applicat
 
 ## Building
 
-1. Clone this repo locally
-2. Clone https://github.com/emanuele-f/zdtun beside this repository
-3. Clone https://github.com/ntop/nDPI beside this repository
-4. Link the cmake file into nDPI: from this repo execute: `ln -s $(readlink -f nDPI/CMakeLists.txt) ../nDPI`
-4. Inside the nDPI directory, run `git checkout 3.4-stable; ./autogen.sh; ./configure --disable-gcrypt`
-6. Build the `zdtun` and `ndpi` modules first
-7. Then build the `app` module
+1. Clone this repo
+2. Run `git submodule update --init`
+3. Build the `zdtun` and `ndpi` modules first
+4. Then build the `app` module

app/build.gradle

@@ -28,18 +28,17 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation project(path: ':zdtun')
+    implementation project(path: ':ndpi')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.viewpager:viewpager:1.0.0'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     implementation 'com.google.android.material:material:1.2.1'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    implementation project(path: ':zdtun')
     implementation 'cat.ereza:customactivityoncrash:2.2.0'
-    implementation project(path: ':ndpi')
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation 'junit:junit:4.12'
 }

ndpi/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.0"
+    compileSdkVersion 30
+    buildToolsVersion "29.0.2"
 
 
     defaultConfig {
@@ -23,7 +23,7 @@ android {
     }
     externalNativeBuild {
         cmake {
-            path file('../../nDPI/CMakeLists.txt')
+            path file('src/main/CMakeLists.txt')
         }
     }
 

ndpi/src/main/CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 2.8.11)
+include(ExternalProject)
+
+set(CMAKE_VERBOSE_MAKEFILE ON)
+set(ROOTDIR ../../../../../submodules/nDPI)
+add_definitions(-DNDPI_LIB_COMPILATION)
+
+ExternalProject_Add(libndpi
+    SOURCE_DIR ${ROOTDIR}
+    CONFIGURE_COMMAND ./autogen.sh COMMAND ./configure --disable-gcrypt)

zdtun/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.0"
+    compileSdkVersion 30
+    buildToolsVersion "29.0.2"
 
 
     defaultConfig {
@@ -23,7 +23,7 @@ android {
     }
     externalNativeBuild {
         cmake {
-            path file('../../zdtun/CMakeLists.txt')
+            path file('../submodules/zdtun/CMakeLists.txt')
         }
     }
 }