File tree Expand file tree Collapse file tree 2 files changed +3
-3
lines changed
Expand file tree Collapse file tree 2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ SET PKG_CONFIG_PATH=%ESCWORKSPACE%\\grpc-java-helper32\\protobuf-%PROTOBUF_VER%\
3030SET VC_PROTOBUF_LIB_PATHS = %ESCWORKSPACE% \\grpc-java-helper32\\protobuf-%PROTOBUF_VER% \\build\\protobuf-%PROTOBUF_VER% \\lib
3131SET VC_PROTOBUF_INCLUDE = %ESCWORKSPACE% \\grpc-java-helper32\\protobuf-%PROTOBUF_VER% \\build\\protobuf-%PROTOBUF_VER% \\include
3232call :Get_Libs
33- SET GRADLE_FLAGS = -PtargetArch=%TARGET_ARCH% -PfailOnWarnings=%FAIL_ON_WARNINGS% -PvcProtobufLibPaths=%VC_PROTOBUF_LIB_PATHS% -PvcProtobufInclude=%VC_PROTOBUF_INCLUDE% -PskipAndroid=true
33+ SET GRADLE_FLAGS = -PtargetArch=%TARGET_ARCH% -PfailOnWarnings=%FAIL_ON_WARNINGS% -PvcProtobufLibPaths=%VC_PROTOBUF_LIB_PATHS% -PvcProtobufLibs= %VC_PROTOBUF_LIBS% - PvcProtobufInclude=%VC_PROTOBUF_INCLUDE% -PskipAndroid=true
3434SET GRADLE_OPTS = " -Dorg.gradle.jvmargs='-Xmx1g'"
3535
3636cmd.exe /C " %WORKSPACE% \gradlew.bat %GRADLE_FLAGS% build"
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ set JAVA_HOME=
1717
1818mkdir grpc-java-helper64
1919cd grpc-java-helper64
20- call " %VS170COMNTOOLS% \..\..\VC\Auxiliary\Build\vcvars64.bat" || exit /b 1
20+ call " %VS170COMNTOOLS% \..\..\VC\Auxiliary\Build\vcvars64.bat" || exit /b 1
2121call " %WORKSPACE% \buildscripts\make_dependencies.bat" || exit /b 1
2222
2323cd " %WORKSPACE% "
@@ -29,7 +29,7 @@ SET PKG_CONFIG_PATH=%ESCWORKSPACE%\\grpc-java-helper64\\protobuf-%PROTOBUF_VER%\
2929SET VC_PROTOBUF_LIB_PATHS = %ESCWORKSPACE% \\grpc-java-helper64\\protobuf-%PROTOBUF_VER% \\build\\protobuf-%PROTOBUF_VER% \\lib
3030SET VC_PROTOBUF_INCLUDE = %ESCWORKSPACE% \\grpc-java-helper64\\protobuf-%PROTOBUF_VER% \\build\\protobuf-%PROTOBUF_VER% \\include
3131call :Get_Libs
32- SET GRADLE_FLAGS = -PtargetArch=%TARGET_ARCH% -PfailOnWarnings=%FAIL_ON_WARNINGS% -PvcProtobufLibPaths=%VC_PROTOBUF_LIB_PATHS% -PvcProtobufInclude=%VC_PROTOBUF_INCLUDE% -PskipAndroid=true
32+ SET GRADLE_FLAGS = -PtargetArch=%TARGET_ARCH% -PfailOnWarnings=%FAIL_ON_WARNINGS% -PvcProtobufLibPaths=%VC_PROTOBUF_LIB_PATHS% -PvcProtobufLibs= %VC_PROTOBUF_LIBS% - PvcProtobufInclude=%VC_PROTOBUF_INCLUDE% -PskipAndroid=true
3333SET GRADLE_OPTS = " -Dorg.gradle.jvmargs='-Xmx1g'"
3434
3535@ rem make sure no daemons have any files open
You can’t perform that action at this time.
0 commit comments