diff --git a/.github/workflows/build_cromite.yaml b/.github/workflows/build_cromite.yaml index ea321a75..0ee5875e 100644 --- a/.github/workflows/build_cromite.yaml +++ b/.github/workflows/build_cromite.yaml @@ -176,7 +176,7 @@ jobs: 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 }}/x64:/home/lg/working_dir/chromium/src/out/bromite_x64 + - /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_win - /tmp/proxy:/tmp/proxy - /win_sdk:/win_sdk @@ -204,9 +204,9 @@ jobs: sudo chown lg chromium/src/out && sudo chown lg chromium/src/out/bromite_win - test -d chromium/src/out/bromite_x64 || sudo mkdir -p chromium/src/out/bromite_x64 && \ + test -d chromium/src/out/bromite-android-x86_64 || sudo mkdir -p chromium/src/out/bromite-android-x86_64 && \ sudo chown lg chromium/src/out && - sudo chown lg chromium/src/out/bromite_x64 + sudo chown lg chromium/src/out/bromite-android-x86_64 # make kythe output directory test -d $KYTHE_OUTPUT_DIRECTORY || mkdir -p $KYTHE_OUTPUT_DIRECTORY @@ -279,7 +279,7 @@ jobs: $WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite_win/.ninja_log >$WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite_win/ninja_log_trace.json - - name: Build Bromite Android x64 + - name: Build Bromite Android x86_64 if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'x64' || github.event.inputs.build == 'all') }} shell: bash run: | @@ -287,25 +287,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 = \"x64\" " out/bromite_x64 + gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"x64\" " out/bromite-android-x86_64 echo "::endgroup::" echo "::group::-------- gn args" - gn args out/bromite_x64/ --list --short - gn args out/bromite_x64/ --list >out/bromite_x64/gn_list + gn args out/bromite-android-x86_64/ --list --short + gn args out/bromite-android-x86_64/ --list >out/bromite-android-x86_64/gn_list echo "::endgroup::" - ninja -C out/bromite_x64 chrome_public_apk + ninja -C out/bromite-android-x86_64 chrome_public_apk - cp ../../bromite/build/RELEASE out/bromite_x64 + cp ../../bromite/build/RELEASE out/bromite-android-x86_64 - - name: Get ninja logs Android x64 + - name: Get ninja logs Android x86_64 if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'x64' || github.event.inputs.build == 'all') }} shell: bash run: | cd $WORKSPACE - $WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite_x64/.ninja_log >$WORKSPACE/chromium/src/out/bromite_x64/ninja_log_trace.json - python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite_x64/ninja_log_trace.json + $WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite-android-x86_64/.ninja_log >$WORKSPACE/chromium/src/out/bromite-android-x86_64/ninja_log_trace.json + 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 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c9efa3c0..a5c43526 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -79,7 +79,7 @@ jobs: $GH release upload $VERSION-$BROMITE_SHA arm64_ChromePublic.apk echo "::endgroup::" - # android x64 + # android x86_64 echo "::group::-------- android x64" sudo cp ${{ env.OUTPUTFILE_X64 }}/apks/ChromePublic.apk x64_ChromePublic.apk sudo chown runner x64_ChromePublic.apk