From 4cb907457bcb11b19f9338ddd965aa5fef03b60f Mon Sep 17 00:00:00 2001 From: Ming-Chuan Date: Wed, 15 Sep 2021 13:29:29 +0800 Subject: [PATCH] Rename binder transport example client app (#27344) Rename the app to exampleclient Also moved and updated README.md --- .../java/io/grpc/binder/cpp/{example => }/README.md | 11 +++++++---- .../{example => exampleclient}/AndroidManifest.xml | 7 +++---- .../grpc/binder/cpp/{example => exampleclient}/BUILD | 0 .../ButtonPressHandler.java | 2 +- .../cpp/{example => exampleclient}/MainActivity.java | 2 +- .../binder/cpp/{example => exampleclient}/native.cc | 5 +++-- .../res/layout/activity_main.xml | 0 .../{example => exampleclient}/res/values/strings.xml | 0 .../grpc_binder_transport_apk_build_in_docker.sh | 2 +- 9 files changed, 16 insertions(+), 13 deletions(-) rename examples/android/binder/java/io/grpc/binder/cpp/{example => }/README.md (65%) rename examples/android/binder/java/io/grpc/binder/cpp/{example => exampleclient}/AndroidManifest.xml (75%) rename examples/android/binder/java/io/grpc/binder/cpp/{example => exampleclient}/BUILD (100%) rename examples/android/binder/java/io/grpc/binder/cpp/{example => exampleclient}/ButtonPressHandler.java (86%) rename examples/android/binder/java/io/grpc/binder/cpp/{example => exampleclient}/MainActivity.java (94%) rename examples/android/binder/java/io/grpc/binder/cpp/{example => exampleclient}/native.cc (90%) rename examples/android/binder/java/io/grpc/binder/cpp/{example => exampleclient}/res/layout/activity_main.xml (100%) rename examples/android/binder/java/io/grpc/binder/cpp/{example => exampleclient}/res/values/strings.xml (100%) diff --git a/examples/android/binder/java/io/grpc/binder/cpp/example/README.md b/examples/android/binder/java/io/grpc/binder/cpp/README.md similarity index 65% rename from examples/android/binder/java/io/grpc/binder/cpp/example/README.md rename to examples/android/binder/java/io/grpc/binder/cpp/README.md index bbc1545ecf6..d0817c07d5e 100644 --- a/examples/android/binder/java/io/grpc/binder/cpp/example/README.md +++ b/examples/android/binder/java/io/grpc/binder/cpp/README.md @@ -1,4 +1,4 @@ -# gRPC-core BinderTransport example app +# gRPC-core BinderTransport example apps WIP. @@ -13,6 +13,9 @@ WIP. export ANDROID_HOME=$HOME/Android/Sdk/ export ANDROID_NDK_HOME=$HOME/Android/Sdk/ndk/21.4.7075529 ``` -3. `bazel build //examples/android/binder/java/io/grpc/binder/cpp/example:app` -4. `adb install - bazel-bin/examples/android/binder/java/io/grpc/binder/cpp/example/app.apk` +3. `bazel build //examples/android/binder/java/io/grpc/binder/cpp/exampleclient:app` +4. `bazel build //examples/android/binder/java/io/grpc/binder/cpp/exampleserver:app` +5. `adb install + bazel-bin/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/app.apk` +6. `adb install + bazel-bin/examples/android/binder/java/io/grpc/binder/cpp/exampleserver/app.apk` diff --git a/examples/android/binder/java/io/grpc/binder/cpp/example/AndroidManifest.xml b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/AndroidManifest.xml similarity index 75% rename from examples/android/binder/java/io/grpc/binder/cpp/example/AndroidManifest.xml rename to examples/android/binder/java/io/grpc/binder/cpp/exampleclient/AndroidManifest.xml index 7a60e908523..8dea1553faf 100644 --- a/examples/android/binder/java/io/grpc/binder/cpp/example/AndroidManifest.xml +++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/AndroidManifest.xml @@ -1,6 +1,5 @@ - @@ -13,10 +12,10 @@ + android:label="gRPC BinderTransport Client Cpp"> + android:label="gRPC BinderTransport Client Cpp" > diff --git a/examples/android/binder/java/io/grpc/binder/cpp/example/BUILD b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/BUILD similarity index 100% rename from examples/android/binder/java/io/grpc/binder/cpp/example/BUILD rename to examples/android/binder/java/io/grpc/binder/cpp/exampleclient/BUILD diff --git a/examples/android/binder/java/io/grpc/binder/cpp/example/ButtonPressHandler.java b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/ButtonPressHandler.java similarity index 86% rename from examples/android/binder/java/io/grpc/binder/cpp/example/ButtonPressHandler.java rename to examples/android/binder/java/io/grpc/binder/cpp/exampleclient/ButtonPressHandler.java index 44e1e08509a..ed9d11a404b 100644 --- a/examples/android/binder/java/io/grpc/binder/cpp/example/ButtonPressHandler.java +++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/ButtonPressHandler.java @@ -1,4 +1,4 @@ -package io.grpc.binder.cpp.example; +package io.grpc.binder.cpp.exampleclient; import android.app.Application; diff --git a/examples/android/binder/java/io/grpc/binder/cpp/example/MainActivity.java b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/MainActivity.java similarity index 94% rename from examples/android/binder/java/io/grpc/binder/cpp/example/MainActivity.java rename to examples/android/binder/java/io/grpc/binder/cpp/exampleclient/MainActivity.java index 0c87b2bbcfe..3cbf70d1e65 100644 --- a/examples/android/binder/java/io/grpc/binder/cpp/example/MainActivity.java +++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/MainActivity.java @@ -1,4 +1,4 @@ -package io.grpc.binder.cpp.example; +package io.grpc.binder.cpp.exampleclient; import android.app.Activity; import android.os.Bundle; diff --git a/examples/android/binder/java/io/grpc/binder/cpp/example/native.cc b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc similarity index 90% rename from examples/android/binder/java/io/grpc/binder/cpp/example/native.cc rename to examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc index 99f49419383..337a2045c20 100644 --- a/examples/android/binder/java/io/grpc/binder/cpp/example/native.cc +++ b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/native.cc @@ -21,10 +21,11 @@ #include "src/core/ext/transport/binder/client/channel_create.h" extern "C" JNIEXPORT jstring JNICALL -Java_io_grpc_binder_cpp_example_ButtonPressHandler_native_1entry( +Java_io_grpc_binder_cpp_exampleclient_ButtonPressHandler_native_1entry( JNIEnv* env, jobject /*this*/, jobject application) { static bool first = true; - __android_log_print(ANDROID_LOG_INFO, "Demo", "Line number %d", __LINE__); + __android_log_print(ANDROID_LOG_INFO, "DemoClient", "Line number %d", + __LINE__); if (first) { first = false; grpc::experimental::BindToOnDeviceServerService( diff --git a/examples/android/binder/java/io/grpc/binder/cpp/example/res/layout/activity_main.xml b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/layout/activity_main.xml similarity index 100% rename from examples/android/binder/java/io/grpc/binder/cpp/example/res/layout/activity_main.xml rename to examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/layout/activity_main.xml diff --git a/examples/android/binder/java/io/grpc/binder/cpp/example/res/values/strings.xml b/examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/values/strings.xml similarity index 100% rename from examples/android/binder/java/io/grpc/binder/cpp/example/res/values/strings.xml rename to examples/android/binder/java/io/grpc/binder/cpp/exampleclient/res/values/strings.xml diff --git a/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh b/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh index d744f90b5ea..454e2fe1fd8 100644 --- a/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh +++ b/tools/internal_ci/linux/grpc_binder_transport_apk_build_in_docker.sh @@ -35,7 +35,7 @@ echo $ANDROID_NDK_HOME bazel build --define=use_strict_warning=true \ --fat_apk_cpu=x86_64,arm64-v8a \ --extra_toolchains=@rules_python//python:autodetecting_toolchain_nonstrict \ - //examples/android/binder/java/io/grpc/binder/cpp/example:app \ + //examples/android/binder/java/io/grpc/binder/cpp/exampleclient:app \ //examples/android/binder/java/io/grpc/binder/cpp/exampleserver:app # Make sure the Java code that will be invoked by binder transport