From 3bcffd12cf539d16b0a68c0f0f98042554453fa9 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Wed, 5 Jun 2024 16:29:32 +0000 Subject: Added compile_multilib to modules-utils-extended-mockito-rule-defaults That directive was missing when the defaults was created. Test: not really, as currently no project is using it. Bug: 338434399 Bug: 345219434 Change-Id: Id023e2d4d94df71c8a49f5a6ee452bc24e93a042 --- java/com/android/modules/utils/testing/Android.bp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'java/com/android/modules/utils/testing') diff --git a/java/com/android/modules/utils/testing/Android.bp b/java/com/android/modules/utils/testing/Android.bp index 6e6926f..f6574b4 100644 --- a/java/com/android/modules/utils/testing/Android.bp +++ b/java/com/android/modules/utils/testing/Android.bp @@ -84,11 +84,6 @@ java_library { ], sdk_version: "module_current", min_sdk_version: "29", - // compile_multilib: "both", - // TODO(b/338434399): figure out why adding compile_multib causes a failure: - // In file included from build/make/core/soong_java_prebuilt.mk:38: - // build/make/core/base_rules.mk:300: error: frameworks/libs/modules-utils/java/com/android/modules/utils/testing: - // MODULE.TARGET.JAVA_LIBRARIES.modules-utils-extended-mockito-rule already defined by frameworks/libs/modules-utils/java/com/android/modules/utils/testing. visibility: ["//visibility:public"], lint: { baseline_filename: "lint-baseline.xml", @@ -104,6 +99,7 @@ java_library { java_defaults { name: "modules-utils-extended-mockito-rule-defaults", static_libs: ["modules-utils-extended-mockito-rule"], + compile_multilib: "both", jni_libs: [ "libdexmakerjvmtiagent", "libstaticjvmtiagent", -- cgit v1.2.3