Skip to content

Add platforms strip_prefix #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keith merged 2 commits into from
Aug 7, 2026
Merged

Add platforms strip_prefix #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a84444
Add support for strip_prefix
martin4861 Aug 7, 2026
b3088df
Add strip_prefix to versions.json
martin4861 Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sdk/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ SDK_TAG = tag_class(attrs = {
doc = "Custom Android platform archive SHA-256.",
),
"platforms_strip_prefix": attr.string(
doc = "Custom Android platform archive strip prefix.",
doc = "Top-level directory inside the custom Android platform archive. Defaults to android-<version>.",
),
})

Expand Down Expand Up @@ -158,7 +158,7 @@ def _resolve_known_sdk(rctx, data, version, known):
"platform_tools_urls": platform_tools_urls,
"platforms": _common_platforms(build_tools_platforms, platform_tools_platforms),
"platforms_sha256": platform["sha256"],
"platforms_strip_prefix": platform.get("strip_prefix", ""),
"platforms_strip_prefix": platform.get("strip_prefix", "android-{}".format(version)),
"platforms_url": archive_url(platform),
}

Expand Down Expand Up @@ -198,7 +198,7 @@ def _resolve_custom_sdk(rctx):
"platform_tools_urls": platform_tools_urls,
"platforms": _common_platforms(build_tools_platforms, platform_tools_platforms),
"platforms_sha256": rctx.attr.platforms_sha256,
"platforms_strip_prefix": rctx.attr.platforms_strip_prefix,
"platforms_strip_prefix": rctx.attr.platforms_strip_prefix or "android-{}".format(version),
"platforms_url": rctx.attr.platforms_url,
}

Expand Down Expand Up @@ -889,7 +889,7 @@ def _hermetic_android_sdk_repository_impl(rctx):
rctx,
url = sdk["platforms_url"],
sha256 = sdk["platforms_sha256"],
output = "platforms",
output = "platforms/android-{}".format(sdk["api_level"]),
strip_prefix = sdk["platforms_strip_prefix"],
)

Expand Down
30 changes: 20 additions & 10 deletions sdk/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,70 +325,80 @@
"platform_tools_version": "37.0.0",
"platform": {
"file": "platform-24_r02.zip",
"sha256": "f268f5945c6ece7ea95c1c252067280854d2a20da924e22ae4720287df8bdbc9"
"sha256": "f268f5945c6ece7ea95c1c252067280854d2a20da924e22ae4720287df8bdbc9",
"strip_prefix": "android-7.0"
}
},
"25": {
"platform_tools_version": "37.0.0",
"platform": {
"file": "platform-25_r03.zip",
"sha256": "9b742d34590fe73fb7229e34835ecffb1846ca389d9f924f0b2a37de525dc6b8"
"sha256": "9b742d34590fe73fb7229e34835ecffb1846ca389d9f924f0b2a37de525dc6b8",
"strip_prefix": "android-7.1.1"
}
},
"26": {
"platform_tools_version": "37.0.0",
"platform": {
"file": "platform-26_r02.zip",
"sha256": "2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a"
"sha256": "2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a",
"strip_prefix": "android-8.0.0"
}
},
"27": {
"platform_tools_version": "37.0.0",
"platform": {
"file": "platform-27_r03.zip",
"sha256": "020c4c090bc82ce87ebaae5d1a922e21b39a1d03c78ffa43f0c3e42fc7d28169"
"sha256": "020c4c090bc82ce87ebaae5d1a922e21b39a1d03c78ffa43f0c3e42fc7d28169",
"strip_prefix": "android-8.1.0"
}
},
"28": {
"platform_tools_version": "37.0.0",
"platform": {
"file": "platform-28_r06.zip",
"sha256": "8452dbbf9668a428abb243c4f02a943b7aa83af3cca627629a15c4c09f28e7bd"
"sha256": "8452dbbf9668a428abb243c4f02a943b7aa83af3cca627629a15c4c09f28e7bd",
"strip_prefix": "android-9"
}
},
"29": {
"platform_tools_version": "37.0.0",
"platform": {
"file": "platform-29_r05.zip",
"sha256": "951da8bf175254da74626824f919bd28def64f8828f29dd3b124a535cf4049d8"
"sha256": "951da8bf175254da74626824f919bd28def64f8828f29dd3b124a535cf4049d8",
"strip_prefix": "android-10"
}
},
"30": {
"platform_tools_version": "37.0.0",
"platform": {
"file": "platform-30_r03.zip",
"sha256": "f3f5b75744dbf6ee6ed3e8174a71e513bfee502d0bc3463ea97e517bff68d84e"
"sha256": "f3f5b75744dbf6ee6ed3e8174a71e513bfee502d0bc3463ea97e517bff68d84e",
"strip_prefix": "android-11"
}
},
"31": {
"platform_tools_version": "37.0.0",
"platform": {
"file": "platform-31_r01.zip",
"sha256": "1d69fe1d7f9788d82ff3a374faf4f6ccc9d1d372aa84a86b5bcfb517523b0b3f"
"sha256": "1d69fe1d7f9788d82ff3a374faf4f6ccc9d1d372aa84a86b5bcfb517523b0b3f",
"strip_prefix": "android-12"
}
},
"32": {
"platform_tools_version": "37.0.0",
"platform": {
"file": "platform-32_r01.zip",
"sha256": "01d8da1c900e70fcf5da39767d5444e39928935b1a5927055ce749fc348ca7ae"
"sha256": "01d8da1c900e70fcf5da39767d5444e39928935b1a5927055ce749fc348ca7ae",
"strip_prefix": "android-12"
}
},
"33": {
"platform_tools_version": "37.0.0",
"platform": {
"file": "platform-33-ext3_r03.zip",
"sha256": "b32b10f787867987f03ae8e101d217e053a9065b7136379fb353b388379aed1d"
"sha256": "b32b10f787867987f03ae8e101d217e053a9065b7136379fb353b388379aed1d",
"strip_prefix": "android-13"
}
},
"34": {
Expand Down
2 changes: 1 addition & 1 deletion tools/generate_sdk_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ def _generate():
versions[version] = {
"platform_tools_version": platform_tools_version,
"platform": _archive_json(
_single_archive(pkg), metadata, infer_prefix=False
_single_archive(pkg), metadata, infer_prefix=True
),
}

Expand Down
Loading