From 8767f9b3b49887db4f3c9792e5510009297e33f2 Mon Sep 17 00:00:00 2001 From: Googler Date: Tue, 10 Sep 2024 16:32:09 -0700 Subject: [PATCH] Fix NoneType error when building deps. PiperOrigin-RevId: 673151907 --- aspect/build_dependencies.bzl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/aspect/build_dependencies.bzl b/aspect/build_dependencies.bzl index f2e504f46d6..26dddab846e 100644 --- a/aspect/build_dependencies.bzl +++ b/aspect/build_dependencies.bzl @@ -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 = []