From f52b970c1c27356e940ce164817f9a08998f89eb Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Thu, 20 Jun 2019 12:28:49 -0700
Subject: [PATCH] LockAgent: Add agent parameters to start_lock_agent script

Add parsing of "--agent-options" parameter to configure optional agent
features.

Sample: adb shell setprop wrap.system_server "start_with_lockagent --agent-options native_crash,java_crash"

Test: m
Test: manual
Change-Id: Ie70d0155096838782cb76f8111a42eba0c20e75d
---
 tools/lock_agent/start_with_lockagent.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/lock_agent/start_with_lockagent.sh b/tools/lock_agent/start_with_lockagent.sh
index 953922230a11d..70ed5c5e1dd70 100755
--- a/tools/lock_agent/start_with_lockagent.sh
+++ b/tools/lock_agent/start_with_lockagent.sh
@@ -1,5 +1,13 @@
 #!/system/bin/sh
+
+AGENT_OPTIONS=
+if [[ "$1" == --agent-options ]] ; then
+  shift
+  AGENT_OPTIONS="=$1"
+  shift
+fi
+
 APP=$1
 shift
-$APP -Xplugin:libopenjdkjvmti.so -agentpath:liblockagent.so $@
 
+$APP -Xplugin:libopenjdkjvmti.so "-agentpath:liblockagent.so$AGENT_OPTIONS" $@