Skip to content
This repository was archived by the owner on Oct 26, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/scala/Android.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
()
}

Expand Down
1 change: 1 addition & 0 deletions src/main/scala/AndroidBase.scala
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ object AndroidBase {

jarPath <<= (platformPath, jarName) (_ / _),
libraryJarPath <<= (jarPath (_ get)),
emulatorOptions := "",

proguardOption := "",
proguardExclude <<= (libraryJarPath, classDirectory, resourceDirectory) map {
Expand Down
1 change: 1 addition & 0 deletions src/main/scala/AndroidKeys.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down