Skip to content

Commit

Permalink
Welcome to Udon!
Browse files Browse the repository at this point in the history 
Change-Id: I77409b5ced88dc0b1cf4640393dbf04e8dadcff7
Signed-off-by: xiaoleGun <[email protected]>
  • Loading branch information
@xiaoleGun
xiaoleGun committed Nov 5, 2023
1 parent 986a7a8 commit 679ba05
Show file tree
Hide file tree
Showing 194 changed files with 37,684 additions and 3,167 deletions.
34 changes: 17 additions & 17 deletions README-EN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
This is an Android project for Miku fans. If you don't like it, please close this page, but don't attack Miku and the author of this project.

## Version
Latest version: 1.0.1
Latest version: 0.1.3

[Downloads](https://github.com/xiaoleGun/treble_build_miku/releases)

Expand All @@ -14,21 +14,21 @@ Examples
They are
```
ProjectName-{SNOW | SNOWLAND | TDA}-Miku UI version-arm64-ab-vndklite-gapps-BuildDate-Buildtype
| | | | | | |
| | | | | | |
| | | | | | GMS
| | | | | |
| | | | | |
| | | | | It is used for vndklite devices and
| | | | | supports system reading and writing.
| | | | |
| | | | Partition type, only AB variants are provided.(1)
| | | |
| | | |
| | | CPU bits, build 64 bits and a64(2).
| | |
| Android 12 | 12.1 | 13
ProjectName-{SNOW | SNOWLAND | TDA | Udon}-version-arm64-ab-vndklite-gapps-BuildDate-Buildtype
| | | | | | | |
| | | | | | | |
| | | | | | | GMS
| | | | | | |
| | | | | | |
| | | | | | It is used for vndklite devices and
| | | | | | supports system reading and writing.
| | | | | |
| | | | | Partition type, only AB variants are provided.(1)
| | | | |
| | | | |
| | | | CPU arch, build 64 bits and a64(2).
| | | |
| Android 12 | 12.1 | 13 | 14
|
Miku UI
```
Expand All @@ -49,7 +49,7 @@ To get started with building Miku UI GSI, you'll need to get familiar with [Git
```
- Clone this repo:
```
git clone https://github.com/xiaoleGun/treble_build_miku -b TDA
git clone https://github.com/xiaoleGun/treble_build_miku -b Udon
```
- Finally, start the build script:
```
Expand Down
2 changes: 1 addition & 1 deletion README-JP.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Miku UI GSI のビルドを始めるには、[How to build a GSI](https://github
```
- このリポジトリをクローンする:
```
git clone https://github.com/xiaoleGun/treble_build_miku -b TDA
git clone https://github.com/xiaoleGun/treble_build_miku -b Udon
```
- 最後にビルドスクリプトを実行する:
```
Expand Down
34 changes: 17 additions & 17 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
这是送给所有Miku粉丝的Android项目，如果不喜欢它请关闭本页面，但不要攻击任何人，尤其是其作者。

## 版本
最新版本: 1.0.1
最新版本: 0.1.3

[下载](https://github.com/xiaoleGun/treble_build_miku/releases)

Expand All @@ -16,21 +16,21 @@
从前到后，分别为
```
ProjectName-{SNOW | SNOWLAND | TDA}-Miku UI版本-arm64-ab-vndklite-gapps-构建日期-构建类型
| | | | | | |
| | | | | | |
| | | | | | 谷歌服务
| | | | | |
| | | | | |
| | | | | 用于vndklite的设备
| | | | | 支持system读写
| | | | |
| | | | 分区类型，仅构建AB(1)
| | | |
| | | |
| | | CPU位数，构建64位和a64(2)
| | |
| Android 12 | 12.1 | 13
ProjectName-{SNOW | SNOWLAND | TDA | Udon}-版本号-arm64-ab-vndklite-gapps-构建日期-构建类型
| | | | | | | |
| | | | | | | |
| | | | | | | 谷歌服务
| | | | | | |
| | | | | | |
| | | | | | 用于vndklite的设备
| | | | | | 支持system读写
| | | | | |
| | | | | 分区类型，仅构建AB(1)
| | | | |
| | | | |
| | | | CPU架构，构建64位和a64(2)
| | | |
| Android 12 | 12.1 | 13 | 14
|
Miku UI
```
Expand All @@ -51,7 +51,7 @@ Miku UI
```
- 下载本仓库
```
git clone https://github.com/xiaoleGun/treble_build_miku -b TDA
git clone https://github.com/xiaoleGun/treble_build_miku -b Udon
```
- 完成之后运行脚本:
```
Expand Down
38 changes: 20 additions & 18 deletions build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

multipleLanguages() {
if [ -n $(echo $LANG | grep zh_CN) ]; then
BUILDBOT="Miku UI TDA通用镜像自动构建"
BUILDBOT="Miku UI Udon通用镜像自动构建"
BUILDBOT_EXIT="3秒后开始构建Miku UI通用镜像 - CTRL-C退出"
SHOW_VERSION="构建版本"
ONCE_PASSWORD="请输入 $USER 的密码: "
Expand All @@ -25,7 +25,7 @@ multipleLanguages() {
UP_GITHUB_RELEASE="上传到Github release"
COMPLETED="构建完成，使用了 $1 分钟 $2 秒"
else
BUILDBOT="Miku UI TDA Treble Buildbot"
BUILDBOT="Miku UI Udon Treble Buildbot"
BUILDBOT_EXIT="Executing in 3 seconds - CTRL-C to exit"
SHOW_VERSION="Build version"
ONCE_PASSWORD="Please enter the password of $USER: "
Expand Down Expand Up @@ -57,7 +57,7 @@ warning() {
echo " $BUILDBOT_EXIT "
echo "-----------------------------------------"
echo
echo "$SHOW_VERSION: $VERSION"
echo "$SHOW_VERSION: $VERSION_CODE"
echo
}

Expand Down Expand Up @@ -90,7 +90,7 @@ initRepo() {
echo
echo "--> $INIT_MIKU_UI"
echo
repo init -u https://github.com/Miku-UI/manifesto -b TDA --depth=1
repo init -u https://github.com/Miku-UI/manifesto -b Udon --depth=1
fi

if [ -d .repo ] && [ ! -f .repo/local_manifests/miku-treble.xml ]; then
Expand All @@ -105,11 +105,12 @@ initRepo() {
fetch=\"https://github.com\" />
<project name=\"TrebleDroid/vendor_hardware_overlay\" path=\"vendor/hardware_overlay\" remote=\"github\" revision=\"pie\" />
<project name=\"TrebleDroid/device_phh_treble\" path=\"device/phh/treble\" remote=\"github\" revision=\"android-13.0\" />
<project name=\"TrebleDroid/vendor_interfaces\" path=\"vendor/interfaces\" remote=\"github\" revision=\"android-13.0\" />
<project name=\"TrebleDroid/device_phh_treble\" path=\"device/phh/treble\" remote=\"github\" revision=\"android-14.0\" />
<project name=\"TrebleDroid/vendor_interfaces\" path=\"vendor/interfaces\" remote=\"github\" revision=\"android-14.0\" />
<project name=\"phhusson/vendor_magisk\" path=\"vendor/magisk\" remote=\"github\" revision=\"android-10.0\" />
<project name=\"TrebleDroid/treble_app\" path=\"treble_app\" remote=\"github\" revision=\"master\" />
<project name=\"phhusson/sas-creator\" path=\"sas-creator\" remote=\"github\" revision=\"master\" />
<project name=\"platform/prebuilts/vndk/v28\" path=\"prebuilts/vndk/v28\" remote=\"aosp\" revision=\"204f1bad00aaf480ba33233f7b8c2ddaa03155dd\" clone-depth=\"1\" />
<project path=\"packages/apps/QcRilAm\" name=\"AndyCGYan/android_packages_apps_QcRilAm\" remote=\"github\" revision=\"master\" />
</manifest>" > .repo/local_manifests/miku-treble.xml
Expand Down Expand Up @@ -207,8 +208,8 @@ buildSasImages() {
echo
cd sas-creator
if [ -n "$(cat lite-adapter.sh | grep 3500M)" ]; then
sed -i 's/3500M/4000M/' lite-adapter.sh
sed -i 's/3500M/4000M/' run.sh
sed -i 's/3500M/5000M/' lite-adapter.sh
sed -i 's/3500M/5000M/' run.sh
fi
echo "$password" | sudo -S bash lite-adapter.sh 64 $BD/system-$1.img
cp s.img $BD/system-$1-vndklite.img
Expand All @@ -222,19 +223,19 @@ generatePackages() {
echo
BASE_IMAGE=$BD/system-$1.img
mkdir --parents $BD/dsu/$1/; mv $BASE_IMAGE $BD/dsu/$1/system.img
zip -j -v $BD/MikuUI-TDA-$VERSION-$2$3-$BUILD_DATE-UNOFFICIAL.zip $BD/dsu/$1/system.img
zip -j -v $BD/MikuUI-$VERSION-$VERSION_CODE-$2$3-$BUILD_DATE-UNOFFICIAL.zip $BD/dsu/$1/system.img
mkdir --parents $BD/dsu/$1-vndklite/; mv ${BASE_IMAGE%.img}-vndklite.img $BD/dsu/$1-vndklite/system.img
zip -j -v $BD/MikuUI-TDA-$VERSION-$2$3-vndklite-$BUILD_DATE-UNOFFICIAL.zip $BD/dsu/$1-vndklite/system.img
zip -j -v $BD/MikuUI-$VERSION-$VERSION_CODE-$2$3-vndklite-$BUILD_DATE-UNOFFICIAL.zip $BD/dsu/$1-vndklite/system.img
rm -rf $BD/dsu
}

generateOtaJson() {
echo
echo "--> $GEN_UP_JSON"
echo
prefix="MikuUI-TDA-$VERSION-"
prefix="MikuUI-$VERSION-$VERSION_CODE-"
suffix="-$BUILD_DATE-UNOFFICIAL.zip"
json="{\"version\": \"$VERSION\",\"date\": \"$(date +%s -d '-4hours')\",\"variants\": ["
json="{\"version\": \"$VERSION_CODE\",\"date\": \"$(date +%s -d '-4hours')\",\"variants\": ["
find $BD -name "*.zip" | {
while read file; do
packageVariant=$(echo $(basename $file) | sed -e s/^$prefix// -e s/$suffix$//)
Expand All @@ -249,7 +250,7 @@ generateOtaJson() {
"arm64-ab-gapps-vndklite") name="miku_treble_arm64_bgN-vndklite" ;;
esac
size=$(wc -c $file | awk '{print $1}')
url="https://github.com/xiaoleGun/treble_build_miku/releases/download/TDA-$VERSION/$(basename $file)"
url="https://github.com/xiaoleGun/treble_build_miku/releases/download/$VERSION-$VERSION_CODE/$(basename $file)"
json="${json} {\"name\": \"$name\",\"size\": \"$size\",\"url\": \"$url\"},"
done
json="${json%?}]}"
Expand All @@ -267,15 +268,15 @@ personal() {
GITLATESTTAG=$(git describe --tags --abbrev=0)
GITCHANGELOG=$(git log $GITLATESTTAG..HEAD --pretty=format:"%s")
assets=()
for f in $BD/MikuUI-TDA-$VERSION-*.zip; do [ -f "$f" ] && assets+=(-a "$f"); done
hub release create ${assets[@]} -m "Miku UI TDA v$VERSION
for f in $BD/MikuUI-$VERSION-$VERSION_CODE-*.zip; do [ -f "$f" ] && assets+=(-a "$f"); done
hub release create ${assets[@]} -m "Miku UI $VERSION v$VERSION_CODE
- CI build on $BUILD_DATE
### Change log
$GITCHANGELOG" TDA-$VERSION
$GITCHANGELOG" $VERSION-$VERSION_CODE

rm -rf $BD/MikuUI-TDA-$VERSION-*.zip
rm -rf $BD/MikuUI-$VERSION-$VERSION_CODE-*.zip
cd ..
}

Expand All @@ -285,7 +286,8 @@ BUILD_DATE="$(date +%Y%m%d)"

SD=$(cd $(dirname $0);pwd)
BD=$HOME/builds
VERSION=`grep -oP '(?<=最新版本: ).*' $SD/README.md`
VERSION=Udon
VERSION_CODE=`grep -oP '(?<=最新版本: ).*' $SD/README.md`

multipleLanguages
warning
Expand Down
56 changes: 0 additions & 56 deletions ...ackages_modules_Bluetooth/0001-controller-hard-disable-LE_READ_BUFFER_SIZE_V2-and-L.patch
View file

This file was deleted.

10 changes: 5 additions & 5 deletions patches/trebledroid/platform_bionic/0001-Disable-vndklite-handling.patch
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
From 9feb90012e1718c8b7ae736134d4465192e52223 Mon Sep 17 00:00:00 2001
From cb9d1aaacaa105c20551952ead0ad7a49408efce Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <[email protected]>
Date: Wed, 27 Oct 2021 14:39:29 -0400
Subject: [PATCH 1/4] Disable vndklite handling
Subject: [PATCH 1/2] Disable vndklite handling

Change-Id: Ic4474cf80fc4b45a9a2760dd51e2ca29c4d961e2
---
linker/linker.cpp | 5 -----
1 file changed, 5 deletions(-)

diff --git a/linker/linker.cpp b/linker/linker.cpp
index c6588d2cd..545426fd9 100644
index 17b574fc1..c863f8ea6 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -93,7 +93,6 @@ static uint64_t g_module_unload_counter = 0;
@@ -95,7 +95,6 @@ static uint64_t g_module_unload_counter = 0;
static const char* const kLdConfigArchFilePath = "/system/etc/ld.config." ABI_STRING ".txt";

static const char* const kLdConfigFilePath = "/system/etc/ld.config.txt";
-static const char* const kLdConfigVndkLiteFilePath = "/system/etc/ld.config.vndk_lite.txt";

static const char* const kLdGeneratedConfigFilePath = "/linkerconfig/ld.config.txt";

@@ -3365,10 +3364,6 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
@@ -3423,10 +3422,6 @@ static std::string get_ld_config_file_apex_path(const char* executable_path) {
}

static std::string get_ld_config_file_vndk_path() {
Expand Down
Loading

0 comments on commit 679ba05

Please sign in to comment.