diff --git a/src/main/scala/Android.scala b/src/main/scala/Android.scala index 298e2c8..cef55d8 100644 --- a/src/main/scala/Android.scala +++ b/src/main/scala/Android.scala @@ -18,8 +18,8 @@ object AndroidProject extends Plugin { "Kill the adb server if it is running.") private def emulatorStartTask = (parsedTask: TaskKey[String]) => - (parsedTask, toolsPath) map { (avd, toolsPath) => - "%s/emulator -avd %s".format(toolsPath, avd).run + (parsedTask, toolsPath, emulatorOptions) map { (avd, toolsPath, emulatorOptions) => + "%s/emulator -avd %s %s".format(toolsPath, avd, emulatorOptions).run () } diff --git a/src/main/scala/AndroidBase.scala b/src/main/scala/AndroidBase.scala index b300830..7f2f8c7 100644 --- a/src/main/scala/AndroidBase.scala +++ b/src/main/scala/AndroidBase.scala @@ -192,6 +192,7 @@ object AndroidBase { jarPath <<= (platformPath, jarName) (_ / _), libraryJarPath <<= (jarPath (_ get)), + emulatorOptions := "", proguardOption := "", proguardExclude <<= (libraryJarPath, classDirectory, resourceDirectory) map { diff --git a/src/main/scala/AndroidKeys.scala b/src/main/scala/AndroidKeys.scala index 4a9046e..1369819 100644 --- a/src/main/scala/AndroidKeys.scala +++ b/src/main/scala/AndroidKeys.scala @@ -36,6 +36,7 @@ object AndroidKeys { val manifestSchema = SettingKey[String]("manifest-schema") val envs = SettingKey[Seq[String]]("envs") val preinstalledModules = SettingKey[Seq[ModuleID]]("preinstalled-modules") + val emulatorOptions = SettingKey[String]("emulator-options") /** Determined Settings */ val packageApkName = TaskKey[String]("package-apk-name")