summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Hector Chavez2017-11-03 18:22:05 -0500
committerLuis Hector Chavez2017-11-03 19:36:01 -0500
commitfae195b1e45ffcf2ba14bd92faf89f06c5cc4be7 (patch)
treee9150c00c9a5da6542c45e13635ba5b2f4de1d48 /libcutils/Android.bp
parente97a4b9799f25b10c50fccb20eb0af69f14fe8dc (diff)
downloadplatform-system-core-fae195b1e45ffcf2ba14bd92faf89f06c5cc4be7.tar.gz
platform-system-core-fae195b1e45ffcf2ba14bd92faf89f06c5cc4be7.tar.xz
platform-system-core-fae195b1e45ffcf2ba14bd92faf89f06c5cc4be7.zip
libcutils: Work around the lack of __mulodi4
The parent change ran into an issue where enabling UBSan on an i686 build caused it to use __mulodi4. https://github.com/android-ndk/ndk/issues/184 documents linking against libclang_rt.builtins-i686.a, but that's not available from soong either. Bug: 62378620 Bug: 29412086 Test: x86 builds work again Change-Id: I730d59558aa4ed28f8a11b5393e037111e320f29
Diffstat (limited to 'libcutils/Android.bp')
-rw-r--r--libcutils/Android.bp24
1 files changed, 21 insertions, 3 deletions
diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index f48330867..faaad0c20 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -114,23 +114,32 @@ cc_library {
114 "trace-dev.c", 114 "trace-dev.c",
115 "uevent.cpp", 115 "uevent.cpp",
116 ], 116 ],
117 sanitize: {
118 misc_undefined: ["integer"],
119 },
120 }, 117 },
121 118
122 android_arm: { 119 android_arm: {
123 srcs: ["arch-arm/memset32.S"], 120 srcs: ["arch-arm/memset32.S"],
121 sanitize: {
122 misc_undefined: ["integer"],
123 },
124 }, 124 },
125 android_arm64: { 125 android_arm64: {
126 srcs: ["arch-arm64/android_memset.S"], 126 srcs: ["arch-arm64/android_memset.S"],
127 sanitize: {
128 misc_undefined: ["integer"],
129 },
127 }, 130 },
128 131
129 android_mips: { 132 android_mips: {
130 srcs: ["arch-mips/android_memset.c"], 133 srcs: ["arch-mips/android_memset.c"],
134 sanitize: {
135 misc_undefined: ["integer"],
136 },
131 }, 137 },
132 android_mips64: { 138 android_mips64: {
133 srcs: ["arch-mips/android_memset.c"], 139 srcs: ["arch-mips/android_memset.c"],
140 sanitize: {
141 misc_undefined: ["integer"],
142 },
134 }, 143 },
135 144
136 android_x86: { 145 android_x86: {
@@ -138,6 +147,12 @@ cc_library {
138 "arch-x86/android_memset16.S", 147 "arch-x86/android_memset16.S",
139 "arch-x86/android_memset32.S", 148 "arch-x86/android_memset32.S",
140 ], 149 ],
150 // TODO: This is to work around b/29412086.
151 // Remove once __mulodi4 is available and move the "sanitize" block
152 // to the android target.
153 sanitize: {
154 misc_undefined: [],
155 },
141 }, 156 },
142 157
143 android_x86_64: { 158 android_x86_64: {
@@ -145,6 +160,9 @@ cc_library {
145 "arch-x86_64/android_memset16.S", 160 "arch-x86_64/android_memset16.S",
146 "arch-x86_64/android_memset32.S", 161 "arch-x86_64/android_memset32.S",
147 ], 162 ],
163 sanitize: {
164 misc_undefined: ["integer"],
165 },
148 }, 166 },
149 }, 167 },
150 168