Index: build/android/gradle/generate_gradle.py |
diff --git a/build/android/gradle/generate_gradle.py b/build/android/gradle/generate_gradle.py |
index 776cded593c0b8865b399c8df26b61190863bfce..6ff9fb11a790789dde9b97e77fd1da5492e1986e 100755 |
--- a/build/android/gradle/generate_gradle.py |
+++ b/build/android/gradle/generate_gradle.py |
@@ -558,12 +558,20 @@ def _GenerateModuleAll(gradle_output_dir, generator, build_vars, |
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
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( |