diff options
| author |  Googler <noreply@google.com> | 2016-10-06 01:57:39 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-10-06 07:42:11 +0000 |
| commit | 21650480610ec26f529459d38f2518c1fefe1b5c (patch) | |
| tree | 8a7100e085cc8fedc193d047f507287345b711cf | |
| parent | 0d7ceb43bd6ada98e5aab722d8c66e4d157fef01 (diff) | |
Fix broken IDE skylark aspect.
The aspect tries to access an attribute on the idl
provider that doesn't exist yet.
--
MOS_MIGRATED_REVID=135310683
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl b/src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl index df2a3392ba..4d2cfa8ff1 100644 --- a/src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl +++ b/src/test/java/com/google/devtools/build/lib/ideinfo/intellij_info.bzl @@ -390,20 +390,21 @@ def build_android_rule_ide_info(target, ctx, legacy_resource_label): if not hasattr(target, "android"): return (None, set()) + android = target.android android_rule_ide_info = struct_omit_none( - java_package = target.android.java_package, - idl_import_root = target.android.idl.import_root, - manifest = artifact_location(target.android.manifest), - apk = artifact_location(target.android.apk), - dependency_apk = [artifact_location(apk) for apk in target.android.apks_under_test], - has_idl_sources = target.android.idl.output != None, - idl_jar = library_artifact(target.android.idl.output), - generate_resource_class = target.android.defines_resources, - resources = all_unique_source_directories(target.android.resources), - resource_jar = library_artifact(target.android.resource_jar), + java_package = android.java_package, + idl_import_root = android.idl.import_root if hasattr(android.idl, "import_root") else None, + manifest = artifact_location(android.manifest), + apk = artifact_location(android.apk), + dependency_apk = [artifact_location(apk) for apk in android.apks_under_test], + has_idl_sources = android.idl.output != None, + idl_jar = library_artifact(android.idl.output), + generate_resource_class = android.defines_resources, + resources = all_unique_source_directories(android.resources), + resource_jar = library_artifact(android.resource_jar), legacy_resources = legacy_resource_label, ) - ide_resolve_files = set(jars_from_output(target.android.idl.output)) + ide_resolve_files = set(jars_from_output(android.idl.output)) return (android_rule_ide_info, ide_resolve_files) def build_test_info(target, ctx): |