From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Thu, 20 Dec 2018 21:17:45 +0000 (+0000)
Subject: Merge "Revert "afm-unit: add autoapi in required-api feature""
X-Git-Tag: 6.99.3^0
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-main.git;a=commitdiff_plain;h=9e6f77ae43af16d2af9bdb1ae8d20aed5deaac7d;hp=d6833627b97c543fdace56fa47810c3999b71eac

Merge "Revert "afm-unit: add autoapi in required-api feature""
---

diff --git a/conf/unit/afm-unit-debug.conf.in b/conf/unit/afm-unit-debug.conf.in
index 093975d..6955fa2 100644
--- a/conf/unit/afm-unit-debug.conf.in
+++ b/conf/unit/afm-unit-debug.conf.in
@@ -183,7 +183,6 @@ ExecStart=/usr/bin/afb-daemon \
 	{{#required-permission.urn:AGL:permission::public:applications:read}}--alias=/icons:{{:#metadata.icons-dir}}{{/required-permission.urn:AGL:permission::public:applications:read}} \
 	{{#required-api}} \
 		{{#value=auto|ws}}--ws-client=unix:@afm_users_rundir@/%i/apis/ws/{{name}}{{/value=auto|ws}} \
-		{{#value=autoapi}}--auto-api=@afm_users_rundir@/%i/apis/ws{{/value=autoapi}} \
 		{{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \
 		{{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \
 		{{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \
diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in
index 8067840..353d83b 100644
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -184,7 +184,6 @@ ExecStart=/usr/bin/afb-daemon \
 	{{#required-permission.urn:AGL:permission::public:applications:read}}--alias=/icons:{{:#metadata.icons-dir}}{{/required-permission.urn:AGL:permission::public:applications:read}} \
 	{{#required-api}} \
 		{{#value=auto|ws}}--ws-client=unix:@afm_users_rundir@/%i/apis/ws/{{name}}{{/value=auto|ws}} \
-		{{#value=autoapi}}--auto-api=@afm_users_rundir@/%i/apis/ws{{/value=autoapi}} \
 		{{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \
 		{{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \
 		{{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \
diff --git a/conf/unit/generate-unit-conf/binder.inc b/conf/unit/generate-unit-conf/binder.inc
index 37643ad..30c25d5 100644
--- a/conf/unit/generate-unit-conf/binder.inc
+++ b/conf/unit/generate-unit-conf/binder.inc
@@ -32,7 +32,6 @@ ENDIF \
 	ON_PERM(:public:applications:read, --alias=/icons:{{:#metadata.icons-dir}}) \
 	{{#required-api}} \
 		ON_VALUE(auto|ws,	--ws-client=unix:API_PATH_WS/{{name}}) \
-		ON_VALUE(autoapi,	--api-auto=API_PATH_WS) \
 		ON_VALUE(dbus,		--dbus-client={{name}}) \
 		ON_VALUE(cloud,		--cloud-client={{name}}) \
 		ON_VALUE(local,		--binding={{:#metadata.install-dir}}/{{name}}) \