Skip to content

Commit 1f5825d

Browse files
start incorporating fixes from yu-re-ka/robotnix
1 parent 5117f4d commit 1f5825d

26 files changed

+668
-24603
lines changed

apks/chromium/default.nix

+3-4
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,9 @@ let
111111
ffmpeg_branding = "Chrome";
112112

113113
# Only include minimal symbols to save space
114-
symbol_level = 0;
114+
symbol_level = 1;
115115
blink_symbol_level = 0;
116-
117-
use_relative_vtables_abi = false;
116+
v8_symbol_level=0;
118117

119118
chrome_pgo_phase = 0;
120119
# leaving the prebuilt clang in places forces a check on the revision that we can't satisfy
@@ -206,7 +205,7 @@ in stdenv.mkDerivation rec {
206205
pname = name;
207206
inherit version src gnSystemLibraries gnFlags;
208207

209-
nativeBuildInputs = [ gn ninja pkg-config jdk11 nodejs gperf bison libwebp flac libjpeg libpng libxslt libxml2 binutils autoPatchelfHook ] ++
208+
nativeBuildInputs = [ gn ninja pkg-config jdk11 nodejs gperf bison libwebp flac libjpeg libpng libxslt libxml2 binutils ] ++
210209
# Android stuff (from src/build/install-build-deps-android.sh)
211210
# Including some of the stuff from src/.vpython as well
212211
[ bsdiff

apks/chromium/vanadium.nix

+3
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ in
3232
proprietary_codecs = true;
3333

3434
is_cfi = true;
35+
use_cfi_cast = true;
36+
use_relative_vtables_abi = false;
3537

3638
enable_gvr_services = false;
3739
enable_remoting = false;
3840
enable_reporting = true; # 83.0.4103.83 build is broken without building this code
41+
enable_multidex = true;
3942
};
4043
# Needed for patces/0082-update-dependencies.patch in earlier versions of vanadium
4144
# -- this patch no longer exists at least as of 112.

flake.lock

+27-31
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
66
nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable";
77
androidPkgs.url = "github:tadfisher/android-nixpkgs/stable";
8+
androidPkgs.inputs.nixpkgs.follows = "nixpkgs";
89
};
910

1011
outputs = { self, nixpkgs, androidPkgs, ... }@inputs:

0 commit comments

Comments
 (0)