1 files changed, 6 insertions, 36 deletions

diff --git a/Android.bp b/Android.bp
index 097d80a..7245161 100644
--- a/Android.bp
+++ b/Android.bp
@@ -107,10 +107,7 @@ cc_library_static {
     ],
     host_supported: true,
     recovery_available: true,
-    header_libs: [
-        "avb_headers",
-    ],
-    export_header_lib_headers: ["avb_headers"],
+    export_include_dirs: ["."],
     target: {
         linux: {
             srcs: ["libavb/avb_sysdeps_posix.c"],
@@ -131,10 +128,7 @@ cc_library_static {
         "avb_sources",
     ],
     recovery_available: true,
-    header_libs: [
-        "avb_headers",
-    ],
-    export_header_lib_headers: ["avb_headers"],
+    export_include_dirs: ["."],
     shared_libs: ["libbase"],
     static_libs: ["libfs_mgr"],
     cflags: [
@@ -163,10 +157,7 @@ cc_binary {
 cc_library_host_static {
     name: "libavb_ab_host",
     defaults: ["avb_defaults"],
-    header_libs: [
-        "avb_headers",
-    ],
-    export_header_lib_headers: ["avb_headers"],
+    export_include_dirs: ["."],
     cflags: [
         "-fno-stack-protector",
         "-DAVB_AB_I_UNDERSTAND_LIBAVB_AB_IS_DEPRECATED",
@@ -177,10 +168,7 @@ cc_library_host_static {
 cc_library_host_static {
     name: "libavb_atx_host",
     defaults: ["avb_defaults"],
-    header_libs: [
-        "avb_headers",
-    ],
-    export_header_lib_headers: ["avb_headers"],
+    export_include_dirs: ["."],
     cflags: [
         "-fno-stack-protector",
     ],
@@ -190,20 +178,14 @@ cc_library_host_static {
 cc_library_host_static {
     name: "libavb_host_sysdeps",
     defaults: ["avb_defaults"],
-    header_libs: [
-        "avb_headers",
-    ],
-    export_header_lib_headers: ["avb_headers"],
+    export_include_dirs: ["."],
     srcs: ["libavb/avb_sysdeps_posix.c"],
 }
 
 cc_library_host_static {
     name: "libavb_things_example",
     defaults: ["avb_defaults"],
-    header_libs: [
-        "avb_headers",
-    ],
-    export_header_lib_headers: ["avb_headers"],
+    export_include_dirs: ["."],
     srcs: ["examples/things/avb_atx_slot_verify.c"],
 }
 
@@ -279,15 +261,3 @@ cc_library {
     ],
     srcs: ["boot_control/boot_control_avb.c"],
 }
-
-cc_library_headers {
-    name: "avb_headers",
-    host_supported: true,
-    recovery_available: true,
-    export_include_dirs: ["."],
-    target: {
-        windows: {
-            enabled: true,
-        },
-    },
-}