Bump to build-tools 35.0.2 #16
Conversation
There was a problem hiding this comment.
Thanks for the PR. However I have a couple of strong gripes that need to be addressed.
- Why are we bumping to 35.0.2 specifically? Is there no way to target the latest Android has?
- The README uses "I". You should communicate to us via GitHub, not the checked in readme.
- The README, workflows and code style and license does not follow the previous one. Changing them is not part of the PRs aim.
- The PR now makes this repo base on some other repo with different goals. The repos purpose is to build AAPT2 not other build tools.
- Part of what belongs to the build system is put in CI, or part what belongs to GIT as the source manager is put in the build system. Separation of concern is important
- The current readme should be kept as is or synced with our other repos readmes and their style and speech of figure.
|
Hi, Here are the diff made by ibotpeaches for the aapt2 used for apktools : aosp-mirror/platform_frameworks_base@main...iBotPeaches:platform_frameworks_base:apktool_14.0.0
Because build-tools were stop in 2023 to v34 https://developer.android.com/tools/releases/build-tools
I agree, I only add the 1st line in the Readme as I did not wanted to modify it to avoid rebase/merge from future modifications in the lzhiyong repo. But if it is wanted to modify it, it is a totally understandable choice. Tell me if you want me to recreate/rephrase it.
I was in a quite tricky situation, as lzhiyong put his code under the apache v2 and you code is under the GPLv3. Here the GPLv3 can be applied to the repo and all created files/code, but the code from lzhiyong should remain under apache v2
I do not totally agree. I used the work of lzhiyong that aim to provide build-tools and platform-tools binaries for android but I striped all the repo to keep only what is used for aapt and aapt2. I add the modification of IbotPeaches in order to keep the best compatibility of aapt2 with the apktools libs.
I did not design the build system, and (as said previously I did not want to modify too much the repo to lesser merge/rebase conflict). We can choose to go back to submodule with a cleaner build.py or build.sh as before. I let you decide.
Cf response to point 2 As a general approach, it seems that you prefer to increase the diff with the lzhiyong repo in order to clean and standardize across revanced repo even if future rebase/merge will be a bit harder ? |
|
What i propose:
Are those points ok ? |
I suppose your PR has the same goal (build aapt2), but not izhiyongs repo. However, as you have modified their repo substantially, it may be easier to base of our repo instead of theirs, as our repo already has the same goal as your PR, while theirs follows another.
You understand the general change I would like to see in this PR. Basically, this repo was made from "scratch" with every line intended as is for the purpose of building AAPT2. I am not familiar with many lines from lzhiyong and reviewing that seems quite difficult, because I come across lines I either question or need changes a lot. I am wondering, how easy it is to work up to v35 from our repo. What prevents this? From my understanding, we need to bump the submodules to whatever v35 uses. Some compilation errors will surely occur that would be needed to look into, but then again lzhiyong's repo would come in clutch for reference in this regard. Once we can compile upstream AAPT2 v35 with our build system, we can look into the patches that make it work on Android and for ReVanced's purposes, which should be ibotpeaches patches (and ours such as the one that fix AAPT2 for arm32).
Yep! Sounds perfect. Regarding 4, please let me know what changes you have in mind. I would like to understand why changes are needed in the first place. |
|
Hi, |
| @@ -0,0 +1,648 @@ | |||
| diff --git a/src/base/libs/androidfw/ConfigDescription.cpp b/src/base/libs/androidfw/ConfigDescription.cpp | |||
There was a problem hiding this comment.
Any reason the individual patches were merged into a single .patch file?
| @@ -0,0 +1,14 @@ | |||
| // Generated by the sysprop generator. DO NOT EDIT! | |||
There was a problem hiding this comment.
Should the generator not run at build time?
| path: ${{ github.workspace }}/build/bin/aapt2-* | ||
| if-no-files-found: error | ||
|
|
||
| release: |
There was a problem hiding this comment.
This doesn't need to be a separate job, just add the missing steps
| "assets": ["CHANGELOG.md", "VERSION"], | ||
| "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" |
There was a problem hiding this comment.
I don't think we had VERSION in .releaserc in other repos
| # Build aapt2 | ||
| ## Fetch submodules | ||
| ```bash | ||
| git submodule update --init --recursive --depth 1 |
There was a problem hiding this comment.
Can just be a clone with submodules and depth 1 initially
README.md
Outdated
| git submodule update --init --recursive --depth 1 | ||
| ``` | ||
|
|
||
| ## Apply patch |
There was a problem hiding this comment.
What was the reason for patch being a separate step?
| @@ -0,0 +1,5 @@ | |||
| project(build-tools) | |||
There was a problem hiding this comment.
Why is there a CMAKE in build-tools and in root folder?
| @@ -0,0 +1,7 @@ | |||
| add_library(libbuildversion STATIC | |||
There was a problem hiding this comment.
Why are cmake files in the lib folder and not under cmake like before?
Co-authored-by: oSumAtrIX <[email protected]>
Co-authored-by: oSumAtrIX <[email protected]>
Co-authored-by: oSumAtrIX <[email protected]>
Co-authored-by: oSumAtrIX <[email protected]>
Co-authored-by: oSumAtrIX <[email protected]>
Co-authored-by: oSumAtrIX <[email protected]>
Co-authored-by: oSumAtrIX <[email protected]>
Use protoc prebuilt binary
# 1.0.0 (2025-07-13) ### Bug Fixes * `basic_string` inline templates patch ([#9](#9)) ([b907424](b907424)) * Add basic_string inline templates to fix args segmentation fault ([1ad472f](1ad472f)) * Add ending newlines to fix corrupt aapt2 and androidfw patches ([93324ca](93324ca)) * **build:** add missing patch ([0f54c42](0f54c42)) * Specify minimum alignment for `ResStringPool_span` to fix SIGBUS on ARMv7 ([8285e73](8285e73)) ### Features * improve `aapt2.cmake` [skip ci] ([a2d190f](a2d190f)) * license file [skip ci] ([fa1b651](fa1b651)) * readme file [skip ci] ([2896964](2896964))
|
Requested changes pushed. |
# 1.0.0 (2025-07-14) ### Bug Fixes * `basic_string` inline templates patch ([#9](#9)) ([b907424](b907424)) * Add basic_string inline templates to fix args segmentation fault ([1ad472f](1ad472f)) * Add ending newlines to fix corrupt aapt2 and androidfw patches ([93324ca](93324ca)) * **build:** add missing patch ([0f54c42](0f54c42)) * Specify minimum alignment for `ResStringPool_span` to fix SIGBUS on ARMv7 ([8285e73](8285e73)) * Typo on unzip option ([1adcce5](1adcce5)) ### Features * improve `aapt2.cmake` [skip ci] ([a2d190f](a2d190f)) * license file [skip ci] ([fa1b651](fa1b651)) * readme file [skip ci] ([2896964](2896964))
|
The size of the updated binaries in ReVanced/revanced-manager#2489 is very large Has this problem already been fixed? |
Youtube patched successfully with the bin from latest ci https://github.com/Taknok/aapt2/actions/runs/16264381465 |
Also include a CI with binary attestation and auto release.