Snap for 5735642 from cb6fdd2c554b117ce1100249a0f8a91519782c12 to sdk-release
Change-Id: I3d261962397fac4f81c438aff4705b3b9db30904
diff --git a/Android.bp b/Android.bp
index 82b63f4..8a01f91 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,6 +2,10 @@
// libraries. This is currently needed to build, for example, adb. But it's
// probably something that should be changed.
+package {
+ default_visibility: ["//visibility:private"],
+}
+
// Pull in the autogenerated sources modules
build = ["sources.bp"]
@@ -46,13 +50,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,15 +76,12 @@
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
cc_library {
name: "libcrypto",
+ visibility: ["//visibility:public"],
vendor_available: true,
native_bridge_supported: true,
vndk: {
@@ -95,41 +89,27 @@
},
double_loadable: true,
recovery_available: true,
- defaults: ["libcrypto_sources", "libcrypto_defaults", "boringssl_defaults", "boringssl_flags"],
+ defaults: [
+ "libcrypto_sources",
+ "libcrypto_defaults",
+ "boringssl_defaults",
+ "boringssl_flags",
+ ],
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.
cc_library_static {
name: "libcrypto_static",
- defaults: ["libcrypto_sources", "libcrypto_defaults", "boringssl_defaults", "boringssl_flags"],
+ visibility: ["//visibility:public"],
+ defaults: [
+ "libcrypto_sources",
+ "libcrypto_defaults",
+ "boringssl_defaults",
+ "boringssl_flags",
+ ],
target: {
host: {
@@ -151,12 +131,18 @@
// Deprecated: all users should move to libssl
cc_library_static {
name: "libssl_static",
- defaults: ["libssl_sources", "boringssl_defaults", "boringssl_flags"],
+ visibility: ["//visibility:public"],
+ defaults: [
+ "libssl_sources",
+ "boringssl_defaults",
+ "boringssl_flags",
+ ],
}
// Static and Shared library
cc_library {
name: "libssl",
+ visibility: ["//visibility:public"],
recovery_available: true,
vendor_available: true,
native_bridge_supported: true,
@@ -164,7 +150,11 @@
enabled: true,
},
host_supported: true,
- defaults: ["libssl_sources", "boringssl_defaults", "boringssl_flags"],
+ defaults: [
+ "libssl_sources",
+ "boringssl_defaults",
+ "boringssl_flags",
+ ],
unique_host_soname: true,
shared_libs: ["libcrypto"],
@@ -174,7 +164,10 @@
cc_binary {
name: "bssl",
host_supported: true,
- defaults: ["bssl_sources", "boringssl_flags"],
+ defaults: [
+ "bssl_sources",
+ "boringssl_flags",
+ ],
shared_libs: [
"libcrypto",
@@ -216,14 +209,20 @@
"libcrypto",
],
- defaults: ["boringssl_test_support_sources", "boringssl_flags"],
+ defaults: [
+ "boringssl_test_support_sources",
+ "boringssl_flags",
+ ],
}
// Test support library
cc_library_static {
name: "boringssl_test_support",
host_supported: true,
- defaults: ["boringssl_test_support_sources", "boringssl_flags"],
+ defaults: [
+ "boringssl_test_support_sources",
+ "boringssl_flags",
+ ],
shared_libs: [
"libcrypto",
@@ -233,21 +232,30 @@
// Tests
cc_test {
- name: "boringssl_crypto_test",
- test_suites: ["device-tests"],
- host_supported: true,
- defaults: ["boringssl_crypto_test_sources", "boringssl_flags"],
- whole_static_libs: ["boringssl_test_support"],
+ name: "boringssl_crypto_test",
+ test_suites: ["device-tests"],
+ host_supported: true,
+ defaults: [
+ "boringssl_crypto_test_sources",
+ "boringssl_flags",
+ ],
+ whole_static_libs: ["boringssl_test_support"],
- shared_libs: ["libcrypto"],
+ shared_libs: ["libcrypto"],
}
cc_test {
- name: "boringssl_ssl_test",
- test_suites: ["device-tests"],
- host_supported: true,
- defaults: ["boringssl_ssl_test_sources", "boringssl_flags"],
- whole_static_libs: ["boringssl_test_support"],
+ name: "boringssl_ssl_test",
+ test_suites: ["device-tests"],
+ host_supported: true,
+ defaults: [
+ "boringssl_ssl_test_sources",
+ "boringssl_flags",
+ ],
+ whole_static_libs: ["boringssl_test_support"],
- shared_libs: ["libcrypto", "libssl"],
+ shared_libs: [
+ "libcrypto",
+ "libssl",
+ ],
}
diff --git a/OWNERS b/OWNERS
index 0fb4b65..77c1c3c 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,3 @@
flooey@google.com
kroot@google.com
+prb@google.com
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..321bab6
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,2 @@
+[Builtin Hooks]
+bpfmt = true
diff --git a/sources.bp b/sources.bp
index de4e55b..3bbcce5 100644
--- a/sources.bp
+++ b/sources.bp
@@ -467,4 +467,3 @@
"src/ssl/ssl_test.cc",
],
}
-
