Compare commits

..

11 Commits

Author SHA1 Message Date
uazo
daca99c6c5 Update export-patch-list.sh 2022-09-07 13:39:36 +02:00
uazo
e826c60239 changed method of creating new patch name 2022-09-07 11:43:26 +02:00
uazo
50441d00bc improved replacement 2022-09-07 11:11:24 +02:00
uazo
dc0253788a fix build clangd index 2022-08-02 17:21:58 +02:00
uazo
ddc84733e9 Update prepare-build.sh 2022-08-01 14:40:13 +02:00
uazo
3d2a3fb5fd try using github as source 2022-08-01 13:10:25 +02:00
uazo
6e62f4a85d Update prepare-build.sh 2022-08-01 10:16:21 +02:00
uazo
406a5d83c2 Using github 2022-08-01 08:28:45 +02:00
uazo
963ab065f9 Update Dockerfile 2022-08-01 08:02:46 +02:00
uazo
e15c9f918b Update Dockerfile 2022-08-01 08:01:31 +02:00
uazo
aa33b64d6c Using raw.githubusercontent.com
Since original is down
2022-08-01 07:59:50 +02:00
6 changed files with 37 additions and 28 deletions

View File

@@ -363,13 +363,12 @@ jobs:
run: |
PATH=$WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$WORKSPACE/depot_tools/:/usr/local/go/bin:$WORKSPACE/mtool/bin:$PATH
cd $WORKSPACE/chromium/src
$WORKSPACE/ninja/ninja -C $WORKSPACE/chromium/src/out/bromite -a chrome_public_apk \
-t compdb cc cxx objc objcxx >$WORKSPACE/chromium/src/out/bromite/compile_commands.json
test -f out/bromite/bromite.idx || \
cp -r out/bromite/ out/clangd && \
cp -r out/bromite out/clangd && \
gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) skip_clangd_unsupported_options = true" out/clangd && \
$WORKSPACE/ninja/ninja -C $WORKSPACE/chromium/src/out/clangd -a chrome_public_apk \
-t compdb cc cxx objc objcxx >$WORKSPACE/chromium/src/out/clangd/compile_commands.json && \
/home/lg/working_dir/clangd_snapshot_20211205/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/bromite/bromite.idx && \
rm -rf out/clangd

View File

@@ -18,15 +18,11 @@ for patch in $ALLPATCHS_E; do
if [ -z "$PATCH_FILE" ]
then
#git -C ~/chromium/src/ show -s $patch
PATCH_FILE=$(git -C ~/chromium/src/ show -s $patch | tail -n 1)
if [[ "$PATCH_FILE" != *".patch" ]]; then
PATCH_FILE=$NO_NAME.patch
NO_NAME=$NO_NAME.1
echo No Name ${NO_NAME}, press return
PATCH_FILE=00$(git -C ~/chromium/src/ show -s $patch | head -n 5 | tail -n 1 | xargs | tr " " - | tr [:punct:] -).patch
echo New Patch: ${PATCH_FILE}
fi
read -n 1
fi
bash ~/bromite-buildtools/export-single-patch.sh $patch $PATCH_FILE

View File

@@ -16,6 +16,9 @@ for patch in $ALLPATCHS_E; do
if [[ "$PATCH_FILE" == *"Automated-domain-substitution"* ]]; then
continue
fi
if [[ -z "$PATCH_FILE" ]]; then
PATCH_FILE=00$(git -C ~/chromium/src/ show -s $patch | head -n 5 | tail -n 1 | xargs | tr " " - | tr [:punct:] -).patch
fi
echo $PATCH_FILE >>~/bromite/build/patches-new/patch-list

View File

@@ -16,16 +16,29 @@ fi
git -C ~/chromium/src/ format-patch -1 --keep-subject --stdout --full-index --zero-commit --no-signature $patch >~/bromite/build/patches-new/$PATCH_FILE
echo " exported"
CHANGE_REF=""
while read line; do
#echo $line
if [[ "$line" == index* ]]; then
next_line=$(grep -A1 "${line}" ~/bromite/build/patches-new/$PATCH_FILE | tail -n 1 )
if [[ "$next_line" != "GIT binary patch" ]]; then
sed -i "/^$line/d" ~/bromite/build/patches-new/$PATCH_FILE
for i in {1..5}
do
if [[ "$line" == index* ]]; then
read next_line
if [[ "$next_line" != "GIT binary patch" ]]; then
CHANGE_REF=${CHANGE_REF}"/^${line}/d;"
break
else
line=$next_line
continue
fi
else
break
fi
fi
done
done <~/bromite/build/patches-new/$PATCH_FILE
if [ "$CHANGE_REF" ]
then
sed -i "$CHANGE_REF" ~/bromite/build/patches-new/$PATCH_FILE
fi
sed -i '/^From 0000000000000000000000000000000000000000/d' ~/bromite/build/patches-new/$PATCH_FILE
sed -i '/^FILE:/d' ~/bromite/build/patches-new/$PATCH_FILE
sed -i '/^ mode change/d' ~/bromite/build/patches-new/$PATCH_FILE

View File

@@ -32,18 +32,13 @@ USER ${user}
WORKDIR /home/${user}
RUN wget https://chromium.googlesource.com/chromium/src/+/refs/tags/$VERSION/build/install-build-deps.sh?format=TEXT -O install-build-deps.sh.base64 \
RUN wget https://raw.githubusercontent.com/chromium/chromium/$VERSION/build/install-build-deps.sh \
&& \
wget https://chromium.googlesource.com/chromium/src/+/refs/tags/$VERSION/build/install-build-deps-android.sh?format=TEXT -O install-build-deps-android.sh.base64 \
wget https://raw.githubusercontent.com/chromium/chromium/$VERSION/build/install-build-deps-android.sh \
&& \
base64 -d install-build-deps.sh.base64 >install-build-deps.sh && \
base64 -d install-build-deps-android.sh.base64 >install-build-deps-android.sh && \
sed -i 's/snapcraft/wget/' install-build-deps.sh && \
chmod +x ./install-build-deps.sh && \
chmod +x ./install-build-deps-android.sh && \
sudo ./install-build-deps.sh --no-prompt --lib32 --no-chromeos-fonts && \
sudo ./install-build-deps-android.sh --no-prompt

View File

@@ -10,7 +10,7 @@ git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
echo -e ${RED} -------- apply depot_tools patch ${NC}
cd depot_tools/
git apply ../depot_tools.diff
#git apply ../depot_tools.diff
git apply ../remove_ninja_uploader.diff
cd ..
@@ -29,16 +29,19 @@ gclient root
mkdir ./src
cd ./src
git init
git remote add origin https://chromium.googlesource.com/chromium/src.git
#CHR_SOURCE=https://chromium.googlesource.com/chromium/src.git
CHR_SOURCE=https://github.com/chromium/chromium.git
git fetch --depth 2 https://chromium.googlesource.com/chromium/src.git +refs/tags/$VERSION:chromium_$VERSION
git init
git remote add origin $CHR_SOURCE
git fetch --depth 2 $CHR_SOURCE +refs/tags/$VERSION:chromium_$VERSION
git checkout $VERSION
VERSION_SHA=$( git show-ref -s $VERSION | head -n1 )
echo >../.gclient "solutions = ["
echo >>../.gclient " { \"name\" : 'src',"
echo >>../.gclient " \"url\" : 'https://chromium.googlesource.com/chromium/src.git@$VERSION_SHA',"
echo >>../.gclient " \"url\" : '$CHR_SOURCE@$VERSION_SHA',"
echo >>../.gclient " \"deps_file\" : 'DEPS',"
echo >>../.gclient " \"managed\" : True,"
echo >>../.gclient " \"custom_deps\" : {"