Skip to content

Commit

Permalink
Fix NoneType error when building deps.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 673151907
  • Loading branch information
Googler authored and copybara-github committed Sep 11, 2024
1 parent e7712a6 commit 8767f9b
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions aspect/build_dependencies.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,12 @@ def _collect_own_java_artifacts(
add_base_idl_jar = True

# An AIDL base jar needed for resolving base classes for aidl generated stubs.
if add_base_idl_jar and hasattr(rule.attr, "_android_sdk") and hasattr(android_common, "AndroidSdkInfo"):
android_sdk_info = getattr(rule.attr, "_android_sdk")[android_common.AndroidSdkInfo]
own_jar_depsets.append(android_sdk_info.aidl_lib.files)
if add_base_idl_jar:
if hasattr(rule.attr, "_aidl_lib"):
own_jar_depsets.append(rule.attr._aidl_lib.files)
elif hasattr(rule.attr, "_android_sdk") and hasattr(android_common, "AndroidSdkInfo"):
android_sdk_info = getattr(rule.attr, "_android_sdk")[android_common.AndroidSdkInfo]
own_jar_depsets.append(android_sdk_info.aidl_lib.files)

# Add generated java_outputs (e.g. from annotation processing)
generated_class_jars = []
Expand Down

0 comments on commit 8767f9b

Please sign in to comment.