Merge "te_macros: remove print macro" am: 4ca98248

am: 3f5dd224

Change-Id: Ibfa9778c1d131c45647eaadda122261c3dcb6516

public/te_macros

@@ -288,15 +288,6 @@ allow $2 vendor_file:file { read open getattr execute map };
 # use set_prop(sourcedomain, targetproperty)
 #
 define(`unix_socket_connect', `
-ifelse($2, `property', `
-    ifelse($3,`init', `
-       print(`deprecated: unix_socket_connect($1, $2, $3) Please use set_prop($1, <property name>) instead.')
-   ')
-')
-__unix_socket_connect__($1, $2, $3)
-')
-
-define(`__unix_socket_connect__', `
 allow $1 $2_socket:sock_file write;
 allow $1 $3:unix_stream_socket connectto;
 ')
@@ -307,7 +298,7 @@ allow $1 $3:unix_stream_socket connectto;
 # targetproperty.
 #
 define(`set_prop', `
-__unix_socket_connect__($1, property, init)
+unix_socket_connect($1, property, init)
 allow $1 $2:property_service set;
 get_prop($1, $2)
 ')
@@ -607,9 +598,3 @@ define(`add_hwservice', `
   allow $1 hidl_base_hwservice:hwservice_manager add;
   neverallow { domain -$1 } $2:hwservice_manager add;
 ')
-
-##########################################
-# print a message with a trailing newline
-# print(`args')
-define(`print', `errprint(`m4: '__file__: __line__`: $*
-')')