summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2023-04-17 14:56:49 +0200
committerArne Schwabe <arne@rfc2549.org>2023-04-17 15:22:05 +0200
commit653f6ef1bc1c4b857d8467d25bac5937d57102b5 (patch)
tree5aec6192565bae71a49b8a63b804239183ab9aa4 /main
parent3c160282b4a4d450810baa28f1a757bba82ce6bb (diff)
Update gradle files
Diffstat (limited to 'main')
-rw-r--r--main/build.gradle.kts4
-rw-r--r--main/src/main/AndroidManifest.xml3
-rw-r--r--main/src/main/cpp/CMakeLists.txt2
-rw-r--r--main/src/skeleton/AndroidManifest.xml3
-rw-r--r--main/src/ui/AndroidManifest.xml3
5 files changed, 9 insertions, 6 deletions
diff --git a/main/build.gradle.kts b/main/build.gradle.kts
index ae06c637..c8d3a737 100644
--- a/main/build.gradle.kts
+++ b/main/build.gradle.kts
@@ -13,6 +13,10 @@ plugins {
}
android {
+ buildFeatures {
+ aidl = true
+ }
+ namespace = "de.blinkt.openvpn"
compileSdk = 33
// Also update runcoverity.sh
diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index fd21400b..1afe859e 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="de.blinkt.openvpn">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index 3dc1370f..f40eaa4d 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 3.4.1)
+project("ics-openvpn")
# Git version string
include(GetGitRevisionDescription.cmake)
@@ -180,6 +181,7 @@ set(openvpn_srcs
src/openvpn/proxy.c
src/openvpn/ps.c
src/openvpn/push.c
+ src/openvpn/reflect_filter.c
src/openvpn/reliable.c
src/openvpn/route.c
src/openvpn/run_command.c
diff --git a/main/src/skeleton/AndroidManifest.xml b/main/src/skeleton/AndroidManifest.xml
index 02a91024..23b1c7d9 100644
--- a/main/src/skeleton/AndroidManifest.xml
+++ b/main/src/skeleton/AndroidManifest.xml
@@ -4,8 +4,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="de.blinkt.openvpn">
+ xmlns:tools="http://schemas.android.com/tools">
<application tools:ignore="AllowBackup,GoogleAppIndexingWarning">
<activity
diff --git a/main/src/ui/AndroidManifest.xml b/main/src/ui/AndroidManifest.xml
index 21241f0a..2a296183 100644
--- a/main/src/ui/AndroidManifest.xml
+++ b/main/src/ui/AndroidManifest.xml
@@ -4,8 +4,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="de.blinkt.openvpn">
+ xmlns:tools="http://schemas.android.com/tools">
<uses-feature
android:name="android.software.leanback"