.github/workflows/build.yml

@@ -308,7 +308,7 @@ jobs:
         run: |
           mkdir ${{ env.BUNDLE }}
           cp out/Release/naive config.json ../LICENSE ../USAGE.txt ${{ env.BUNDLE }}
-          7z a ${{ env.BUNDLE }}.zip ${{ env.BUNDLE }}
+          7z a ../${{ env.BUNDLE }}.zip ${{ env.BUNDLE }}
           hub release edit -a ${{ env.BUNDLE }}.zip -m "" "${GITHUB_REF##*/}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -316,7 +316,7 @@ jobs:
         if: ${{ github.event_name == 'release' }}
         run: |
           mv out/Release/cronet ${{ env.CRONET_BUNDLE }}
-          7z a ${{ env.CRONET_BUNDLE }}.zip ${{ env.CRONET_BUNDLE }}
+          7z a ../${{ env.CRONET_BUNDLE }}.zip ${{ env.CRONET_BUNDLE }}
           hub release edit -a ${{ env.CRONET_BUNDLE }}.zip -m "" "${GITHUB_REF##*/}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

src/make-go-buildflags.sh

@@ -200,7 +200,7 @@ if [ "$target_cpu" = 'mipsel' -o "$target_cpu" = 'mips64el' ]; then
 elif [ "$target_cpu" = 'arm64' -a "$ARCH" = 'Windows' ]; then
   # CGO does not support PIE for windows/arm64.
   buildmode_flag=
-elif [ "$target_cpu" = 'x86' -a "$target_os" != 'android' ]; then
+elif [ "$target_cpu" = 'x86' -a "$target_os" != '' ]; then
   # Segfaults if built with PIE in regular Linux.  TODO: Find out why.
   buildmode_flag=
 fi