commit 481b5d663b04fc69b6a9d919b6cf70f7fbe4929c
author Luca Stefani <luca.stefani.ge1@gmail.com> Wed Jan 17 11:42:06 2024 +0100
committer Luca Stefani <luca.stefani.ge1@gmail.com> Thu Jan 18 08:34:35 2024 +0100
tree 9def1fc04e8bb1de8e291f927d1baf8849157ea3
parent 0e77b347e7aa0b11e8353f208deb1677187c7ceb

Format Android.bp files with bpfmt

Change-Id: I083e96e3dd94a48ebad473bcfbbb7fcbb89ce466

keystore2/src/crypto/Android.bp

diff --git a/keystore2/src/crypto/Android.bp b/keystore2/src/crypto/Android.bp
index c78ae41..f8da06f 100644
--- a/keystore2/src/crypto/Android.bp
+++ b/keystore2/src/crypto/Android.bp
@@ -32,8 +32,8 @@
         "libthiserror",
     ],
     shared_libs: [
-        "libkeystore2_crypto",
         "libcrypto",
+        "libkeystore2_crypto",
     ],
     vendor_available: true,
     apex_available: [
@@ -45,8 +45,8 @@
 cc_library {
     name: "libkeystore2_crypto",
     srcs: [
-        "crypto.cpp",
         "certificate_utils.cpp",
+        "crypto.cpp",
     ],
     export_include_dirs: ["include"],
     shared_libs: [
@@ -69,28 +69,28 @@
     vendor_available: true,
     shared_libs: ["libcrypto"],
     bindgen_flags: [
-        "--allowlist-function", "hmacSha256",
-        "--allowlist-function", "randomBytes",
-        "--allowlist-function", "AES_gcm_encrypt",
-        "--allowlist-function", "AES_gcm_decrypt",
-        "--allowlist-function", "CreateKeyId",
-        "--allowlist-function", "PBKDF2",
-        "--allowlist-function", "HKDFExtract",
-        "--allowlist-function", "HKDFExpand",
-        "--allowlist-function", "ECDHComputeKey",
-        "--allowlist-function", "ECKEYGenerateKey",
-        "--allowlist-function", "ECKEYMarshalPrivateKey",
-        "--allowlist-function", "ECKEYParsePrivateKey",
-        "--allowlist-function", "EC_KEY_get0_public_key",
-        "--allowlist-function", "ECPOINTPoint2Oct",
-        "--allowlist-function", "ECPOINTOct2Point",
-        "--allowlist-function", "EC_KEY_free",
-        "--allowlist-function", "EC_POINT_free",
-        "--allowlist-function", "extractSubjectFromCertificate",
-        "--allowlist-type", "EC_KEY",
-        "--allowlist-type", "EC_POINT",
-        "--allowlist-var", "EC_MAX_BYTES",
-        "--allowlist-var", "EVP_MAX_MD_SIZE",
+        "--allowlist-function=AES_gcm_decrypt",
+        "--allowlist-function=AES_gcm_encrypt",
+        "--allowlist-function=CreateKeyId",
+        "--allowlist-function=ECDHComputeKey",
+        "--allowlist-function=ECKEYGenerateKey",
+        "--allowlist-function=ECKEYMarshalPrivateKey",
+        "--allowlist-function=ECKEYParsePrivateKey",
+        "--allowlist-function=ECPOINTOct2Point",
+        "--allowlist-function=ECPOINTPoint2Oct",
+        "--allowlist-function=EC_KEY_free",
+        "--allowlist-function=EC_KEY_get0_public_key",
+        "--allowlist-function=EC_POINT_free",
+        "--allowlist-function=HKDFExpand",
+        "--allowlist-function=HKDFExtract",
+        "--allowlist-function=PBKDF2",
+        "--allowlist-function=extractSubjectFromCertificate",
+        "--allowlist-function=hmacSha256",
+        "--allowlist-function=randomBytes",
+        "--allowlist-type=EC_KEY",
+        "--allowlist-type=EC_POINT",
+        "--allowlist-var=EC_MAX_BYTES",
+        "--allowlist-var=EVP_MAX_MD_SIZE",
     ],
     cflags: ["-DBORINGSSL_NO_CXX"],
     apex_available: [

keystore2/src/fuzzers/Android.bp

diff --git a/keystore2/src/fuzzers/Android.bp b/keystore2/src/fuzzers/Android.bp
index 0809dc8..7ddbfc0 100644
--- a/keystore2/src/fuzzers/Android.bp
+++ b/keystore2/src/fuzzers/Android.bp
@@ -20,13 +20,13 @@
     name: "keystore2_unsafe_fuzzer",
     srcs: ["keystore2_unsafe_fuzzer.rs"],
     rustlibs: [
+        "libarbitrary",
         "libkeystore2",
-        "libkeystore2_crypto_rust",
-        "libkeystore2_hal_names_rust",
         "libkeystore2_aaid-rust",
         "libkeystore2_apc_compat-rust",
+        "libkeystore2_crypto_rust",
+        "libkeystore2_hal_names_rust",
         "libkeystore2_selinux",
-        "libarbitrary",
     ],
     fuzz_config: {
         fuzz_on_haiku_device: true,
@@ -38,19 +38,18 @@
     },
 }
 
-
 rust_fuzz {
     name: "authorization_service_fuzzer",
     srcs: ["aidl-fuzzers/authorization_service_fuzzer.rs"],
     rustlibs: [
+        "libbinder_random_parcel_rs",
+        "libbinder_rs",
         "libkeystore2",
-        "libkeystore2_crypto_rust",
-        "libkeystore2_hal_names_rust",
         "libkeystore2_aaid-rust",
         "libkeystore2_apc_compat-rust",
+        "libkeystore2_crypto_rust",
+        "libkeystore2_hal_names_rust",
         "libkeystore2_selinux",
-        "libbinder_rs",
-        "libbinder_random_parcel_rs",
     ],
     fuzz_config: {
         fuzz_on_haiku_device: true,
@@ -58,7 +57,7 @@
         cc: [
             "android-media-fuzzing-reports@google.com",
             "smoreland@google.com",
-            "waghpawan@google.com"
+            "waghpawan@google.com",
         ],
         // Adds bugs to hotlist "AIDL fuzzers bugs" on buganizer
         hotlists: ["4637097"],

keystore2/src/km_compat/Android.bp

diff --git a/keystore2/src/km_compat/Android.bp b/keystore2/src/km_compat/Android.bp
index 806f3dc..36e18f0 100644
--- a/keystore2/src/km_compat/Android.bp
+++ b/keystore2/src/km_compat/Android.bp
@@ -33,7 +33,7 @@
     ],
     shared_libs: [
         "libkm_compat_service",
-    ]
+    ],
 }
 
 rust_test {
@@ -91,9 +91,9 @@
         "android.security.compat-ndk",
         "libbinder_ndk",
         "libcrypto",
-        "libkm_compat",
         "libkeymaster4_1support",
         "libkeystore2_crypto",
+        "libkm_compat",
     ],
 }