From 1ce79b9f6bf46903659fbf5eebead49e09afce04 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 10 Aug 2017 08:11:26 -0700 Subject: Dynamically generate dialer grpc services. Test: TreeHugger Change-Id: Ia3d122b40ae0ff73f489ee2bcf10ab5d703f2805 --- Android.mk | 37 ++- .../v1/VoicemailTranscriptionServiceGrpc.java | 254 --------------------- 2 files changed, 27 insertions(+), 264 deletions(-) delete mode 100644 java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java diff --git a/Android.mk b/Android.mk index 140b41fe8..2da71a598 100644 --- a/Android.mk +++ b/Android.mk @@ -1,15 +1,9 @@ # Local modifications: -# * removed com.google.android.backup.api_key. This should be added to -# the manifest in the top level directory. # * removed com.google.android.geo.API_KEY key. This should be added to # the manifest files in java/com/android/incallui/calllocation/impl/ # and /java/com/android/incallui/maps/impl/ # * b/62417801 modify translation string naming convention: # $ find . -type d | grep 262 | rename 's/(values)\-([a-zA-Z\+\-]+)\-(mcc262-mnc01)/$1-$3-$2/' -# * b/62343966 include manually generated GRPC service class: -# $ protoc --plugin=protoc-gen-grpc-java=prebuilts/tools/common/m2/repository/io/grpc/protoc-gen-grpc-java/1.0.3/protoc-gen-grpc-java-1.0.3-linux-x86_64.exe \ -# --grpc-java_out=lite:"packages/apps/Dialer/java/com/android/voicemail/impl/" \ -# --proto_path="packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/" "packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto" # * b/37077388 temporarily disable proguard with javac LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -77,8 +71,31 @@ DIALER_MANIFEST_FILES := $(filter-out $(EXCLUDE_MANIFESTS),$(DIALER_MANIFEST_FIL # Merge all manifest files. LOCAL_FULL_LIBS_MANIFEST_FILES := \ $(addprefix $(LOCAL_PATH)/, $(DIALER_MANIFEST_FILES)) + +# * b/62875795 include manually generated GRPC service class: +ifeq ($(HOST_OS),linux) + define gen-dialer-grpc + $(shell cd $(LOCAL_PATH) ; \ + ../../../prebuilts/tools/linux-x86_64/protoc/bin/protoc --plugin=protoc-gen-grpc-java=../../../prebuilts/tools/common/m2/repository/io/grpc/protoc-gen-grpc-java/1.0.3/protoc-gen-grpc-java-1.0.3-linux-x86_64.exe \ + --grpc-java_out=lite:"java/com/android/voicemail/impl/" \ + --proto_path="java/com/android/voicemail/impl/transcribe/grpc/" "java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto") + endef +endif +ifeq ($(HOST_OS),darwin) + define gen-dialer-grpc + $(shell cd $(LOCAL_PATH) ; \ + ../../../prebuilts/tools/darwin-x86_64/protoc/bin/protoc --plugin=protoc-gen-grpc-java=../../../prebuilts/tools/common/m2/repository/io/grpc/protoc-gen-grpc-java/1.0.3/protoc-gen-grpc-java-1.0.3-osx-x86_64.exe \ + --grpc-java_out=lite:"java/com/android/voicemail/impl/" \ + --proto_path="java/com/android/voicemail/impl/transcribe/grpc/" "java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto") + endef +endif + +$(call gen-dialer-grpc) + LOCAL_SRC_FILES := $(call all-java-files-under, $(SRC_DIRS)) LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES)) +# * b/62875795 include manually generated GRPC service class: +LOCAL_SRC_FILES += java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java LOCAL_SRC_FILES += $(call all-proto-files-under, $(SRC_DIRS)) # Backup Library @@ -119,12 +136,12 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ dialer-disklrucache-target \ dialer-gifdecoder-target \ dialer-glide-target \ - dialer-grpc-all-target \ - dialer-grpc-context-target \ - dialer-grpc-core-target \ + dialer-grpc-all-target \ + dialer-grpc-context-target \ + dialer-grpc-core-target \ dialer-grpc-okhttp-target \ dialer-grpc-protobuf-lite-target \ - dialer-grpc-stub-target \ + dialer-grpc-stub-target \ dialer-guava-target \ dialer-javax-annotation-api-target \ dialer-javax-inject-target \ diff --git a/java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java b/java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java deleted file mode 100644 index 448c69356..000000000 --- a/java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java +++ /dev/null @@ -1,254 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.google.internal.communications.voicemailtranscription.v1; - -import static io.grpc.stub.ClientCalls.asyncUnaryCall; -import static io.grpc.stub.ClientCalls.asyncServerStreamingCall; -import static io.grpc.stub.ClientCalls.asyncClientStreamingCall; -import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall; -import static io.grpc.stub.ClientCalls.blockingUnaryCall; -import static io.grpc.stub.ClientCalls.blockingServerStreamingCall; -import static io.grpc.stub.ClientCalls.futureUnaryCall; -import static io.grpc.MethodDescriptor.generateFullMethodName; -import static io.grpc.stub.ServerCalls.asyncUnaryCall; -import static io.grpc.stub.ServerCalls.asyncServerStreamingCall; -import static io.grpc.stub.ServerCalls.asyncClientStreamingCall; -import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall; -import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; -import static io.grpc.stub.ServerCalls.asyncUnimplementedStreamingCall; - -/** - * 
- * RPC service for transcribing voicemails.
- *
- */ -@javax.annotation.Generated( - value = "by gRPC proto compiler (version 1.0.3)", - comments = "Source: voicemail_transcription.proto") -public class VoicemailTranscriptionServiceGrpc { - - private VoicemailTranscriptionServiceGrpc() {} - - public static final String SERVICE_NAME = "google.internal.communications.voicemailtranscription.v1.VoicemailTranscriptionService"; - - // Static method descriptors that strictly reflect the proto. - @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - public static final io.grpc.MethodDescriptor METHOD_TRANSCRIBE_VOICEMAIL = - io.grpc.MethodDescriptor.create( - io.grpc.MethodDescriptor.MethodType.UNARY, - generateFullMethodName( - "google.internal.communications.voicemailtranscription.v1.VoicemailTranscriptionService", "TranscribeVoicemail"), - io.grpc.protobuf.lite.ProtoLiteUtils.marshaller(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest.getDefaultInstance()), - io.grpc.protobuf.lite.ProtoLiteUtils.marshaller(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailResponse.getDefaultInstance())); - - /** - * Creates a new async stub that supports all call types for the service - */ - public static VoicemailTranscriptionServiceStub newStub(io.grpc.Channel channel) { - return new VoicemailTranscriptionServiceStub(channel); - } - - /** - * Creates a new blocking-style stub that supports unary and streaming output calls on the service - */ - public static VoicemailTranscriptionServiceBlockingStub newBlockingStub( - io.grpc.Channel channel) { - return new VoicemailTranscriptionServiceBlockingStub(channel); - } - - /** - * Creates a new ListenableFuture-style stub that supports unary and streaming output calls on the service - */ - public static VoicemailTranscriptionServiceFutureStub newFutureStub( - io.grpc.Channel channel) { - return new VoicemailTranscriptionServiceFutureStub(channel); - } - - /** - * 
-   * RPC service for transcribing voicemails.
-   *
- */ - public static abstract class VoicemailTranscriptionServiceImplBase implements io.grpc.BindableService { - - /** - * 
-     * Returns a transcript of the given voicemail.
-     *
- */ - public void transcribeVoicemail(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest request, - io.grpc.stub.StreamObserver responseObserver) { - asyncUnimplementedUnaryCall(METHOD_TRANSCRIBE_VOICEMAIL, responseObserver); - } - - @java.lang.Override public io.grpc.ServerServiceDefinition bindService() { - return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) - .addMethod( - METHOD_TRANSCRIBE_VOICEMAIL, - asyncUnaryCall( - new MethodHandlers< - com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest, - com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailResponse>( - this, METHODID_TRANSCRIBE_VOICEMAIL))) - .build(); - } - } - - /** - * 
-   * RPC service for transcribing voicemails.
-   *
- */ - public static final class VoicemailTranscriptionServiceStub extends io.grpc.stub.AbstractStub { - private VoicemailTranscriptionServiceStub(io.grpc.Channel channel) { - super(channel); - } - - private VoicemailTranscriptionServiceStub(io.grpc.Channel channel, - io.grpc.CallOptions callOptions) { - super(channel, callOptions); - } - - @java.lang.Override - protected VoicemailTranscriptionServiceStub build(io.grpc.Channel channel, - io.grpc.CallOptions callOptions) { - return new VoicemailTranscriptionServiceStub(channel, callOptions); - } - - /** - * 
-     * Returns a transcript of the given voicemail.
-     *
- */ - public void transcribeVoicemail(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest request, - io.grpc.stub.StreamObserver responseObserver) { - asyncUnaryCall( - getChannel().newCall(METHOD_TRANSCRIBE_VOICEMAIL, getCallOptions()), request, responseObserver); - } - } - - /** - * 
-   * RPC service for transcribing voicemails.
-   *
- */ - public static final class VoicemailTranscriptionServiceBlockingStub extends io.grpc.stub.AbstractStub { - private VoicemailTranscriptionServiceBlockingStub(io.grpc.Channel channel) { - super(channel); - } - - private VoicemailTranscriptionServiceBlockingStub(io.grpc.Channel channel, - io.grpc.CallOptions callOptions) { - super(channel, callOptions); - } - - @java.lang.Override - protected VoicemailTranscriptionServiceBlockingStub build(io.grpc.Channel channel, - io.grpc.CallOptions callOptions) { - return new VoicemailTranscriptionServiceBlockingStub(channel, callOptions); - } - - /** - * 
-     * Returns a transcript of the given voicemail.
-     *
- */ - public com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailResponse transcribeVoicemail(com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest request) { - return blockingUnaryCall( - getChannel(), METHOD_TRANSCRIBE_VOICEMAIL, getCallOptions(), request); - } - } - - /** - * 
-   * RPC service for transcribing voicemails.
-   *
- */ - public static final class VoicemailTranscriptionServiceFutureStub extends io.grpc.stub.AbstractStub { - private VoicemailTranscriptionServiceFutureStub(io.grpc.Channel channel) { - super(channel); - } - - private VoicemailTranscriptionServiceFutureStub(io.grpc.Channel channel, - io.grpc.CallOptions callOptions) { - super(channel, callOptions); - } - - @java.lang.Override - protected VoicemailTranscriptionServiceFutureStub build(io.grpc.Channel channel, - io.grpc.CallOptions callOptions) { - return new VoicemailTranscriptionServiceFutureStub(channel, callOptions); - } - - /** - * 
-     * Returns a transcript of the given voicemail.
-     *
- */ - public com.google.common.util.concurrent.ListenableFuture transcribeVoicemail( - com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest request) { - return futureUnaryCall( - getChannel().newCall(METHOD_TRANSCRIBE_VOICEMAIL, getCallOptions()), request); - } - } - - private static final int METHODID_TRANSCRIBE_VOICEMAIL = 0; - - private static class MethodHandlers implements - io.grpc.stub.ServerCalls.UnaryMethod, - io.grpc.stub.ServerCalls.ServerStreamingMethod, - io.grpc.stub.ServerCalls.ClientStreamingMethod, - io.grpc.stub.ServerCalls.BidiStreamingMethod { - private final VoicemailTranscriptionServiceImplBase serviceImpl; - private final int methodId; - - public MethodHandlers(VoicemailTranscriptionServiceImplBase serviceImpl, int methodId) { - this.serviceImpl = serviceImpl; - this.methodId = methodId; - } - - @java.lang.Override - @java.lang.SuppressWarnings("unchecked") - public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { - switch (methodId) { - case METHODID_TRANSCRIBE_VOICEMAIL: - serviceImpl.transcribeVoicemail((com.google.internal.communications.voicemailtranscription.v1.TranscribeVoicemailRequest) request, - (io.grpc.stub.StreamObserver) responseObserver); - break; - default: - throw new AssertionError(); - } - } - - @java.lang.Override - @java.lang.SuppressWarnings("unchecked") - public io.grpc.stub.StreamObserver invoke( - io.grpc.stub.StreamObserver responseObserver) { - switch (methodId) { - default: - throw new AssertionError(); - } - } - } - - public static io.grpc.ServiceDescriptor getServiceDescriptor() { - return new io.grpc.ServiceDescriptor(SERVICE_NAME, - METHOD_TRANSCRIBE_VOICEMAIL); - } - -} -- cgit v1.2.3