From 30396fb025d6e7f2a9dd155ef3b0e6973ebc586b Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 27 Aug 2020 10:47:44 -0700 Subject: [PATCH 1/7] Update grpc_android for new CI environment --- tools/internal_ci/linux/grpc_android.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/internal_ci/linux/grpc_android.sh b/tools/internal_ci/linux/grpc_android.sh index 209b30d1ad7..d335e783947 100755 --- a/tools/internal_ci/linux/grpc_android.sh +++ b/tools/internal_ci/linux/grpc_android.sh @@ -15,6 +15,10 @@ set -ex +# Install packages which werer not preinstalled yet. +# Protobuf needs autoconf & automake to build +sudo apt-get install -y autoconf automake + # change to grpc repo root cd $(dirname $0)/../../.. From 51531aada02ca214c7e9e1a209c8689f3690e80f Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 27 Aug 2020 13:40:57 -0700 Subject: [PATCH 2/7] Upgrade gradle to 3.1.4 --- src/android/test/interop/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/test/interop/build.gradle b/src/android/test/interop/build.gradle index bd5f337f013..78591e3b824 100644 --- a/src/android/test/interop/build.gradle +++ b/src/android/test/interop/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } From 10d7e2fef7118aff176bf99432875fc6ae6fe360 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 27 Aug 2020 14:15:44 -0700 Subject: [PATCH 3/7] Upgrade gradlewrapper to 6.5.1 --- .../android/helloworld/gradle/wrapper/gradle-wrapper.properties | 2 +- .../test/interop/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties index 4c81831f533..ac3220ae044 100644 --- a/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties +++ b/examples/android/helloworld/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip diff --git a/src/android/test/interop/gradle/wrapper/gradle-wrapper.properties b/src/android/test/interop/gradle/wrapper/gradle-wrapper.properties index 4c81831f533..ac3220ae044 100644 --- a/src/android/test/interop/gradle/wrapper/gradle-wrapper.properties +++ b/src/android/test/interop/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip From 3fbaffa24b9793f8e9d98b86fa8b967f88957b80 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 27 Aug 2020 14:16:28 -0700 Subject: [PATCH 4/7] Update by review --- tools/internal_ci/linux/grpc_android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/internal_ci/linux/grpc_android.sh b/tools/internal_ci/linux/grpc_android.sh index d335e783947..81acbed6551 100755 --- a/tools/internal_ci/linux/grpc_android.sh +++ b/tools/internal_ci/linux/grpc_android.sh @@ -15,7 +15,7 @@ set -ex -# Install packages which werer not preinstalled yet. +# Install packages which were not preinstalled yet. # Protobuf needs autoconf & automake to build sudo apt-get install -y autoconf automake From 9f7ff86919b29c806c4f3baa05d8bf69262de86b Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 27 Aug 2020 15:04:23 -0700 Subject: [PATCH 5/7] Accept the Android SDK licences. --- tools/internal_ci/linux/grpc_android.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/internal_ci/linux/grpc_android.sh b/tools/internal_ci/linux/grpc_android.sh index 81acbed6551..87c7a24dd7f 100755 --- a/tools/internal_ci/linux/grpc_android.sh +++ b/tools/internal_ci/linux/grpc_android.sh @@ -19,6 +19,9 @@ set -ex # Protobuf needs autoconf & automake to build sudo apt-get install -y autoconf automake +# Accept the Android SDK licences. +yes | /opt/android-sdk/current/tools/bin/sdkmanager --licenses + # change to grpc repo root cd $(dirname $0)/../../.. From 32ea9af3b0541f059f967dab0ad5634e73a95cb4 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 27 Aug 2020 16:44:27 -0700 Subject: [PATCH 6/7] Bump Android SDK --- examples/android/helloworld/build.gradle | 2 +- src/android/test/interop/app/build.gradle | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/android/helloworld/build.gradle b/examples/android/helloworld/build.gradle index bd5f337f013..78591e3b824 100644 --- a/examples/android/helloworld/build.gradle +++ b/examples/android/helloworld/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/src/android/test/interop/app/build.gradle b/src/android/test/interop/app/build.gradle index fb500a71c71..5bedc43c9ef 100644 --- a/src/android/test/interop/app/build.gradle +++ b/src/android/test/interop/app/build.gradle @@ -29,6 +29,9 @@ android { arguments '-DgRPC_CPP_PLUGIN_EXECUTABLE=' + grpc_cpp_plugin } } + ndk { + abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" + } } buildTypes { debug { From fc4556a92d6a300bdac3bf182a2979680c499837 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 27 Aug 2020 20:34:58 -0700 Subject: [PATCH 7/7] Add ABSL_NO_XRAY_ATTRIBUTES --- examples/android/helloworld/app/CMakeLists.txt | 3 +++ src/android/test/interop/app/CMakeLists.txt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/examples/android/helloworld/app/CMakeLists.txt b/examples/android/helloworld/app/CMakeLists.txt index f449a5ce2ea..160eb845d99 100644 --- a/examples/android/helloworld/app/CMakeLists.txt +++ b/examples/android/helloworld/app/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.4.1) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +# https://github.com/abseil/abseil-cpp/issues/626 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DABSL_NO_XRAY_ATTRIBUTES=1") + set(helloworld_PROTOBUF_PROTOC_EXECUTABLE "/usr/local/bin/protoc" CACHE STRING "Protoc binary on host") set(helloworld_GRPC_CPP_PLUGIN_EXECUTABLE "/usr/local/bin/grpc_cpp_plugin" CACHE STRING "gRPC CPP plugin binary on host") diff --git a/src/android/test/interop/app/CMakeLists.txt b/src/android/test/interop/app/CMakeLists.txt index e288dd63cec..53fbe594499 100644 --- a/src/android/test/interop/app/CMakeLists.txt +++ b/src/android/test/interop/app/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.4.1) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +# https://github.com/abseil/abseil-cpp/issues/626 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DABSL_NO_XRAY_ATTRIBUTES=1") + set(PROTOBUF_PROTOC_EXECUTABLE "/usr/local/bin/protoc" CACHE STRING "Protoc binary on host") set(gRPC_CPP_PLUGIN_EXECUTABLE "/usr/local/bin/grpc_cpp_plugin" CACHE STRING "gRPC CPP plugin binary on host")