summaryrefslogtreecommitdiffstats
path: root/conanfile.py
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@qt.io>2021-09-15 14:06:30 +0300
committerIikka Eklund <iikka.eklund@qt.io>2021-09-21 10:41:01 +0300
commit66b1b8064224824e7fff4022daa27f53acecc7ae (patch)
tree2a4a674ea5ca30aa1f775ac6069f89bb8b41d7e0 /conanfile.py
parent9cd87a778d657c9aea9b29f076cee0f060bd6d44 (diff)
Conan: Fix invalid options for package_id checksum
The android specific options were plain wrong: - android_sdk_path -> android_sdk - android_ndk_path -> android_ndk These reflect the Qt configure options. Pick-to: 6.2 Change-Id: I0b9283b6603aff8243208216baffe263d37b6541 Reviewed-by: Matti Paaso <matti.paaso@qt.io>
Diffstat (limited to 'conanfile.py')
-rw-r--r--conanfile.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/conanfile.py b/conanfile.py
index 396f5f9a60..257a354b85 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -448,8 +448,8 @@ class QtBase(ConanFile):
# as those probably differ on each machine
rm_list = [
"sdk",
- "android_sdk_path",
- "android_ndk_path",
+ "android_sdk",
+ "android_ndk",
"android_ndk_platform",
"android_abis",
"android_javac_target",