1 files changed, 29 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 6e84ec2..0323aa2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -52,15 +52,12 @@ cc_defaults {
         "-Wall",
         "-Werror",
         "-Wunused",
-    ],
-    clang: true,
-    clang_cflags: [
         "-Wno-error=unused-const-variable",
         "-Wno-error=unused-private-field",
         "-Wimplicit-fallthrough",
         // TODO(krasin): reenable coverage flags, when the new Clang toolchain is released.
         // Currently, if enabled, these flags will cause an internal error in Clang.
-        "-fno-sanitize-coverage=edge,indirect-calls,8bit-counters,trace-cmp"
+        "-fno-sanitize-coverage=edge,indirect-calls,8bit-counters,trace-cmp",
     ],
     tidy: true,
     tidy_checks: [
@@ -69,6 +66,11 @@ cc_defaults {
     sanitize: {
         integer_overflow: false,
     },
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 cc_library_shared {
@@ -82,15 +84,15 @@ cc_library_shared {
         "android_keymaster/serializable.cpp",
     ],
     header_libs: ["libhardware_headers"],
-    defaults: ["keymaster_defaults" ],
-    clang_cflags: [
+    defaults: ["keymaster_defaults"],
+    cflags: [
         "-DKEYMASTER_NAME_TAGS",
     ],
     export_include_dirs: ["include"],
     host_supported: true,
     target: {
         host: {
-            clang_cflags: [
+            cflags: [
                 "-fno-rtti", // TODO(b/156427382): Remove workaround when possible.
             ],
         },
@@ -163,12 +165,12 @@ cc_library {
     export_shared_lib_headers: ["libcppbor_external"],
     header_libs: ["libhardware_headers"],
     export_header_lib_headers: ["libhardware_headers"],
-    defaults: ["keymaster_defaults" ],
+    defaults: ["keymaster_defaults"],
     host_supported: true,
     export_include_dirs: ["include"],
     target: {
         host: {
-            clang_cflags: [
+            cflags: [
                 "-fno-rtti", // TODO(b/156427382): Remove workaround when possible.
             ],
         },
@@ -273,7 +275,7 @@ cc_library {
         "libcutils",
         "libbase",
     ],
-    clang_cflags: [
+    cflags: [
         "-DKEYMASTER_NAME_TAGS",
         "-fno-rtti", // TODO(b/156427382): Remove workaround when possible.
     ],
@@ -311,10 +313,13 @@ cc_library_shared {
         "libsoft_attestation_cert",
         "libutils",
     ],
-    export_include_dirs: ["include", "ng/include"],
+    export_include_dirs: [
+        "include",
+        "ng/include",
+    ],
 }
 
-cc_library_shared {
+cc_library {
     name: "libkeymaster4",
     srcs: [
         "legacy_support/keymaster_passthrough_key.cpp",
@@ -339,7 +344,7 @@ cc_library_shared {
     ],
     export_include_dirs: [
         "ng/include",
-        "include"
+        "include",
     ],
 }
 
@@ -409,6 +414,7 @@ cc_library {
     ],
     shared_libs: [
         "libhidlbase",
+        "android.hardware.security.rkp-V3-ndk",
         "android.hardware.security.secureclock-V1-ndk",
         "android.hardware.security.sharedsecret-V1-ndk",
         "lib_android_keymaster_keymint_utils",
@@ -423,7 +429,10 @@ cc_library {
         "libpuresoftkeymasterdevice",
         "libutils",
     ],
-    export_include_dirs: ["include", "ng/include"],
+    export_include_dirs: [
+        "include",
+        "ng/include",
+    ],
 }
 
 cc_library {
@@ -441,6 +450,11 @@ cc_library {
         "libcrypto",
         "liblog",
     ],
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
 }
 
 cc_defaults {
@@ -462,7 +476,7 @@ cc_defaults {
     host_supported: true,
     target: {
         host: {
-            clang_cflags: [
+            cflags: [
                 "-fno-rtti", // TODO(b/156427382): Remove when default library removes this
             ],
         },