Commit fca310d9 authored by Aiden Benner's avatar Aiden Benner Committed by Commit Bot

Fix gradle generation with annotation processors

Change-Id: Ie9594e5ee6b01ff2f940119dcf77f0ba7503693b
Reviewed-on: https://chromium-review.googlesource.com/1239420Reviewed-by: default avataragrieve <agrieve@chromium.org>
Commit-Queue: Aiden Benner <abenner@google.com>
Cr-Commit-Position: refs/heads/master@{#593705}
parent 4e82faa2
...@@ -242,7 +242,12 @@ class _ProjectEntry(object): ...@@ -242,7 +242,12 @@ class _ProjectEntry(object):
def IsValid(self): def IsValid(self):
return self.GetType() in ( return self.GetType() in (
'android_apk', 'java_library', 'java_binary', 'junit_binary') 'android_apk',
'java_library',
"java_annotation_processor",
'java_binary',
'junit_binary',
)
def ResZips(self): def ResZips(self):
return self.DepsInfo().get('owned_resources_zips', []) return self.DepsInfo().get('owned_resources_zips', [])
...@@ -576,8 +581,10 @@ def _GenerateGradleFile(entry, generator, build_vars, source_properties, ...@@ -576,8 +581,10 @@ def _GenerateGradleFile(entry, generator, build_vars, source_properties,
if deps_info['type'] == 'android_apk': if deps_info['type'] == 'android_apk':
target_type = 'android_apk' target_type = 'android_apk'
elif deps_info['type'] == 'java_library': elif deps_info['type'] in ('java_library', 'java_annotation_processor'):
if deps_info['is_prebuilt'] or deps_info['gradle_treat_as_prebuilt']: is_prebuilt = deps_info.get('is_prebuilt', False)
gradle_treat_as_prebuilt = deps_info.get('gradle_treat_as_prebuilt', False)
if is_prebuilt or gradle_treat_as_prebuilt:
return None return None
elif deps_info['requires_android']: elif deps_info['requires_android']:
target_type = 'android_library' target_type = 'android_library'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment