Merge "smmu-proxy: Change location of UAPI directory"

2023-08-15 14:27:42 -07:00
parent 5b4eba2697 6c1aa1e334
commit f20c65ab0e
4 changed files with 3 additions and 3 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -85,7 +85,7 @@ cc_library_headers {
 cc_library_headers {
    name: "smmu_proxy_uapi_header",
    vendor_available: true,
-    export_include_dirs: ["smmu-proxy/uapi/"],
+    export_include_dirs: ["smmu-proxy/include/uapi/"],
 }

 cc_library_headers {
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -68,7 +68,7 @@ ddk_headers(
    hdrs = glob([
        "smmu-proxy/*.h",
        "smmu-proxy/linux/*.h",
-        "smmu-proxy/uapi/linux/*.h"
+        "smmu-proxy/include/uapi/linux/*.h"
    ]),
    includes = [".", "smmu-proxy"],
 )
--- a/smmu-proxy/include/uapi/linux/qti-smmu-proxy.h
+++ b/smmu-proxy/include/uapi/linux/qti-smmu-proxy.h
--- a/smmu-proxy/linux/qti-smmu-proxy.h
+++ b/smmu-proxy/linux/qti-smmu-proxy.h
@@ -9,7 +9,7 @@
 #include <linux/scatterlist.h>
 #include <linux/align.h>

-#include <smmu-proxy/uapi/linux/qti-smmu-proxy.h>
+#include <smmu-proxy/include/uapi/linux/qti-smmu-proxy.h>

 #define SMMU_PROXY_MEM_ALIGNMENT (1 << 21)