diff --git a/.github/workflows/build_cromite.yaml b/.github/workflows/build_cromite.yaml index 379dae6d..a14b7817 100644 --- a/.github/workflows/build_cromite.yaml +++ b/.github/workflows/build_cromite.yaml @@ -248,7 +248,7 @@ jobs: cd $WORKSPACE/chromium/src echo "::group::-------- gn gen" - gn gen --args="$(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" " out/x64 + gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" " out/x64 echo "::endgroup::" echo "::group::-------- gn args" @@ -305,7 +305,7 @@ jobs: cd $WORKSPACE/chromium/src echo "::group::-------- gn gen" - gn gen --args="$(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"arm64\" " out/arm64 + gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"arm64\" " out/arm64 echo "::endgroup::" echo "::group::-------- gn args" @@ -360,7 +360,7 @@ jobs: cd $WORKSPACE/chromium/src echo "::group::-------- gn gen" - gn gen --args="$(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"arm\" " out/arm + gn gen --args="target_os = \"android\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"arm\" " out/arm echo "::endgroup::" echo "::group::-------- gn args" @@ -389,7 +389,7 @@ jobs: cd $WORKSPACE/chromium/src echo "::group::-------- gn gen" - gn gen --args="target_os = \"linux\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" use_sysroot = true " out/lin64 + gn gen --args="target_os = \"linux\" $(cat /home/lg/working_dir/cromite/build/cromite.gn_args) target_cpu = \"x64\" " out/lin64 echo "::endgroup::" echo "::group::-------- gn args" diff --git a/build/cromite.gn_args b/build/cromite.gn_args index b8ced258..3d2bc2d5 100644 --- a/build/cromite.gn_args +++ b/build/cromite.gn_args @@ -7,7 +7,6 @@ dcheck_always_on=false debuggable_apks=false dfmify_dev_ui=false disable_android_lint=true -disable_autofill_assistant_dfm=true disable_fieldtrial_testing_config=true disable_tab_ui_dfm=true enable_av1_decoder=true @@ -32,8 +31,6 @@ is_official_build=true proprietary_codecs=true rtc_build_examples=false symbol_level=1 -system_webview_package_name="org.cromite.webview" -target_os="android" treat_warnings_as_errors=true use_debug_fission=true use_errorprone_java_compiler=false @@ -70,7 +67,9 @@ if (getenv("TARGET_CPU") != "") { if (target_os == "android") { target_os = "android" # fix traffic annotation auditor #enable_kythe_annotations = true + chrome_public_manifest_package = "org.cromite.cromite" + system_webview_package_name="org.cromite.webview" if (getenv("USE_KEYSTORE") != "") { android_keystore_path = "/home/lg/working_dir/cromite.keystore" @@ -110,3 +109,17 @@ if (target_os == "win") { is_cfi = false # disable it use_cfi_cast = false # disable it } + +if (target_os == "linux") { + target_os = "linux" # fix traffic annotation auditor + target_cpu = "x64" + symbol_level = 0 + + enable_pdf = true + pdf_is_complete_lib = true + enable_plugins = true + enable_ppapi = false + + use_sysroot = true + chrome_pgo_phase = 2 # enable pgo +}