sepolicy: Move rw_dir_file/create_dir_file macros to public
Change-Id: Ia6335fb41aa00679a8a069e9ffaf8f81a2380e33
diff --git a/common/public/te_macros b/common/public/te_macros
index 2af4893..a43cd49 100644
--- a/common/public/te_macros
+++ b/common/public/te_macros
@@ -1,4 +1,22 @@
#####################################
+# rw_dir_file(domain, type)
+# Allow the specified domain to read directories and read/write files
+# and symbolic links of the specified type.
+define(`rw_dir_file', `
+allow $1 $2:dir r_dir_perms;
+allow $1 $2:{ file lnk_file } rw_file_perms;
+')
+
+#####################################
+# create_dir_file(domain, type)
+# Allow the specified domain to read directories and create files
+# and symbolic links of the specified type.
+define(`create_dir_file', `
+allow $1 $2:dir r_dir_perms;
+allow $1 $2:{ file lnk_file } create_file_perms;
+')
+
+#####################################
# hal_attribute_lineage(hal_name)
define(`hal_attribute_lineage', `
attribute hal_$1;
diff --git a/common/vendor/te_macros b/common/vendor/te_macros
deleted file mode 100644
index 048c312..0000000
--- a/common/vendor/te_macros
+++ /dev/null
@@ -1,17 +0,0 @@
-#####################################
-# rw_dir_file(domain, type)
-# Allow the specified domain to read directories and read/write files
-# and symbolic links of the specified type.
-define(`rw_dir_file', `
-allow $1 $2:dir r_dir_perms;
-allow $1 $2:{ file lnk_file } rw_file_perms;
-')
-
-#####################################
-# create_dir_file(domain, type)
-# Allow the specified domain to read directories and create files
-# and symbolic links of the specified type.
-define(`create_dir_file', `
-allow $1 $2:dir r_dir_perms;
-allow $1 $2:{ file lnk_file } create_file_perms;
-')