Move mojo java bindings to mojo/public

R=cmasone@chromium.org,viettrungluu@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284701 0039d316-1c4b-4281-b951-d872f2087c98

build/android/lint/suppressions.xml

@@ -25,8 +25,7 @@ Still reading?
     <ignore path="AndroidManifest.xml"/>
   </issue>
   <issue id="Assert">
-    <ignore regexp="mojo/public/java/src/.*"/>
-    <ignore regexp="mojo/bindings/java/src/.*"/>
+    <ignore regexp="mojo/public/java/.*"/>
   </issue>
   <issue id="CommitPrefEdits">
     <ignore path="third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/ticl/android2/channel/AndroidChannelPreferences.java"/>

mojo/mojo.gyp

@@ -792,17 +792,6 @@
   'conditions': [
     ['OS=="android"', {
       'targets': [
-        {
-          'target_name': 'mojo_bindings_java',
-          'type': 'none',
-          'variables': {
-            'java_in_dir': 'bindings/java',
-          },
-          'dependencies': [
-            'mojo_public_java',
-          ],
-          'includes': [ '../build/java.gypi' ],
-        },
         {
           'target_name': 'mojo_jni_headers',
           'type': 'none',

mojo/mojo_public.gypi

@@ -205,14 +205,26 @@
     ['OS == "android"', {
       'targets': [
         {
-          # GN version: //mojo/public/java
+          # GN version: //mojo/public/java_system
           'target_name': 'mojo_public_java',
           'type': 'none',
           'variables': {
-            'java_in_dir': 'public/java',
+            'java_in_dir': 'public/java/system',
           },
           'includes': [ '../build/java.gypi' ],
         },
+        {
+          # GN version: //mojo/public/java_bindings
+          'target_name': 'mojo_bindings_java',
+          'type': 'none',
+          'variables': {
+            'java_in_dir': 'public/java/bindings',
+          },
+          'dependencies': [
+            'mojo_public_java',
+          ],
+          'includes': [ '../build/java.gypi' ],
+        },
       ],
     }],
   ],

mojo/public/BUILD.gn

@@ -16,7 +16,8 @@ group("public") {
 
   if (is_android) {
     deps += [
-      "//mojo/public/java",
+      "//mojo/public/java:system",
+      "//mojo/public/java:bindings",
     ]
   }
 }

mojo/public/java/BUILD.gn

@@ -4,19 +4,47 @@
 
 import("//build/config/android/rules.gni")
  
-android_library("java") {
+android_library("system") {
   java_files = [
-    "src/org/chromium/mojo/system/AsyncWaiter.java",
-    "src/org/chromium/mojo/system/Core.java",
-    "src/org/chromium/mojo/system/DataPipe.java",
-    "src/org/chromium/mojo/system/Flags.java",
-    "src/org/chromium/mojo/system/Handle.java",
-    "src/org/chromium/mojo/system/InvalidHandle.java",
-    "src/org/chromium/mojo/system/MessagePipeHandle.java",
-    "src/org/chromium/mojo/system/MojoException.java",
-    "src/org/chromium/mojo/system/MojoResult.java",
-    "src/org/chromium/mojo/system/Pair.java",
-    "src/org/chromium/mojo/system/SharedBufferHandle.java",
-    "src/org/chromium/mojo/system/UntypedHandle.java",
+    "system/src/org/chromium/mojo/system/AsyncWaiter.java",
+    "system/src/org/chromium/mojo/system/Core.java",
+    "system/src/org/chromium/mojo/system/DataPipe.java",
+    "system/src/org/chromium/mojo/system/Flags.java",
+    "system/src/org/chromium/mojo/system/Handle.java",
+    "system/src/org/chromium/mojo/system/InvalidHandle.java",
+    "system/src/org/chromium/mojo/system/MessagePipeHandle.java",
+    "system/src/org/chromium/mojo/system/MojoException.java",
+    "system/src/org/chromium/mojo/system/MojoResult.java",
+    "system/src/org/chromium/mojo/system/Pair.java",
+    "system/src/org/chromium/mojo/system/SharedBufferHandle.java",
+    "system/src/org/chromium/mojo/system/UntypedHandle.java",
   ]
 }
+
+android_library("bindings") {
+  java_files = [
+    "bindings/src/org/chromium/mojo/bindings/InterfaceRequest.java",
+    "bindings/src/org/chromium/mojo/bindings/Interface.java",
+    "bindings/src/org/chromium/mojo/bindings/Struct.java",
+    "bindings/src/org/chromium/mojo/bindings/ConnectionErrorHandler.java",
+    "bindings/src/org/chromium/mojo/bindings/DeserializationException.java",
+    "bindings/src/org/chromium/mojo/bindings/Connector.java",
+    "bindings/src/org/chromium/mojo/bindings/MessageHeader.java",
+    "bindings/src/org/chromium/mojo/bindings/MessageReceiverWithResponder.java",
+    "bindings/src/org/chromium/mojo/bindings/BindingsHelper.java",
+    "bindings/src/org/chromium/mojo/bindings/Router.java",
+    "bindings/src/org/chromium/mojo/bindings/Decoder.java",
+    "bindings/src/org/chromium/mojo/bindings/Message.java",
+    "bindings/src/org/chromium/mojo/bindings/RouterImpl.java",
+    "bindings/src/org/chromium/mojo/bindings/Encoder.java",
+    "bindings/src/org/chromium/mojo/bindings/InterfaceWithClient.java",
+    "bindings/src/org/chromium/mojo/bindings/ExecutorFactory.java",
+    "bindings/src/org/chromium/mojo/bindings/AutoCloseableRouter.java",
+    "bindings/src/org/chromium/mojo/bindings/MessageWithHeader.java",
+    "bindings/src/org/chromium/mojo/bindings/Callbacks.java",
+    "bindings/src/org/chromium/mojo/bindings/HandleOwner.java",
+    "bindings/src/org/chromium/mojo/bindings/MessageReceiver.java",
+  ]
+
+  deps = [ ":system" ]
+}