Support `public_deps` in `android_library`

build/config/android/rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 1186 matching lines @@
 
   # Declare an Android library target
   #
   # This target creates an Android library containing java code and Android
   # resources.
   #
   # Variables
   #   deps: Specifies the dependencies of this target. Java targets in this list
   #     will be added to the javac classpath. Android resources in dependencies
   #     will be used when building this library.
+  #   public_deps: Specifies the dependencies of this target that will be
+  #     exposed as part of its public API (the .class files will be available
+  #     in the output jar).
   #
   #   java_files: List of .java files included in this library.
   #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
   #     will be added to java_files and be included in this library.
   #   srcjars: List of srcjars to be included in this library, together with the
   #     ones obtained from srcjar_deps.
   #
   #   input_jars_paths: A list of paths to the jars that should be included
   #     in the classpath. These are in addition to library .jars that
   #     appear in deps.
@@ skipping 45 matching lines @@
   #   }
   template("android_library") {
     set_sources_assignment_filter([])
     assert(!defined(invoker.jar_path),
            "android_library does not support a custom jar path")
 
     if (defined(invoker.alternative_android_sdk_ijar)) {
       assert(defined(invoker.alternative_android_sdk_ijar_dep))
     }
 
-    java_library_impl(target_name) {
+    _java_library_impl_target_name = target_name
+    _needs_dist_jar = false
+
+    if (defined(invoker.public_deps)) {
+      forward_variables_from(invoker, [ "testonly" ])
+
+      _public_deps = invoker.public_deps
+      _java_library_impl_target_name = "${target_name}__java_library_impl"
+      _public_deps += [ ":${_java_library_impl_target_name}" ]
+      _needs_dist_jar = true
+
+      dist_jar(target_name) {
+        _target_dir_name = get_label_info(":$target_name", "dir")
+        output_jar_path =
+            "$root_out_dir/lib.java$_target_dir_name/${target_name}.jar"
+        deps = _public_deps
+      }
+    }
+
+    java_library_impl(_java_library_impl_target_name) {
       forward_variables_from(invoker, "*")
 
+      if (_needs_dist_jar) {
+        output_name = "${target_name}_no_public_deps"
+      }
+
       supports_android = true
       requires_android = true
 
       if (!defined(jar_excluded_patterns)) {
         jar_excluded_patterns = []
       }
       jar_excluded_patterns += [
         "*/R.class",
         "*/R\$*.class",
         "*/Manifest.class",
@@ skipping 1535 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }