From e3f2241bc1235a54254f165db374f6013e037233 Mon Sep 17 00:00:00 2001
From: nyquist <nyquist@chromium.org>
Date: Tue, 2 Sep 2014 17:08:20 -0700
Subject: Revert of Add support for Java nano protocol buffers for Android.
 (patchset #4 id:60001 of https://codereview.chromium.org/511283003/)

Reason for revert:
Breaks some workflows and also should get new quota.

Original issue's description:
> Add support for Java nano protocol buffers for Android.
>
> This CL adds a new dependency on the protocol buffer compiler
> from the android source tree, since this compiler supports
> generating Java files using the nano runtime.
>
> The initial version of this dependency is 2.2.0a, but checked
> out as what the Android 4.4.4 Release 2.0.1 tag points to.
>
> This CL adds a new protoc binary (for compiling protos) that supports
> this, and also adds a Java library with the runtime.
>
> To simplify use of this, it also updates build/protoc_java.gypi to
> support generating nano protos by specifying an optional
> proto_runtime argument. The argument defaults to 'lite' which does
> the same thing as before this change, and setting it to 'nano'
> generates the new style Java files.
>
> The plan is to quickly deprecate the 'lite' runtime for Java, since
> it is too big and uses too many methods.
>
> BUG=377891
>
> Committed: https://chromium.googlesource.com/chromium/src/+/d8ae0a79834531e41912de44b9e212ffa7eb2785

TBR=cjhopman@chromium.org,darin@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=377891

Review URL: https://codereview.chromium.org/534703004

Cr-Commit-Position: refs/heads/master@{#293028}
---
 build/protoc_java.gypi | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

(limited to 'build/protoc_java.gypi')

diff --git a/build/protoc_java.gypi b/build/protoc_java.gypi
index 853760c..a99ec6a 100644
--- a/build/protoc_java.gypi
+++ b/build/protoc_java.gypi
@@ -23,9 +23,6 @@
 # The 'proto_in_dir' variable must be the relative path to the
 # directory containing the .proto files.  If left out, it defaults to '.'.
 #
-# You can optionally set a variable 'proto_runtime' to either 'lite' or 'nano'.
-# The default runtime is 'lite'.
-#
 # The 'output_java_files' variable specifies a list of output files that will
 # be generated. It is based on the package and java_outer_classname fields in
 # the proto. All the values must be prefixed with >(java_out_dir), since that
@@ -41,7 +38,7 @@
 
 {
   'variables': {
-    'proto_runtime%': 'lite',
+    'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
     'java_out_dir': '<(PRODUCT_DIR)/java_proto/<(_target_name)/src',
     'proto_in_dir%': '.',
     'stamp_file': '<(java_out_dir).stamp',
@@ -71,32 +68,15 @@
         '<(protoc)',
         '<(proto_in_dir)',
         '<(java_out_dir)',
-        '<(proto_runtime)',
         '<(stamp_file)',
         '<@(_sources)',
       ],
-      'message': 'Generating <(proto_runtime) Java code from protobuf files in <(proto_in_dir)',
+      'message': 'Generating Java code from <(proto_in_dir)',
     },
   ],
-  'conditions': [
-    ['proto_runtime=="lite"', {
-      'variables': {
-        'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)protoc<(EXECUTABLE_SUFFIX)',
-      },
-      'dependencies': [
-        '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
-        '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite_javalib',
-      ],
-    }],
-    ['proto_runtime=="nano"', {
-      'variables': {
-        'protoc': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)android_protoc<(EXECUTABLE_SUFFIX)',
-      },
-      'dependencies': [
-        '<(DEPTH)/third_party/android_protobuf/android_protobuf.gyp:android_protoc#host',
-        '<(DEPTH)/third_party/android_protobuf/android_protobuf.gyp:protobuf_nano_javalib',
-      ],
-    }],
+  'dependencies': [
+    '<(DEPTH)/third_party/protobuf/protobuf.gyp:protoc#host',
+    '<(DEPTH)/third_party/protobuf/protobuf.gyp:protobuf_lite_javalib',
   ],
   'includes': [ 'java.gypi' ],
 }
-- 
cgit v1.1