diff --git a/.github/workflows/build_cromite.yaml b/.github/workflows/build_cromite.yaml index 47339328..b47d3f7c 100644 --- a/.github/workflows/build_cromite.yaml +++ b/.github/workflows/build_cromite.yaml @@ -163,7 +163,7 @@ jobs: # kythe KYTHE_CORPUS: chromium.googlesource.com/chromium/src KYTHE_ROOT_DIRECTORY: /home/lg/working_dir/chromium/src - KYTHE_OUTPUT_DIRECTORY: /home/lg/working_dir/chromium/src/out/bromite/kythe + KYTHE_OUTPUT_DIRECTORY: /home/lg/working_dir/chromium/src/out/bromite-android-arm64/kythe # cross build DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: /win_sdk/10.0.22621.0/ WINDOWSSDKDIR: "/win_sdk/10.0.22621.0/Windows Kits/10/" @@ -175,7 +175,7 @@ jobs: KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} CROMITE_PREF_HASH_SEED_BIN: ${{ secrets.CROMITE_PREF_HASH_SEED_BIN }} volumes: - - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/arm64:/home/lg/working_dir/chromium/src/out/bromite + - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/arm64:/home/lg/working_dir/chromium/src/out/bromite-android-arm64 - /storage/images/${{ github.event.inputs.sha }}/android/${{ github.event.inputs.debug }}/x64:/home/lg/working_dir/chromium/src/out/bromite-android-x86_64 - /storage/images/${{ github.event.inputs.sha }}/win/x64:/home/lg/working_dir/chromium/src/out/bromite-windows-x86_64 - /tmp/proxy:/tmp/proxy @@ -196,9 +196,9 @@ jobs: https_proxy= # set out folder permissions - test -d chromium/src/out/bromite || sudo mkdir -p chromium/src/out/bromite && \ + test -d chromium/src/out/bromite-android-arm64 || sudo mkdir -p chromium/src/out/bromite-android-arm64 && \ sudo chown lg chromium/src/out && - sudo chown lg chromium/src/out/bromite + sudo chown lg chromium/src/out/bromite-android-arm64 test -d chromium/src/out/bromite-windows-x86_64 || sudo mkdir -p chromium/src/out/bromite-windows-x86_64 && \ sudo chown lg chromium/src/out && @@ -231,25 +231,25 @@ jobs: 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 = \"arm64\" " out/bromite + gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"arm64\" " out/bromite-android-arm64 echo "::endgroup::" echo "::group::-------- gn args" - gn args out/bromite/ --list --short - gn args out/bromite/ --list >out/bromite/gn_list + gn args out/bromite-android-arm64/ --list --short + gn args out/bromite-android-arm64/ --list >out/bromite-android-arm64/gn_list echo "::endgroup::" - ninja -C out/bromite chrome_public_apk + ninja -C out/bromite-android-arm64 chrome_public_apk - cp ../../bromite/build/RELEASE out/bromite + cp ../../bromite/build/RELEASE out/bromite-android-arm64 - 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 - python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite/ninja_log_trace.json + $WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite-android-arm64/.ninja_log >$WORKSPACE/chromium/src/out/bromite-android-arm64/ninja_log_trace.json + python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite-android-arm64/ninja_log_trace.json - name: Build Bromite Windows x86_64 if: ${{ github.event.inputs.target_os == 'win' || github.event.inputs.target_os == 'all' }} @@ -308,7 +308,7 @@ jobs: python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite-android-x86_64/ninja_log_trace.json - - name: Generate breakpad symbols arm64 + - name: Generate breakpad symbols for 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: | @@ -316,35 +316,35 @@ jobs: cd $WORKSPACE/chromium/src echo "::group::-------- generating breakpad symbols" - ninja -C out/bromite minidump_stackwalk dump_syms - components/crash/content/tools/generate_breakpad_symbols.py --build-dir=out/bromite \ - --symbols-dir=out/bromite/symbols/ --binary=out/bromite/lib.unstripped/libchrome.so \ + ninja -C out/bromite-android-arm64 minidump_stackwalk dump_syms + components/crash/content/tools/generate_breakpad_symbols.py --build-dir=out/bromite-android-arm64 \ + --symbols-dir=out/bromite-android-arm64/symbols/ --binary=out/bromite-android-arm64/lib.unstripped/libchrome.so \ --platform=android --clear --verbose - cp out/bromite/lib.unstripped/libchrome.so out/bromite/symbols/libchrome.lib.so - cp out/bromite/minidump_stackwalk out/bromite/symbols - cp out/bromite/dump_syms out/bromite/symbols + cp out/bromite-android-arm64/lib.unstripped/libchrome.so out/bromite-android-arm64/symbols/libchrome.lib.so + cp out/bromite-android-arm64/minidump_stackwalk out/bromite-android-arm64/symbols + cp out/bromite-android-arm64/dump_syms out/bromite-android-arm64/symbols echo "::endgroup::" - - name: Generate Supersize data + - name: Generate Supersize data for Android arm64 if: ${{ github.event.inputs.debug == 'false' && (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 - tools/binary_size/supersize archive out/bromite/chrome.size --apk-file out/bromite/apks/ChromePublic.apk -v + tools/binary_size/supersize archive out/bromite-android-arm64/chrome.size --apk-file out/bromite-android-arm64/apks/ChromePublic.apk -v - - name: Generate clangd index + - name: Generate clangd index for Android arm64 if: ${{ github.event.inputs.clangd == 'true' }} 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 - test -f out/bromite/bromite.idx || \ - cp -r out/bromite out/clangd && \ + test -f out/bromite-android-arm64/bromite.idx || \ + cp -r out/bromite-android-arm64 out/clangd && \ gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) skip_clangd_unsupported_options = true" out/clangd && \ $WORKSPACE/ninja/ninja -C $WORKSPACE/chromium/src/out/clangd -a chrome_public_apk \ -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 && \ + /home/lg/working_dir/clangd_snapshot_20211205/bin/clangd-indexer --executor=all-TUs out/clangd/compile_commands.json >out/bromite-android-arm64/bromite.idx && \ rm -rf out/clangd