1 files changed, 9 insertions, 31 deletions
diff --git a/Android.bp b/Android.bp
index aada4d99f9..82a7608167 100644
--- a/Android.bp
+++ b/Android.bp
@@ -162,6 +162,10 @@ filegroup {
         "base/files/scoped_file.h",
         "base/files/scoped_temp_dir.h",
         "base/format_macros.h",
+        "base/functional/bind.h",
+        "base/functional/callback.h",
+        "base/functional/callback_forward.h",
+        "base/functional/callback_helpers.h",
         "base/gtest_prod_util.h",
         "base/guid.h",
         "base/hash.h",
@@ -519,6 +523,7 @@ cc_defaults {
         "-Werror",
         "-Wno-deprecated-declarations",
         "-Wno-implicit-fallthrough",
+        "-Wno-implicit-int-float-conversion",
         // memory_mapped_file.cc:80, json_parser.cc:264,
         // sys_string_conversions_posix.cc:122, and
         // icu_utf.cc:161,165 have -Wno-implicit-fallthrough.
@@ -868,6 +873,10 @@ cc_library {
             ],
         },
     },
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.btservices",
+    ],
     min_sdk_version: "30",
 }
 
@@ -890,11 +899,7 @@ cc_library_shared {
     vendor_available: true,
     defaults: ["libchrome-defaults"],
     srcs: [
-        "crypto/openssl_util.cc",
         "crypto/random.cc",
-        "crypto/secure_hash.cc",
-        "crypto/secure_util.cc",
-        "crypto/sha2.cc",
     ],
 
     generated_headers: ["libchrome-crypto-include"],
@@ -902,8 +907,6 @@ cc_library_shared {
 
     shared_libs: [
         "libchrome",
-        "libcrypto",
-        "libssl",
     ],
 }
 
@@ -1091,13 +1094,6 @@ cc_test {
     ],
     target: {
         android: {
-            srcs: [
-                "crypto/secure_hash_unittest.cc",
-                "crypto/sha2_unittest.cc",
-            ],
-            shared_libs: [
-                "libchrome-crypto",
-            ],
             cflags: ["-DDONT_EMBED_BUILD_METADATA"],
         },
     },
@@ -1177,19 +1173,6 @@ filegroup {
     ],
 }
 
-// Python in Chrome repository requires still Python 2.
-python_defaults {
-    name: "libmojo_scripts",
-    version: {
-        py2: {
-            enabled: true,
-        },
-        py3: {
-            enabled: false,
-        },
-    },
-}
-
 python_binary_host {
     name: "jni_generator",
     main: "base/android/jni_generator/jni_generator.py",
@@ -1197,7 +1180,6 @@ python_binary_host {
         "base/android/jni_generator/jni_generator.py",
         "build/**/*.py",
     ],
-    defaults: ["libmojo_scripts"],
 }
 
 python_binary_host {
@@ -1208,7 +1190,6 @@ python_binary_host {
         "base/android/jni_generator/jni_registration_generator.py",
         "build/**/*.py",
     ],
-    defaults: ["libmojo_scripts"],
 }
 
 python_binary_host {
@@ -1226,7 +1207,6 @@ python_binary_host {
         "mojo/public/tools/bindings/generators/java_templates/*.tmpl",
         "mojo/public/tools/bindings/generators/js_templates/*.tmpl",
     ],
-    defaults: ["libmojo_scripts"],
 }
 
 genrule {
@@ -1258,7 +1238,6 @@ python_binary_host {
         "mojo/public/tools/bindings/pylib/mojom/generate/module.py",
         "mojo/public/tools/bindings/pylib/mojom/generate/pack.py",
     ],
-    defaults: ["libmojo_scripts"],
 }
 
 genrule {
@@ -1298,7 +1277,6 @@ python_binary_host {
     srcs: [
         "mojo/public/tools/bindings/mojom_types_downgrader.py",
     ],
-    defaults: ["libmojo_scripts"],
 }
 
 generate_mojom_downgraded_files {