disable use_relative_vtables_abi

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