Add support for .so files in generate_gradle.py.

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 logging
@@ skipping 16 matching lines @@
 from util import build_utils
 
 
 _DEFAULT_ANDROID_MANIFEST_PATH = os.path.join(
     host_paths.DIR_SOURCE_ROOT, 'build', 'android', 'AndroidManifest.xml')
 _JINJA_TEMPLATE_PATH = os.path.join(
     os.path.dirname(__file__), 'build.gradle.jinja')
 
 _JAVA_SUBDIR = 'symlinked-java'
 _SRCJARS_SUBDIR = 'extracted-srcjars'
+_JNI_LIBS_SUBDIR = 'symlinked-libs'
+_ARMEABI_SUBDIR = 'armeabi'
 
 _DEFAULT_TARGETS = [
     # TODO(agrieve): Requires alternate android.jar to compile.
     # '//android_webview:system_webview_apk',
     '//android_webview/test:android_webview_apk',
     '//android_webview/test:android_webview_test_apk',
     '//base:base_junit_tests',
     '//chrome/android:chrome_junit_tests',
     '//chrome/android:chrome_public_apk',
     '//chrome/android:chrome_public_test_apk',
@@ skipping 183 matching lines @@
 
     if unwanted_java_files:
       logging.debug('Target requires .java symlinks: %s', entry_output_dir)
       _CreateSymlinkTree(entry_output_dir, symlink_dir, java_files, java_dirs)
       java_dirs = [symlink_dir]
 
     if missing_java_files:
       logging.warning('Some java files were not found: %s', missing_java_files)
 
   return java_dirs
 

[agrieve, 2017/01/11 20:10:09]

nit: py style is for 2 blank lines between top-level functions

+def _CreateJniLibsDir(output_dir, entry_output_dir, so_files):
+  """Creates directory with symlinked .so files if necessary.
+
+  Returns list of JNI libs directories."""
+
+  if so_files:
+    symlink_dir = os.path.join(entry_output_dir, _JNI_LIBS_SUBDIR)
+    shutil.rmtree(symlink_dir, True)
+    abi_dir = os.path.join(symlink_dir, _ARMEABI_SUBDIR)
+    if not os.path.exists(abi_dir):
+      os.makedirs(abi_dir)
+    for so_file in so_files:
+      target_path = os.path.join(output_dir, so_file)
+      symlinked_path = os.path.join(abi_dir, so_file)
+      relpath = os.path.relpath(target_path, abi_dir)

[agrieve, 2017/01/11 20:10:09]

nit: Could you extract these 3 lines into helper method used also by
_CreateSymlinkTree()? Maybe call it: _CreateRelativeSymlink()

+      logging.debug('Creating symlink %s -> %s', symlinked_path, relpath)
+      os.symlink(relpath, symlinked_path)
+
+    return [symlink_dir]
+
+  return []
 
 def _GenerateLocalProperties(sdk_dir):
   """Returns the data for project.properties as a string."""
   return '\n'.join([
       '# Generated by //build/android/gradle/generate_gradle.py',
       'sdk.dir=%s' % sdk_dir,
       ''])
 
 
-def _GenerateGradleFile(build_config, build_vars, java_dirs, relativize,
-                        use_gradle_process_resources, jinja_processor):
+def _GenerateGradleFile(build_config, build_vars, java_dirs, jni_libs,
+                        relativize, use_gradle_process_resources,
+                        jinja_processor):
   """Returns the data for a project's build.gradle."""
   deps_info = build_config['deps_info']
   gradle = build_config['gradle']
 
   variables = {
       'sourceSetName': 'main',
       'depCompileName': 'compile',
   }
   if deps_info['type'] == 'android_apk':
     target_type = 'android_apk'
@@ skipping 19 matching lines @@
   variables['target_name'] = os.path.splitext(deps_info['name'])[0]
   variables['template_type'] = target_type
   variables['use_gradle_process_resources'] = use_gradle_process_resources
   variables['build_tools_version'] = (
       build_vars['android_sdk_build_tools_version'])
   variables['compile_sdk_version'] = build_vars['android_sdk_version']
   android_manifest = gradle.get('android_manifest',
                                 _DEFAULT_ANDROID_MANIFEST_PATH)
   variables['android_manifest'] = relativize(android_manifest)
   variables['java_dirs'] = relativize(java_dirs)
+  variables['jni_libs'] = relativize(jni_libs)
   # TODO(agrieve): Add an option to use interface jars and see if that speeds
   # things up at all.
   variables['prebuilts'] = relativize(gradle['dependent_prebuilt_jars'])
   deps = [_ProjectEntry.FromBuildConfigPath(p)
           for p in gradle['dependent_android_projects']]
 
   variables['android_project_deps'] = [d.ProjectName() for d in deps]
   deps = [_ProjectEntry.FromBuildConfigPath(p)
           for p in gradle['dependent_java_projects']]
   variables['java_project_deps'] = [d.ProjectName() for d in deps]
@@ skipping 136 matching lines @@
     java_sources_file = build_config['gradle'].get('java_sources_file')
     java_files = []
     if java_sources_file:
       java_sources_file = _RebasePath(java_sources_file)
       java_files = build_utils.ReadSourcesList(java_sources_file)
 
     java_dirs = _CreateJavaSourceDir(output_dir, entry_output_dir, java_files)
     if srcjars:
       java_dirs.append(os.path.join(entry_output_dir, _SRCJARS_SUBDIR))
 
-    data = _GenerateGradleFile(build_config, build_vars, java_dirs, relativize,
-                               args.use_gradle_process_resources,
+    native_part = build_config.get('native')
+    if native_part:
+      jni_libs = _CreateJniLibsDir(
+          output_dir, entry_output_dir, native_part.get('libraries'))
+    else:
+      jni_libs = []
+
+    data = _GenerateGradleFile(build_config, build_vars, java_dirs, jni_libs,
+                               relativize, args.use_gradle_process_resources,
                                jinja_processor)
     if data:
       project_entries.append(entry)
       # Build all paths references by .gradle that exist within output_dir.
       generated_inputs.extend(srcjars)
       generated_inputs.extend(p for p in java_files if not p.startswith('..'))
       generated_inputs.extend(build_config['gradle']['dependent_prebuilt_jars'])
 
       srcjar_tuples.extend(
           (s, os.path.join(entry_output_dir, _SRCJARS_SUBDIR)) for s in srcjars)
@@ skipping 18 matching lines @@
     _ExtractSrcjars(gradle_output_dir, srcjar_tuples)
 
   logging.warning('Project created! (%d subprojects)', len(project_entries))
   logging.warning('Generated projects work best with Android Studio 2.2')
   logging.warning('For more tips: https://chromium.googlesource.com/chromium'
                   '/src.git/+/master/docs/android_studio.md')
 
 
 if __name__ == '__main__':
   main()