Update build_bromite_dev.yaml

fix https://github.com/uazo/bromite-buildtools/issues/43

.github/workflows/build_bromite_dev.yaml

@@ -23,17 +23,17 @@ on:
         required: true
         default: 'all'
       build:
-        description: 'android arch [arm64/x64]'
+        description: 'android arch [arm64/x64/all]'
         required: true
-        default: 'x64'
+        default: 'all'
       type:
         description: 'runner? [dev/ci]'
         required: true
-        default: 'dev'
+        default: 'ci'
       debug:
         description: 'debug? [true/false]'
         required: true
-        default: 'true'
+        default: 'false'
       clangd:
         description: 'clangd? [true/false]'
         required: true
@@ -114,14 +114,14 @@ jobs:
             fi
           fi
 
-      - name: Building bromite container ${{ env.BROMITE_SHA }}
+      - name: Building bromite container ${{ env.VERSION }}-${{ env.BROMITE_SHA }}
         shell: bash
         run: |
-          IS_PRESENT=$(docker inspect --type=image uazo/bromite:$BROMITE_SHA > /dev/null ; echo $?)
+          IS_PRESENT=$(docker inspect --type=image uazo/bromite:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
           if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/bromite:$BROMITE_SHA > /dev/null ; echo $?)
+            IS_PRESENT=$(docker manifest inspect uazo/bromite:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
             if [ $IS_PRESENT -ne "0" ]; then
-              DOCKER_BUILDKIT=1 docker build -t uazo/bromite:$BROMITE_SHA --progress plain \
+              DOCKER_BUILDKIT=1 docker build -t uazo/bromite:$VERSION-$BROMITE_SHA --progress plain \
                 --build-arg BROMITE_SHA=$BROMITE_SHA \
                 --build-arg VERSION=$VERSION \
                 --build-arg HTTP_PROXY="$PROXY_ADDR" \
@@ -129,15 +129,16 @@ jobs:
             fi
           fi
           
-      - name: Building bromite-build container ${{ env.BROMITE_SHA }}
+      - name: Building bromite-build container ${{ env.VERSION }}-${{ env.BROMITE_SHA }}
         shell: bash
         run: |
-          IS_PRESENT=$(docker inspect --type=image uazo/bromite-build:$BROMITE_SHA > /dev/null ; echo $?)
+          IS_PRESENT=$(docker inspect --type=image uazo/bromite-build:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
           if [ $IS_PRESENT -ne "0" ]; then
-            IS_PRESENT=$(docker manifest inspect uazo/bromite-build:$BROMITE_SHA > /dev/null ; echo $?)
+            IS_PRESENT=$(docker manifest inspect uazo/bromite-build:$VERSION-$BROMITE_SHA > /dev/null ; echo $?)
             if [ $IS_PRESENT -ne "0" ]; then
-              DOCKER_BUILDKIT=1 docker build -t uazo/bromite-build:$BROMITE_SHA --progress plain \
+              DOCKER_BUILDKIT=1 docker build -t uazo/bromite-build:$VERSION-$BROMITE_SHA --progress plain \
                 --build-arg BROMITE_SHA=$BROMITE_SHA \
+                --build-arg VERSION=$VERSION \
                 --build-arg HTTP_PROXY="$PROXY_ADDR" \
                 --no-cache \
                 bromite-buildtools/images/bromite-build/.
@@ -151,7 +152,7 @@ jobs:
           if [ $IS_PRESENT -eq "0" ]; then
             docker rmi uazo/bromite-build:build
           fi
-          docker tag uazo/bromite-build:$BROMITE_SHA uazo/bromite-build:build
+          docker tag uazo/bromite-build:$VERSION-$BROMITE_SHA uazo/bromite-build:build
           
   build:
     runs-on: ${{ github.event.inputs.type }}
@@ -171,15 +172,15 @@ jobs:
         KYTHE_ROOT_DIRECTORY: /home/lg/working_dir/chromium/src
         KYTHE_OUTPUT_DIRECTORY: /home/lg/working_dir/chromium/src/out/bromite/kythe
         # cross build
-        DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/10.0.20348.0/
-        WINDOWSSDKDIR: "/win_sdk/10.0.20348.0/Windows Kits/10/"
-        GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.20348.0/
+        DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/10.0.22621.0/
+        WINDOWSSDKDIR: "/win_sdk/10.0.22621.0/Windows Kits/10/"
+        GYP_MSVS_OVERRIDE_PATH: /win_sdk/10.0.22621.0/
         # compile in debug mode
         TARGET_ISDEBUG: ${{ github.event.inputs.debug }} 
-        TARGET_CPU: ${{ github.event.inputs.build }}
         TARGET_OS: ${{ github.event.inputs.target_os }}
       volumes:
-        - /storage/images/android/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite
+        - /storage/images/android/arm64/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite
+        - /storage/images/android/x64/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite_x64
         - /storage/images/win/x64/${{ github.event.inputs.sha }}:/home/lg/working_dir/chromium/src/out/bromite_win
         - /tmp/proxy:/tmp/proxy
         - /win_sdk:/win_sdk
@@ -215,15 +216,15 @@ jobs:
           sudo chmod g-rxw /run/user/1000/
           sudo chmod o-rxw /run/user/1000/
           
-      - name: Build Bromite Android
-        if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
+      - name: Build Bromite Android arm64
+        if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm64' || github.event.inputs.build == 'all') }}
         shell: bash
         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
 
           echo "::group::-------- gn gen"
-          gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) " out/bromite    
+          gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"arm64\" " out/bromite    
           echo "::endgroup::"
 
           echo "::group::-------- gn args"
@@ -235,14 +236,14 @@ jobs:
 
           cp ../../bromite/build/RELEASE out/bromite
 
-      - name: Get ninja logs Android
-        if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
+      - name: Get ninja logs Android arm64
+        if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm64' || github.event.inputs.build == 'all') }}
         shell: bash
         run: |
           cd $WORKSPACE
           $WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite/.ninja_log >$WORKSPACE/chromium/src/out/bromite/ninja_log_trace.json
-          $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite/ninja_log_trace.json
-          
+          python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite/ninja_log_trace.json
+
       - name: Build Bromite Windows
         if: ${{ github.event.inputs.target_os == 'win' || github.event.inputs.target_os == 'all' }}
         shell: bash
@@ -269,9 +270,38 @@ jobs:
         run: |
           cd $WORKSPACE
           $WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite_win/.ninja_log >$WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json
-          $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json
+          python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json
 
-      - name: Generate breakpad symbols
+      - name: Build Bromite Android x64
+        if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'x64' || github.event.inputs.build == 'all') }}
+        shell: bash
+        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
+
+          echo "::group::-------- gn gen"
+          gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"x64\" " out/bromite_x64
+          echo "::endgroup::"
+
+          echo "::group::-------- gn args"
+          gn args out/bromite_x64/ --list --short
+          gn args out/bromite_x64/ --list >out/bromite_x64/gn_list
+          echo "::endgroup::"
+
+          autoninja -C out/bromite_x64 chrome_public_apk
+
+          cp ../../bromite/build/RELEASE out/bromite_x64
+
+      - name: Get ninja logs Android x64
+        if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'x64' || github.event.inputs.build == 'all') }}
+        shell: bash
+        run: |
+          cd $WORKSPACE
+          $WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite_x64/.ninja_log >$WORKSPACE/chromium/src/out/bromite_x64/ninja_log_trace.json
+          python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite_x64/ninja_log_trace.json
+
+          
+      - name: Generate breakpad symbols arm64
         if: ${{ github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all' }}
         shell: bash
         run: |
@@ -311,5 +341,3 @@ jobs:
               -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
-
-

.github/workflows/release.yaml

@@ -28,7 +28,7 @@ jobs:
   release:
     runs-on: ${{ github.event.inputs.type }}
     env:
-      OUTPUTFILE: /storage/images/android/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}
+      OUTPUTFILE_ARM64: /storage/images/android/arm64/${{ github.event.inputs.build }}/${{ github.event.inputs.sha }}
       APK: ${{ github.event.inputs.build }}_ChromePublic.apk
         
     steps:
@@ -54,7 +54,7 @@ jobs:
         run: |
           GH=gh_2.18.1_linux_amd64/bin/gh
           WINOUT=/storage/images/win/x64/$BROMITE_SHA/
-          VERSION=v$(cat ${{ env.OUTPUTFILE }}/RELEASE)-${{ github.event.inputs.build }}
+          VERSION=v$(cat ${{ env.OUTPUTFILE_ARM64 }}/RELEASE)-${{ github.event.inputs.build }}
 
           cd bromite
 
@@ -72,19 +72,19 @@ jobs:
           $GH release create $VERSION-$BROMITE_SHA --notes-file note -d
 
           # android
-          sudo cp ${{ env.OUTPUTFILE }}/apks/ChromePublic.apk ChromePublic.apk
+          sudo cp ${{ env.OUTPUTFILE_ARM64 }}/apks/ChromePublic.apk ChromePublic.apk
           sudo chown runner ChromePublic.apk
           mv ChromePublic.apk $APK
           echo Uploading $APK
           $GH release upload $VERSION-$BROMITE_SHA $APK
           
           echo Uploading chrome.size
-          test $VERSION-$BROMITE_SHA $OUTPUTFILE/chrome.size && \
-            $GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE/chrome.size
+          test $VERSION-$BROMITE_SHA $OUTPUTFILE_ARM64/chrome.size && \
+            $GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE_ARM64/chrome.size
 
           echo Uploading arm64_ninja_log_trace.html
-          test $OUTPUTFILE/ninja_log_trace.html && \
-            cp $OUTPUTFILE/ninja_log_trace.html arm64_ninja_log_trace.html && \
+          test $OUTPUTFILE_ARM64/ninja_log_trace.html && \
+            cp $OUTPUTFILE_ARM64/ninja_log_trace.html arm64_ninja_log_trace.html && \
             $GH release upload $VERSION-$BROMITE_SHA arm64_ninja_log_trace.html
 
           # windows
@@ -132,4 +132,4 @@ jobs:
 
           $GH release edit $VERSION-$BROMITE_SHA -t $VERSION-$BROMITE_SHA
           $GH release edit $VERSION-$BROMITE_SHA --draft=false
-          
+        

export-patch-list.sh

@@ -16,6 +16,11 @@ for patch in $ALLPATCHS_E; do
 	if [[ "$PATCH_FILE" == *"Automated-domain-substitution"* ]]; then
 		continue
 	fi
+	PATCH_MESSAGE=$(git -C ~/chromium/src/ show -s $patch)
+	if [[ $PATCH_MESSAGE == *NOEXPORT:* ]] ;
+	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

export-single-patch.sh

@@ -13,6 +13,13 @@ else
 	echo Exporting new $patch ~/bromite/build/patches-new/$PATCH_FILE
 fi
 
+PATCH_MESSAGE=$(git -C ~/chromium/src/ show -s $patch)
+if [[ $PATCH_MESSAGE == *NOEXPORT:* ]] ;
+then
+    echo Request NO export
+	exit 0
+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"
 

images/bromite-build/Dockerfile

@@ -1,6 +1,7 @@
 ARG BROMITE_SHA
+ARG VERSION
 
-FROM uazo/bromite:$BROMITE_SHA
+FROM uazo/bromite:$VERSION-$BROMITE_SHA
 
 ARG HTTP_PROXY
 ENV HTTP_PROXY=$HTTP_PROXY

images/bromite-build/build_args.gni

@@ -11,7 +11,7 @@ if(getenv("TARGET_CPU") != "") {
 
 if (target_os == "android") {
   target_os = "android" # fix traffic annotation auditor
-  enable_kythe_annotations = true
+  #enable_kythe_annotations = true
   chrome_public_manifest_package = "org.bromite.bromite.dev"
 
   _is_debug_build = getenv("TARGET_ISDEBUG")
@@ -30,6 +30,7 @@ if (target_os == "android") {
     use_cfi_cast = false # disable it
   } else {
     generate_linker_map = true
+    use_relative_vtables_abi = false
   }
 }
 

images/build-deps/Dockerfile

@@ -33,14 +33,11 @@ USER ${user}
 WORKDIR /home/${user}
 
 RUN wget https://raw.githubusercontent.com/chromium/chromium/$VERSION/build/install-build-deps.sh \
-    && \
-    wget https://raw.githubusercontent.com/chromium/chromium/$VERSION/build/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 && \
+    sudo ./install-build-deps.sh --android --no-prompt --no-chromeos-fonts && \
     sudo mkdir -p /github/home/.vscode-server && \
     sudo chown lg /github/home/.vscode-server
 

images/github-runner/Dockerfile

@@ -40,7 +40,7 @@ RUN apt-get update && \
     curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
     apt-key fingerprint 0EBFCD88 && \
     add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \
-    apt-get update && apt-get install --no-install-recommends -y docker-ce docker-ce-cli containerd.io=1.4.4-1 && \
+    apt-get update && apt-get install --no-install-recommends -y docker-ce docker-ce-cli && \
     apt-get clean -y && \
     rm -rf /var/cache/debconf/* /var/lib/apt/lists/* /var/log/* /tmp/* /var/tmp/* \
            /usr/share/doc/* /usr/share/man/* /usr/share/local/* && \
@@ -77,7 +77,7 @@ RUN useradd -m runner \
 
 # Build args
 ARG TARGETPLATFORM=amd64
-ARG RUNNER_VERSION=2.302.5
+ARG RUNNER_VERSION=2.303.1
 WORKDIR /runner
 
 # Runner download supports amd64 as x64

images/github-runner/start-runner.sh

@@ -40,7 +40,7 @@ do
     -v /casefold:/win_sdk \
     --network none \
     --device=/dev/kvm \
-    uazo/github-runner
+    uazo/github-runner:2.303.1
 
   echo "You can stop now"
   sleep 5s