use proto build targets from google3, not open source to avoid "duplicate symbol" error.

PiperOrigin-RevId: 837293249
Change-Id: I6b9ea581783c98ed28d6c1ad74c53fc9af15ed2a

Author: ludoch

api/src/main/java/com/google/appengine/api/datastore/AsyncDatastoreServiceImpl.java

@@ -27,7 +27,7 @@
 import com.google.appengine.api.datastore.Query.FilterOperator;
 import com.google.appengine.api.utils.FutureWrapper;
 import com.google.apphosting.api.ApiProxy.ApiConfig;
-import com.google.apphosting.base.protos.api.ApiBasePb.StringProto;
+import com.google.apphosting.api.proto2api.ApiBasePb.StringProto;
 import com.google.apphosting.datastore.DatastoreV3Pb;
 import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsRequest;
 import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsResponse;

api_dev/src/main/java/com/google/appengine/api/blobstore/dev/LocalBlobstoreService.java

@@ -33,7 +33,7 @@
 import com.google.appengine.tools.development.LocalRpcService;
 import com.google.appengine.tools.development.LocalServiceContext;
 import com.google.apphosting.api.ApiProxy;
-import com.google.apphosting.base.protos.api.ApiBasePb.VoidProto;
+import com.google.apphosting.api.proto2api.ApiBasePb.VoidProto;
 import com.google.apphosting.utils.config.GenerationDirectory;
 import com.google.auto.service.AutoService;
 import com.google.common.io.ByteStreams;

api_dev/src/main/java/com/google/appengine/api/datastore/dev/ApiProxyDatastoreV3.java

@@ -18,9 +18,6 @@
 
 import com.google.appengine.api.taskqueue.TaskQueuePb.TaskQueueBulkAddRequest;
 import com.google.apphosting.api.ApiProxy;
-import com.google.apphosting.base.protos.api.ApiBasePb.Integer64Proto;
-import com.google.apphosting.base.protos.api.ApiBasePb.StringProto;
-import com.google.apphosting.base.protos.api.ApiBasePb.VoidProto;
 import com.google.apphosting.datastore.DatastoreV3Pb;
 import com.google.apphosting.datastore.DatastoreV3Pb.CompositeIndices;
 import com.google.apphosting.datastore.DatastoreV3Pb.Cursor;
@@ -29,6 +26,9 @@
 import com.google.apphosting.datastore.DatastoreV3Pb.PutRequest;
 import com.google.apphosting.datastore.DatastoreV3Pb.Query;
 import com.google.apphosting.datastore.DatastoreV3Pb.Transaction;
+import com.google.apphosting.api.proto2api.ApiBasePb.Integer64Proto;
+import com.google.apphosting.api.proto2api.ApiBasePb.StringProto;
+import com.google.apphosting.api.proto2api.ApiBasePb.VoidProto;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.MessageLite;
 import com.google.protobuf.Parser;

api_dev/src/main/java/com/google/appengine/api/datastore/dev/DatastoreV3Impl.java

@@ -18,7 +18,7 @@
 
 import com.google.appengine.api.taskqueue.TaskQueuePb.TaskQueueBulkAddRequest;
 import com.google.appengine.tools.development.LocalRpcService.Status;
-import com.google.apphosting.base.protos.api.ApiBasePb.StringProto;
+import com.google.apphosting.api.proto2api.ApiBasePb.StringProto;
 import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsRequest;
 import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsResponse;
 import com.google.apphosting.datastore.DatastoreV3Pb.BeginTransactionRequest;

api_dev/src/main/java/com/google/appengine/api/datastore/dev/LocalDatastoreService.java

@@ -42,9 +42,9 @@
 import com.google.appengine.tools.development.LocalRpcService.Status;
 import com.google.appengine.tools.development.LocalServiceContext;
 import com.google.apphosting.api.ApiProxy.ApplicationException;
-import com.google.apphosting.base.protos.api.ApiBasePb.Integer64Proto;
-import com.google.apphosting.base.protos.api.ApiBasePb.StringProto;
-import com.google.apphosting.base.protos.api.ApiBasePb.VoidProto;
+import com.google.apphosting.api.proto2api.ApiBasePb.Integer64Proto;
+import com.google.apphosting.api.proto2api.ApiBasePb.StringProto;
+import com.google.apphosting.api.proto2api.ApiBasePb.VoidProto;
 import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsRequest;
 import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsResponse;
 import com.google.apphosting.datastore.DatastoreV3Pb.BeginTransactionRequest;

api_dev/src/main/java/com/google/appengine/api/datastore/dev/LocalDatastoreV3Service.java

@@ -21,9 +21,9 @@
 import com.google.appengine.tools.development.LatencyPercentiles;
 import com.google.appengine.tools.development.LocalRpcService;
 import com.google.apphosting.api.ApiProxy;
-import com.google.apphosting.base.protos.api.ApiBasePb.Integer64Proto;
-import com.google.apphosting.base.protos.api.ApiBasePb.StringProto;
-import com.google.apphosting.base.protos.api.ApiBasePb.VoidProto;
+import com.google.apphosting.api.proto2api.ApiBasePb.Integer64Proto;
+import com.google.apphosting.api.proto2api.ApiBasePb.StringProto;
+import com.google.apphosting.api.proto2api.ApiBasePb.VoidProto;
 import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsRequest;
 import com.google.apphosting.datastore.DatastoreV3Pb.AllocateIdsResponse;
 import com.google.apphosting.datastore.DatastoreV3Pb.BeginTransactionRequest;

api_dev/src/main/java/com/google/appengine/api/mail/dev/LocalMailService.java

@@ -25,7 +25,7 @@
 import com.google.appengine.tools.development.LocalRpcService;
 import com.google.appengine.tools.development.LocalServiceContext;
 import com.google.apphosting.api.ApiProxy;
-import com.google.apphosting.base.protos.api.ApiBasePb;
+import com.google.apphosting.api.proto2api.ApiBasePb;
 import com.google.auto.service.AutoService;
 import com.google.common.base.Ascii;
 import com.google.common.collect.ImmutableSet;

protobuf/api/api_base.proto

@@ -23,7 +23,7 @@ syntax = "proto2";
 
 package java.apphosting.base;
 
-option java_package = "com.google.apphosting.base.protos.api";
+option java_package = "com.google.apphosting.api.proto2api";
 option java_outer_classname = "ApiBasePb";
 
 message StringProto {

runtime/impl/src/test/java/com/google/apphosting/runtime/ApiProxyImplTest.java

@@ -50,10 +50,10 @@
 import com.google.apphosting.base.protos.TraceEvents.TraceEventsProto;
 import com.google.apphosting.base.protos.TraceId;
 import com.google.apphosting.base.protos.TracePb.TraceContextProto;
-import com.google.apphosting.base.protos.api.ApiBasePb.DoubleProto;
-import com.google.apphosting.base.protos.api.ApiBasePb.Integer32Proto;
-import com.google.apphosting.base.protos.api.ApiBasePb.StringProto;
-import com.google.apphosting.base.protos.api.ApiBasePb.VoidProto;
+import com.google.apphosting.api.proto2api.ApiBasePb.DoubleProto;
+import com.google.apphosting.api.proto2api.ApiBasePb.Integer32Proto;
+import com.google.apphosting.api.proto2api.ApiBasePb.StringProto;
+import com.google.apphosting.api.proto2api.ApiBasePb.VoidProto;
 import com.google.apphosting.runtime.anyrpc.APIHostClientInterface;
 import com.google.apphosting.runtime.anyrpc.AnyRpcCallback;
 import com.google.apphosting.runtime.anyrpc.AnyRpcClientContext;