diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2021-09-15 14:06:30 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-21 09:17:47 +0000 |
| commit | 5673fb1f9ff0e95b868d7eed48a9e531cd833d03 (patch) | |
| tree | d5c98b3ed433601a65ddcbd0f8fdb1304a871d85 /conanfile.py | |
| parent | 3c7840904f3042caaa38d29b4639c5ad98b3fd7e (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.
Change-Id: I0b9283b6603aff8243208216baffe263d37b6541
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit 66b1b8064224824e7fff4022daa27f53acecc7ae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'conanfile.py')
| -rw-r--r-- | conanfile.py | 4 |
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", |