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

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 {

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"],
 )

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)