Skip to content

Commit 4feb9c5

Browse files
Fix the build issues (google#1285)
* Update the Java 1.8 version * change unzip location * Grant execute access to wix binaries * create parent folder for out
1 parent 69594ab commit 4feb9c5

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ copy_to(
162162
name = "pkg-root",
163163
srcs = [
164164
"//cmd/agi",
165-
"//cmd/device-info:device-info",
165+
"//cmd/device-info",
166166
"//cmd/gapir/cc:gapir",
167167
"//cmd/gapis",
168168
"//cmd/gapit",

kokoro/windows/build.bat

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,15 @@ REM Using 'set /p' prints without CRLF newline characters, which sha256sum can't
2727
REM If sha256sum fails, 'exit /b 1' will terminate batch with error code 1.
2828
echo | set /p placeholder="2c1888d5d1dba377fc7fa14444cf556963747ff9a0a289a3599cf09da03b9e2e wix311-binaries.zip" | sha256sum --check || exit /b 1
2929
unzip -q wix311-binaries.zip
30+
31+
REM Grant read and execute access for WIX
32+
icacls *.* /grant ContainerAdministrator:rx
33+
3034
set WIX=%cd%
3135
cd ..
3236

3337
REM Use a fixed JDK.
34-
set JAVA_HOME=c:\Program Files\Java\jdk1.8.0_152
38+
set JAVA_HOME=C:\Program Files\Java\jdk1.8.0_211
3539

3640
REM Install the Android SDK components and NDK.
3741
set ANDROID_HOME=c:\Android\android-sdk
@@ -73,7 +77,7 @@ wget -q http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-libs-10.3.0-8-an
7377
echo | set /p placeholder="2e1ea0da3c9da3285067a8b2a2639aa0a6bf21cd64edca2a216f6b9c4c1382bd mingw-w64-x86_64-gcc-libs-10.3.0-8-any.pkg.tar.zst" | sha256sum --check || exit /b 1
7478
wget -q http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-binutils-2.37-4-any.pkg.tar.zst
7579
echo | set /p placeholder="a518d2630c11fe363abd394763d0bb82fdde72386ffb58d87ecc8f46cbe878d6 mingw-w64-x86_64-binutils-2.37-4-any.pkg.tar.zst" | sha256sum --check || exit /b 1
76-
%BUILD_ROOT%\msys64\usr\bin\bash --login -c "pacman -U --noconfirm /t/src/mingw-w64-x86_64-gcc-10.3.0-8-any.pkg.tar.zst /t/src/mingw-w64-x86_64-gcc-libs-10.3.0-8-any.pkg.tar.zst /t/src/mingw-w64-x86_64-binutils-2.37-4-any.pkg.tar.zst"
80+
%BUILD_ROOT%\msys64\usr\bin\bash --login -c "pacman -U --noconfirm mingw-w64-x86_64-gcc-10.3.0-8-any.pkg.tar.zst mingw-w64-x86_64-gcc-libs-10.3.0-8-any.pkg.tar.zst mingw-w64-x86_64-binutils-2.37-4-any.pkg.tar.zst"
7781

7882
REM Configure build process to use the now installed MSYS2.
7983
set PATH=%BUILD_ROOT%\msys64\mingw64\bin;%BUILD_ROOT%\msys64\usr\bin;%PATH%

kokoro/windows/package.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ if exist "%BUILD_OUT%\dist" (
4040
rmdir /Q /S "%BUILD_OUT%\dist"
4141
)
4242

43+
mkdir "%BUILD_OUT%\dist
4344
mkdir "%BUILD_OUT%\dist\agi"
4445
pushd "%BUILD_OUT%\dist"
4546

0 commit comments

Comments
 (0)