(#7474) android-ndk: set CONAN_CMAKE_SYSTEM_PROCESSOR

* android-ndk: explicitly set CONAN_CMAKE_SYSTEM_PROCESSOR environment variable * android-ndk: encode arch/os in conandata.yml + reformat conan recipe * android-ndk: avoid warning in os/arch validation * android-ndk: little fix, big change
conan-io · Oct 2, 2021 · 009e863 · 009e863
1 parent 02c0fb3
commit 009e863
Show file tree

Hide file tree

Showing 3 changed files with 173 additions and 124 deletions.
diff --git a/recipes/android-ndk/all/conandata.yml b/recipes/android-ndk/all/conandata.yml
@@ -2,55 +2,70 @@ sources:
   "r23":
     url:
       "Windows":
-        url: "https://dl.google.com/android/repository/android-ndk-r23-windows.zip"
-        sha256: "40325b5bfdb7f6de016ea3efee0468a7d306eda55a6f80966a501645ba01fbfa"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r23-windows.zip"
+          sha256: "40325b5bfdb7f6de016ea3efee0468a7d306eda55a6f80966a501645ba01fbfa"
       "Linux":
-        url: "https://dl.google.com/android/repository/android-ndk-r23-linux.zip"
-        sha256: "e3eacf80016b91d4cd2c8ca9f34eebd32df912bb799c859cc5450b6b19277b4f"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r23-linux.zip"
+          sha256: "e3eacf80016b91d4cd2c8ca9f34eebd32df912bb799c859cc5450b6b19277b4f"
       "Macos":
-        url: " https://dl.google.com/android/repository/android-ndk-r23-darwin.zip"
-        sha256: "163ff3bb72306ffa814de35c49819bccae9df10855a4e3fbba52ad4111fcccae"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r23-darwin.zip"
+          sha256: "163ff3bb72306ffa814de35c49819bccae9df10855a4e3fbba52ad4111fcccae"
   "r22b":
     url:
       "Windows":
-        url: "https://dl.google.com/android/repository/android-ndk-r22b-windows-x86_64.zip"
-        sha256: "6d2fe8dbba8342634e88ecbaf321bcbfc07e579b6281f426639002dd35046d03"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r22b-windows-x86_64.zip"
+          sha256: "6d2fe8dbba8342634e88ecbaf321bcbfc07e579b6281f426639002dd35046d03"
       "Linux":
-        url: "https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip"
-        sha256: "ac3a0421e76f71dd330d0cd55f9d99b9ac864c4c034fc67e0d671d022d4e806b"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip"
+          sha256: "ac3a0421e76f71dd330d0cd55f9d99b9ac864c4c034fc67e0d671d022d4e806b"
       "Macos":
-        url: "https://dl.google.com/android/repository/android-ndk-r22b-darwin-x86_64.zip"
-        sha256: "b05d2087a6346d66cd26a1dc89fcc877b59e49feab6269b665aa67c784a81512"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r22b-darwin-x86_64.zip"
+          sha256: "b05d2087a6346d66cd26a1dc89fcc877b59e49feab6269b665aa67c784a81512"
   "r22":
     url:
       "Windows":
-        url: "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip"
-        sha256: "5a0eafa83c8bba3c76e8427aa3d83d169215f62963a277b1914a3651aa47f751"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip"
+          sha256: "5a0eafa83c8bba3c76e8427aa3d83d169215f62963a277b1914a3651aa47f751"
       "Linux":
-        url: "https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip"
-        sha256: "d37fc69cd81e5660234a686e20adef39bc0244086e4d66525a40af771c020718"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip"
+          sha256: "d37fc69cd81e5660234a686e20adef39bc0244086e4d66525a40af771c020718"
       "Macos":
-        url: "https://dl.google.com/android/repository/android-ndk-r22-darwin-x86_64.zip"
-        sha256: "14fce4dea7fb3facbc0e3d20270007bffec3ba383aec02e8b0e0dad8d8782892"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r22-darwin-x86_64.zip"
+          sha256: "14fce4dea7fb3facbc0e3d20270007bffec3ba383aec02e8b0e0dad8d8782892"
   "r21e":
     url:
       "Windows":
-        url: "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip"
-        sha256: "f71307c5c572e2c163d602b3704b8bc024bec0c43ba2800de36bd10f3a21492b"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip"
+          sha256: "f71307c5c572e2c163d602b3704b8bc024bec0c43ba2800de36bd10f3a21492b"
       "Linux":
-        url: "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip"
-        sha256: "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip"
+          sha256: "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e"
       "Macos":
-        url: "https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip"
-        sha256: "437278103a3db12632c05b1be5c41bbb8522791a67e415cc54411a65366f499d"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r21e-darwin-x86_64.zip"
+          sha256: "437278103a3db12632c05b1be5c41bbb8522791a67e415cc54411a65366f499d"
   "r21d":
     url:
       "Windows":
-        url: "https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip"
-        sha256: "18335e57f8acab5a4acf6a2204130e64f99153015d55eb2667f8c28d4724d927"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip"
+          sha256: "18335e57f8acab5a4acf6a2204130e64f99153015d55eb2667f8c28d4724d927"
       "Linux":
-        url: "https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip"
-        sha256: "dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip"
+          sha256: "dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd"
       "Macos":
-        url: "https://dl.google.com/android/repository/android-ndk-r21d-darwin-x86_64.zip"
-        sha256: "5851115c6fc4cce26bc320295b52da240665d7ff89bda2f5d5af1887582f5c48"
+        "x86_64":
+          url: "https://dl.google.com/android/repository/android-ndk-r21d-darwin-x86_64.zip"
+          sha256: "5851115c6fc4cce26bc320295b52da240665d7ff89bda2f5d5af1887582f5c48"