Android: Remove apk modules for Android Studio

build/android/gradle/generate_gradle.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """Generates an Android Studio project from a GN target."""
 
 import argparse
 import codecs
 import glob
@@ skipping 540 matching lines @@
 
   See //docs/android_studio.md for more details."""
   variables = _GenerateBaseVars(generator, build_vars, source_properties)
   target_type = 'android_apk'
   variables['target_name'] = _MODULE_ALL
   variables['template_type'] = target_type
   java_dirs = sorted(generator.processed_java_dirs)
   prebuilts = sorted(generator.processed_prebuilts)
   def Relativize(paths):
     return _RebasePath(paths, os.path.join(gradle_output_dir, _MODULE_ALL))
+  def IsTestDir(path):

[estevenson, 2017/04/24 15:51:11]

nit: probably doesn't need to be a nested function since it doesn't use the
outer context.

[Peter Wen, 2017/04/24 17:40:14]

Done.

+    return 'javatests/' in path or 'junit/' in path or 'test/' in path
+  main_java_dirs = [d for d in java_dirs if not IsTestDir(d)]
+  test_java_dirs = [d for d in java_dirs if IsTestDir(d)]
   variables['main'] = {
       'android_manifest': Relativize(_DEFAULT_ANDROID_MANIFEST_PATH),
-      'java_dirs': Relativize(java_dirs),
+      'java_dirs': Relativize(main_java_dirs),
       'prebuilts': Relativize(prebuilts),
       'java_excludes': ['**/*.java'],
   }
+  variables['android_test'] = {
+      'java_dirs': Relativize(test_java_dirs),
+      'java_excludes': ['**/*.java'],
+  }
   data = jinja_processor.Render(
       _TemplatePath(target_type.split('_')[0]), variables)
   _WriteFile(
       os.path.join(gradle_output_dir, _MODULE_ALL, _GRADLE_BUILD_FILE), data)
 
 
 def _GenerateRootGradle(jinja_processor):
   """Returns the data for the root project's build.gradle."""
   return jinja_processor.Render(_TemplatePath('root'))
 
@@ skipping 215 matching lines @@
     _ExtractZips(generator.project_dir, zip_tuples)
 
   logging.warning('Project created! (%d subprojects)', len(project_entries))
   logging.warning('Generated projects work with Android Studio 2.3')
   logging.warning('For more tips: https://chromium.googlesource.com/chromium'
                   '/src.git/+/master/docs/android_studio.md')
 
 
 if __name__ == '__main__':
   main()