Update release.yaml

.github/workflows/build-images.yaml

@@ -35,9 +35,9 @@ jobs:
           sudo rm -rf /usr/share/dotnet
           sudo rm -rf /usr/local/lib/android
           sudo rm -rf /opt/ghc
-          sudo apt-get remove google-cloud-sdk azure-cli hhvm google-chrome-stable \
-                       firefox mysql-server-core-8.0 mono-devel mongodb-org-server podman mongodb-org-mongos \
-                       powershell dotnet-runtime-3.1 dotnet-runtime-5.0 dotnet-sdk-3.1 dotnet-sdk-5.0
+          sudo apt-get remove google-cloud-sdk azure-cli google-chrome-stable \
+                       firefox mysql-server-core-8.0 mono-devel podman \
+                       powershell
           sudo apt-get autoremove
           
       - name: Checkout repo

.github/workflows/release.yaml

@@ -58,9 +58,9 @@ jobs:
 
           cd bromite
 
-          GH=gh_2.18.1_linux_amd64/bin/gh
-          wget https://github.com/cli/cli/releases/download/v2.18.1/gh_2.18.1_linux_amd64.tar.gz
-          tar xfz gh_2.18.1_linux_amd64.tar.gz
+          GH=gh_2.21.1_linux_amd64/bin/gh
+          wget https://github.com/cli/cli/releases/download/v2.21.1/gh_2.21.1_linux_amd64.tar.gz
+          tar xfz gh_2.21.1_linux_amd64.tar.gz
           
           echo ${{ secrets.GITHUB_TOKEN }} | $GH auth login --with-token
 
@@ -79,11 +79,13 @@ jobs:
           $GH release upload $VERSION-$BROMITE_SHA $APK
           
           echo Uploading chrome.size
-          $GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE/chrome.size
+          test $VERSION-$BROMITE_SHA $OUTPUTFILE/chrome.size && \
+            $GH release upload $VERSION-$BROMITE_SHA $OUTPUTFILE/chrome.size
 
           echo Uploading arm64_ninja_log_trace.html
-          cp $OUTPUTFILE/ninja_log_trace.html arm64_ninja_log_trace.html
-          $GH release upload $VERSION-$BROMITE_SHA arm64_ninja_log_trace.html
+          test $OUTPUTFILE/ninja_log_trace.html && \
+            cp $OUTPUTFILE/ninja_log_trace.html arm64_ninja_log_trace.html && \
+            $GH release upload $VERSION-$BROMITE_SHA arm64_ninja_log_trace.html
 
           # windows
           mkdir chrome-win/
@@ -115,10 +117,14 @@ jobs:
           cp $WINOUT/vulkan-1.dll chrome-win/
           cp -r $WINOUT/locales chrome-win/locales
 
+          #test chrome-win.zip && rm chrome-win.zip
           zip -r chrome-win.zip chrome-win/
           
           echo Uploading chrome-win.zip
           $GH release upload $VERSION-$BROMITE_SHA chrome-win.zip
+          
+          # workaround for https://github.com/cli/cli/issues/6599
+          sleep 30s
 
           TIMESTAMP=$(date +%s -r chrome-win.zip)
           echo >updateurl.txt "browser=chromium;os=windows;architecture=64-bit;timestamp=$TIMESTAMP;editor=uazo;channel=stable;repository=https://github.com/uazo/bromite-buildtools/releases;download=https://github.com/uazo/bromite-buildtools/releases/latest/download/chrome-win.zip;version=$(cat $WINOUT/RELEASE);revision=1;commit=$BROMITE_SHA"

README.md

@@ -64,3 +64,30 @@ drwxr-xr-x 3 root root 4096 Oct  5 13:20 'Windows Kits'
 cd bromite-buildtools/images/github-runner/
 ./start-runner.sh
 ```
+
+### Test Android Version
+
+Simply download latest build on https://github.com/uazo/bromite-buildtools/releases/latest
+
+### Test Windows Version
+
+1. Download https://github.com/henrypp/chrlauncher/releases
+2. Create a `chrlauncher.ini`
+
+```
+[chrlauncher]
+
+# Custom Chromium update URL (string):
+ChromiumUpdateUrl=https://github.com/uazo/bromite-buildtools/releases/latest/download/updateurl.txt
+
+# Command line for Chromium (string):
+# See here: http://peter.sh/experiments/chromium-command-line-switches/
+ChromiumCommandLine=--user-data-dir=".\User Data" --no-default-browser-check
+
+# Chromium executable file name (string):
+ChromiumBinary=chrome.exe
+
+# Chromium binaries directory (string):
+# Relative (to chrlauncher directory) or full path (env. variables supported).
+ChromiumDirectory=.\bin
+```

images/bromite-build/build_args.gni

@@ -10,6 +10,7 @@ if(getenv("TARGET_CPU") != "") {
 }
 
 if (target_os == "android") {
+  target_os = "android" # fix traffic annotation auditor
   enable_kythe_annotations = true
   chrome_public_manifest_package = "org.bromite.bromite.dev"
 
@@ -33,9 +34,15 @@ if (target_os == "android") {
 }
 
 if (target_os == "win") {
+  target_os = "win" # fix traffic annotation auditor
   target_cpu = "x64"
   symbol_level = 0
   use_large_pdbs = true
+  
+  enable_pdf = true
+  pdf_is_complete_lib = true
+  enable_plugins = true
+  enable_ppapi = false  
 
   is_cfi = false # disable it
   use_cfi_cast = false # disable it

images/bromite-build/pre-start.sh

@@ -59,7 +59,7 @@ cd $WORKSPACE/
 git clone https://github.com/ninja-build/ninja.git -b v1.8.2
 cd ninja
 git apply $WORKSPACE/bromite-buildtools/ninja-one-target-for-compdb.patch
-./configure.py --bootstrap
+CXX=clang++ ./configure.py --bootstrap
 
 echo -e ${RED} -------- download clang indexer ${NC}
 cd $WORKSPACE/

images/remote-index/generate.sh

@@ -1,19 +1,13 @@
 #!/bin/bash
 
-if [[ -z "${DOCKER_SOCK}" ]]; then
-   echo "Please set DOCKER_SOCK env variable"
+if [[ -z "${INDEX_VERSION}" ]]; then
+   echo "Please set INDEX_VERSION env variable"
    exit 1
 fi
 
-if [[ -z "${DEV_CONTAINER}" ]]; then
-   echo "Please set DEV_CONTAINER env variable"
-   exit 1
-fi
+cp /storage/images/android/x64/$INDEX_VERSION/bromite.idx .
+cp /storage/images/android/x64/$INDEX_VERSION/RELEASE .
 
-sudo docker -H $DOCKER_SOCK cp $DEV_CONTAINER:/home/lg/working_dir/chromium/src/out/bromite/bromite.idx .
-sudo docker -H $DOCKER_SOCK cp $DEV_CONTAINER:/home/lg/working_dir/bromite/build/RELEASE .
-
-#INDEX_VERSION=$(cat RELEASE)
 DOCKER_BUILDKIT=1 docker build -t uazo/bromite-remote-index:$INDEX_VERSION \
                 --progress plain \
                 --no-cache \

ninja-one-target-for-compdb.patch

@@ -73,6 +73,7 @@ index ed004ac8f1fe1a5107db8b1f5c02c4ba957daef4..bbb79da561ddec497863230cd99ffbe9
 +
  int NinjaMain::ToolCompilationDatabase(const Options* options, int argc, char* argv[]) {
 +  std::vector<Edge*>* edges_to_process = &(state_.edges_);
++  std::vector<Edge*> user_interested_edges;
 +
 +  if (options->user_given_target) {
 +    string err;
@@ -83,7 +84,6 @@ index ed004ac8f1fe1a5107db8b1f5c02c4ba957daef4..bbb79da561ddec497863230cd99ffbe9
 +      return 1;
 +    }
 +
-+    std::vector<Edge*> user_interested_edges;
 +    if (!GetAllDependentEdges(user_given_target, &user_interested_edges))
 +      return 1;
 +    edges_to_process = &user_interested_edges;