commit c210fcfc28a58997ea71adda9128c0c1e0b77936
author David Anderson <dvander@google.com> Fri Jul 14 18:23:36 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 14 18:23:36 2023 +0000
tree 651d2786711ffb18b2bdc8848a25ee1f6f7b8cf4
parent f7a0081b9989ece60256f9ed35fa2562bb65755f
parent f572053dab7bbfd448011f05480af3b04d899107

Merge "libsnapshot: Move export_include_dirs to correct location." into main am: f572053dab

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2656856

Change-Id: Ibb24949cc5e439ae0114255adf6eb6863c748a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/libsnapshot/Android.bp

diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index 9d1ce7d..8f35381 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -166,7 +166,6 @@
     header_libs: [
         "libupdate_engine_headers",
     ],
-    export_include_dirs: ["include"],
 }
 
 cc_library_static {
@@ -184,6 +183,7 @@
         "libsnapshot_cow/writer_base.cpp",
         "libsnapshot_cow/writer_v2.cpp",
     ],
+    export_include_dirs: ["include"],
     host_supported: true,
     recovery_available: true,
     ramdisk_available: true,