Remove -no-integrated-as workaround
Clang can now build these assembly with its integrated assembler.
Test: mma
Bug: 133391830
Change-Id: I0d650e7acc3eeaa685a1a07cdc78b0dee2fbbce7
diff --git a/Android.bp b/Android.bp
index 82b63f4..b652f65 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,13 +46,6 @@
}
//// libcrypto
-
-// This should be removed when clang can compile everything.
-libcrypto_sources_no_clang = [
- "linux-arm/crypto/fipsmodule/aes-armv4.S",
- "linux-arm/crypto/fipsmodule/bsaes-armv7.S",
-]
-
cc_defaults {
name: "libcrypto_defaults",
host_supported: true,
@@ -79,10 +72,6 @@
clang_asflags: ["-march=armv8-a+crypto"],
},
},
-
- // This should be removed when clang can compile everything.
- exclude_srcs: libcrypto_sources_no_clang,
- whole_static_libs: ["libcrypto_no_clang"],
}
// Target and host library
@@ -99,31 +88,6 @@
unique_host_soname: true,
}
-// Target and host library: files that don't compile with clang. This should
-// go away when clang can compile everything with integrated assembler.
-cc_library_static {
- name: "libcrypto_no_clang",
- defaults: ["boringssl_defaults", "boringssl_flags"],
- host_supported: true,
- recovery_available: true,
- native_bridge_supported: true,
-
- target: {
- windows: {
- enabled: true,
- },
- },
-
- local_include_dirs: ["src/crypto"],
-
- arch: {
- arm: {
- clang_asflags: ["-no-integrated-as"],
- srcs: libcrypto_sources_no_clang,
- },
- },
-}
-
// Static library
// This should only be used for host modules that will be in a JVM, all other
// modules should use the static variant of libcrypto.
