diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-06-11 23:16:04 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-06-11 23:16:04 +0000 |
| commit | 173711e7f43116c7d3ced1927f28b364b9d9d622 (patch) | |
| tree | 910b73654341f30913b220866c1d4c70bbd883a0 | |
| parent | 9c08c9b217e59eb0ff95398a8c39e6e1a214f6be (diff) | |
| parent | 3bcffd12cf539d16b0a68c0f0f98042554453fa9 (diff) | |
| download | modules-utils-173711e7f43116c7d3ced1927f28b364b9d9d622.tar.gz | |
Snap for 11955768 from 3bcffd12cf539d16b0a68c0f0f98042554453fa9 to sdk-release
Change-Id: I753af89deb8111656c90434665c86dd0d4133a8c
| -rw-r--r-- | java/com/android/modules/utils/testing/Android.bp | 6 |
1 files changed, 1 insertions, 5 deletions
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", |