Remove multilib suffixes from libraries
Libraries previously did not take the suffix property, which meant
that the suffix property in defaults modules applied to libraries
was ignored. The suffix property is being added to cc_library
modules, which incorrectly renames existing libraries that had
defaults with suffix properties. These defaults only apply to
library modules, so just remove the suffix properties.
Bug: 117607748
Test: m checkbuild
Change-Id: Iadbb7369a7e4698394f64d25fc0a11933f41c2dc
diff --git a/adbconnection/Android.bp b/adbconnection/Android.bp
index 1ab7f01..fbc8afe 100644
--- a/adbconnection/Android.bp
+++ b/adbconnection/Android.bp
@@ -40,15 +40,6 @@
"libnativehelper_header_only",
"dt_fd_forward_export",
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
required: [
"libjdwp",
"libdt_fd_forward",
diff --git a/dt_fd_forward/Android.bp b/dt_fd_forward/Android.bp
index da4ebe5..75e5c0d 100644
--- a/dt_fd_forward/Android.bp
+++ b/dt_fd_forward/Android.bp
@@ -43,14 +43,6 @@
"dt_fd_forward_export",
"art_libartbase_headers", // For strlcpy emulation.
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
}
art_cc_library {
diff --git a/tools/jvmti-agents/breakpoint-logger/Android.bp b/tools/jvmti-agents/breakpoint-logger/Android.bp
index 67b423a..57878cd 100644
--- a/tools/jvmti-agents/breakpoint-logger/Android.bp
+++ b/tools/jvmti-agents/breakpoint-logger/Android.bp
@@ -38,15 +38,6 @@
header_libs: [
"libopenjdkjvmti_headers",
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
}
art_cc_library {
diff --git a/tools/jvmti-agents/chain-agents/Android.bp b/tools/jvmti-agents/chain-agents/Android.bp
index 148082d..9d66069 100644
--- a/tools/jvmti-agents/chain-agents/Android.bp
+++ b/tools/jvmti-agents/chain-agents/Android.bp
@@ -30,15 +30,6 @@
"libnativehelper_header_only",
"jni_headers",
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
}
cc_defaults {
diff --git a/tools/jvmti-agents/dump-jvmti-state/Android.bp b/tools/jvmti-agents/dump-jvmti-state/Android.bp
index 5c78965..3a48941 100644
--- a/tools/jvmti-agents/dump-jvmti-state/Android.bp
+++ b/tools/jvmti-agents/dump-jvmti-state/Android.bp
@@ -31,15 +31,6 @@
header_libs: [
"libopenjdkjvmti_headers",
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
}
art_cc_library {
diff --git a/tools/jvmti-agents/field-counts/Android.bp b/tools/jvmti-agents/field-counts/Android.bp
index 5541e86..a91af99 100644
--- a/tools/jvmti-agents/field-counts/Android.bp
+++ b/tools/jvmti-agents/field-counts/Android.bp
@@ -28,15 +28,6 @@
"libnativehelper_header_only",
"jni_headers",
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
}
cc_defaults {
diff --git a/tools/jvmti-agents/field-null-percent/Android.bp b/tools/jvmti-agents/field-null-percent/Android.bp
index 52b4d89..4950b7f 100644
--- a/tools/jvmti-agents/field-null-percent/Android.bp
+++ b/tools/jvmti-agents/field-null-percent/Android.bp
@@ -26,15 +26,6 @@
header_libs: [
"libopenjdkjvmti_headers",
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
}
cc_defaults {
diff --git a/tools/jvmti-agents/jit-load/Android.bp b/tools/jvmti-agents/jit-load/Android.bp
index a57a408..5adf98c 100644
--- a/tools/jvmti-agents/jit-load/Android.bp
+++ b/tools/jvmti-agents/jit-load/Android.bp
@@ -40,15 +40,6 @@
header_libs: [
"libopenjdkjvmti_headers",
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
}
art_cc_library {
diff --git a/tools/jvmti-agents/list-extensions/Android.bp b/tools/jvmti-agents/list-extensions/Android.bp
index fcf883c..09ba5aa 100644
--- a/tools/jvmti-agents/list-extensions/Android.bp
+++ b/tools/jvmti-agents/list-extensions/Android.bp
@@ -31,15 +31,6 @@
header_libs: [
"libopenjdkjvmti_headers",
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
}
art_cc_library {
diff --git a/tools/jvmti-agents/simple-force-redefine/Android.bp b/tools/jvmti-agents/simple-force-redefine/Android.bp
index 7006cd6..38eb9f7 100644
--- a/tools/jvmti-agents/simple-force-redefine/Android.bp
+++ b/tools/jvmti-agents/simple-force-redefine/Android.bp
@@ -52,15 +52,6 @@
],
},
},
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
}
art_cc_library {
diff --git a/tools/jvmti-agents/ti-fast/Android.bp b/tools/jvmti-agents/ti-fast/Android.bp
index 3000656..797654b 100644
--- a/tools/jvmti-agents/ti-fast/Android.bp
+++ b/tools/jvmti-agents/ti-fast/Android.bp
@@ -28,15 +28,6 @@
"libnativehelper_header_only",
"jni_headers",
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
}
cc_defaults {
diff --git a/tools/jvmti-agents/titrace/Android.bp b/tools/jvmti-agents/titrace/Android.bp
index cceef89..21c2bf0 100644
--- a/tools/jvmti-agents/titrace/Android.bp
+++ b/tools/jvmti-agents/titrace/Android.bp
@@ -42,15 +42,6 @@
"libopenjdkjvmti_headers",
"libdexfile_all_headers", // for dex_instruction_list.h only
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
}
art_cc_library {
diff --git a/tools/jvmti-agents/wrapagentproperties/Android.bp b/tools/jvmti-agents/wrapagentproperties/Android.bp
index 8dec847..88b1e67 100644
--- a/tools/jvmti-agents/wrapagentproperties/Android.bp
+++ b/tools/jvmti-agents/wrapagentproperties/Android.bp
@@ -38,15 +38,6 @@
header_libs: [
"libopenjdkjvmti_headers",
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
}
art_cc_library {
diff --git a/tools/tracefast-plugin/Android.bp b/tools/tracefast-plugin/Android.bp
index b7ae6c6..7cdf1dc 100644
--- a/tools/tracefast-plugin/Android.bp
+++ b/tools/tracefast-plugin/Android.bp
@@ -37,15 +37,6 @@
header_libs: [
"libnativehelper_header_only",
],
- multilib: {
- lib32: {
- suffix: "32",
- },
- lib64: {
- suffix: "64",
- },
- },
- symlink_preferred_arch: true,
}
cc_defaults {