Merge "securemsm-kernel: exposing smcinvoke headers"

Android.bp

@@ -1,13 +1,13 @@
 headers_src = [
-    "linux/smc*ke.h",
-    "linux/smc*_object.h",
-    "linux/IClientE*v.h",
+    "include/linux/smc*ke.h",
+    "include/linux/smc*_object.h",
+    "include/linux/IClientE*v.h",
 ]
 
 smcinvoke_headers_out = [
-    "linux/smcinvoke.h",
-    "linux/smcinvoke_object.h",
-    "linux/IClientEnv.h",
+    "include/linux/smcinvoke.h",
+    "include/linux/smcinvoke_object.h",
+    "include/linux/IClientEnv.h",
 ]
 
 smcinvoke_kernel_headers_verbose = "--verbose "
@@ -25,7 +25,7 @@ genrule {
         smcinvoke_kernel_headers_verbose +
         "--header_arch arm64 " +
         "--gen_dir $(genDir) " +
-        "--smcinvoke_headers_to_expose $(locations linux/smc*ke.h) $(locations linux/smc*_object.h) $(locations linux/IClientE*v.h) " +
+        "--smcinvoke_headers_to_expose $(locations include/linux/smc*ke.h) $(locations include/linux/smc*_object.h) $(locations include/linux/IClientE*v.h) " +
         "--unifdef $(location unifdef) " +
         "--headers_install $(location headers_install.sh)",
     out: smcinvoke_headers_out,
@@ -34,7 +34,7 @@ genrule {
 
 cc_library_headers {
     name: "smcinvoke_kernel_headers",
-    export_include_dirs: ["."],
+    export_include_dirs: ["."] + ["include"],
     generated_headers: ["qti_generate_smcinvoke_kernel_headers"],
     export_generated_headers: ["qti_generate_smcinvoke_kernel_headers"],
     vendor: true,

Android.mk

@@ -16,6 +16,8 @@ DLKM_DIR := $(TOP)/device/qcom/common/dlkm
 
 SEC_KERNEL_DIR := $(TOP)/vendor/qcom/opensource/securemsm-kernel
 
+LOCAL_EXPORT_KO_INCLUDE_DIRS := $(LOCAL_PATH)/include/
+
 SSG_SRC_FILES := \
 	$(wildcard $(LOCAL_PATH)/*) \
  	$(wildcard $(LOCAL_PATH)/*/*) \

Kbuild

@@ -1,5 +1,6 @@
 LINUXINCLUDE += -I$(SSG_MODULE_ROOT)/ \
-                -I$(SSG_MODULE_ROOT)/linux/ 
+                -I$(SSG_MODULE_ROOT)/linux/ \
+                -I$(SSG_MODULE_ROOT)/include/linux/
 
 ifneq ($(CONFIG_ARCH_QTI_VM), y)
     LINUXINCLUDE += -include $(SSG_MODULE_ROOT)/config/sec-kernel_defconfig.h

include/linux/IClientEnv.h

@@ -12,6 +12,8 @@
 #define IClientEnv_OP_notifyDomainChange 4
 #define IClientEnv_OP_registerWithCredentials 5
 
+#include "smcinvoke_object.h"
+
 static inline int32_t
 IClientEnv_release(struct Object self)
 {