diff --git a/.github/workflows/build_cromite.yaml b/.github/workflows/build_cromite.yaml index 456116d0..5b76711f 100644 --- a/.github/workflows/build_cromite.yaml +++ b/.github/workflows/build_cromite.yaml @@ -228,34 +228,6 @@ jobs: gpg --homedir ./ -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch cromite.keystore.asc > cromite.keystore echo "::endgroup::" - - name: Build Bromite Android arm - if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm' || 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 - - echo "::group::-------- gn gen" - gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"arm\" " out/bromite-android-arm - echo "::endgroup::" - - echo "::group::-------- gn args" - gn args out/bromite-android-arm/ --list --short - gn args out/bromite-android-arm/ --list >out/bromite-android-arm/gn_list - echo "::endgroup::" - - ninja -C out/bromite-android-arm chrome_public_apk - - cp ../../bromite/build/RELEASE out/bromite-android-arm - - - name: Get ninja logs Android arm - if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm' || github.event.inputs.build == 'all') }} - shell: bash - run: | - cd $WORKSPACE - $WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite-android-arm/.ninja_log >$WORKSPACE/chromium/src/out/bromite-android-arm/ninja_log_trace.json - python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite-android-arm/ninja_log_trace.json - - name: Build Bromite 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 @@ -340,7 +312,6 @@ jobs: $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 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 @@ -367,6 +338,34 @@ jobs: tools/binary_size/supersize archive out/bromite-android-arm64/chrome.size --apk-file out/bromite-android-arm64/apks/ChromePublic.apk -v + - name: Build Bromite Android arm + if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm' || 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 + + echo "::group::-------- gn gen" + gn gen --args="import(\"/home/lg/working_dir/bromite/build/bromite.gn_args\") $(cat ../../build_args.gni) target_cpu = \"arm\" " out/bromite-android-arm + echo "::endgroup::" + + echo "::group::-------- gn args" + gn args out/bromite-android-arm/ --list --short + gn args out/bromite-android-arm/ --list >out/bromite-android-arm/gn_list + echo "::endgroup::" + + ninja -C out/bromite-android-arm chrome_public_apk + + cp ../../bromite/build/RELEASE out/bromite-android-arm + + - name: Get ninja logs Android arm + if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm' || github.event.inputs.build == 'all') }} + shell: bash + run: | + cd $WORKSPACE + $WORKSPACE/ninjatracing/ninjatracing $WORKSPACE/chromium/src/out/bromite-android-arm/.ninja_log >$WORKSPACE/chromium/src/out/bromite-android-arm/ninja_log_trace.json + python3 $WORKSPACE/chromium/src/third_party/catapult/tracing/bin/trace2html $WORKSPACE/chromium/src/out/bromite-android-arm/ninja_log_trace.json + - name: Generate clangd index for Android arm64 if: ${{ github.event.inputs.clangd == 'true' }} shell: bash