Merge "Switch to NDK r27-beta1" into main
diff --git a/src/android_rust/build_platform.py b/src/android_rust/build_platform.py
index f2ab4e0..a1d67d4 100644
--- a/src/android_rust/build_platform.py
+++ b/src/android_rust/build_platform.py
@@ -18,14 +18,14 @@
building under for the purpose of selecting the correct paths and targets.
"""
-from enum import Enum
+from enum import StrEnum
import platform
-class PlatformType(Enum):
- DARWIN = 1
- LINUX = 2
- WINDOWS = 3
+class PlatformType(StrEnum):
+ DARWIN = "darwin"
+ LINUX = "linux"
+ WINDOWS = "windows"
def system() -> PlatformType:
diff --git a/tools/update_prebuilts.py b/tools/update_prebuilts.py
index d9554d7..6837831 100755
--- a/tools/update_prebuilts.py
+++ b/tools/update_prebuilts.py
@@ -271,7 +271,10 @@
parser.add_argument(
"--download-only", "-d", action="store_true", help="Stop after downloading the artifacts")
parser.add_argument(
- "--no-pgo", action="store_true", help="Fetch the non-PGOed version of rustc")
+ "--pgo",
+ default=True,
+ action=argparse.BooleanOptionalAction,
+ help="Fetch the PGOed version of the Rust toolchain (default true)")
parser.add_argument(
"--branch",
metavar="NAME",