From 66b1b8064224824e7fff4022daa27f53acecc7ae Mon Sep 17 00:00:00 2001
From: Iikka Eklund <iikka.eklund@qt.io>
Date: Wed, 15 Sep 2021 14:06:30 +0300
Subject: 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>
---
 conanfile.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conanfile.py')

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",
-- 
cgit v1.2.3