Skip to content

Commit 260fccf

Browse files
committed
Fix mistake in order of statements reg. pkg-config
1 parent 1369473 commit 260fccf

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

buildscripts/kokoro/android.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ BASE_DIR="$(pwd)"
99

1010
cd "$BASE_DIR/github/grpc-java"
1111

12-
export LDFLAGS="$(PKG_CONFIG_PATH=/tmp/protobuf/lib/pkgconfig pkg-config --libs protobuf)"
13-
export CXXFLAGS="$(PKG_CONFIG_PATH=/tmp/protobuf/lib/pkgconfig pkg-config --cflags protobuf)"
14-
export LD_LIBRARY_PATH=/tmp/protobuf/lib
1512
export OS_NAME=$(uname)
1613

1714
cat <<EOF >> gradle.properties
@@ -33,11 +30,15 @@ mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${ANDROID_HOME}/cmdline-tools/
3330
curl -Ls https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-x86_64.tar.gz | \
3431
tar xz -C /tmp
3532
export PATH=/tmp/cmake-3.26.3-linux-x86_64/bin:$PATH
36-
sudo apt-get update && sudo apt-get install pkg-config
3733

3834
# Proto deps
3935
buildscripts/make_dependencies.sh
4036

37+
sudo apt-get update && sudo apt-get install pkg-config
38+
export LDFLAGS="$(PKG_CONFIG_PATH=/tmp/protobuf/lib/pkgconfig pkg-config --libs protobuf)"
39+
export CXXFLAGS="$(PKG_CONFIG_PATH=/tmp/protobuf/lib/pkgconfig pkg-config --cflags protobuf)"
40+
export LD_LIBRARY_PATH=/tmp/protobuf/lib
41+
4142
# Build Android with Java 11, this adds it to the PATH
4243
sudo update-java-alternatives --set java-1.11.0-openjdk-amd64
4344
# Unset any existing JAVA_HOME env var to stop Gradle from using it

0 commit comments

Comments
 (0)