aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2021-01-23 14:40:39 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2021-05-07 14:26:52 +0530
commit1aaf6a1ddea360f228f5eaa0f770bbe6300b3264 (patch)
treeacb6439bac49cd0f7cf45c33bf69cc658f844d8b
parentgradle: update property set with AGP 7 experimental flags (diff)
downloadwireguard-android-hs/agp-upgrade-prep.tar.xz
wireguard-android-hs/agp-upgrade-prep.zip
build: upgrade to AGP 7.0.0 and fix CMake warninghs/agp-upgrade-prep
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
-rw-r--r--build.gradle2
-rw-r--r--tunnel/tools/CMakeLists.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle
index 6b1606fd..0cb1df0a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
buildscript {
ext {
activityVersion = '1.2.2'
- agpVersion = '4.2.0'
+ agpVersion = '7.0.0-alpha15'
annotationsVersion = '1.2.0'
appcompatVersion = '1.2.0'
biometricVersion = '1.1.0'
diff --git a/tunnel/tools/CMakeLists.txt b/tunnel/tools/CMakeLists.txt
index 362a409c..068cdd23 100644
--- a/tunnel/tools/CMakeLists.txt
+++ b/tunnel/tools/CMakeLists.txt
@@ -3,6 +3,7 @@
# Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
cmake_minimum_required(VERSION 3.4.1)
+project("WireGuard")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
# Work around https://github.com/android-ndk/ndk/issues/602