diff options
author | Googler <noreply@google.com> | 2017-12-07 21:24:52 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-12-07 21:26:44 -0800 |
commit | c1914135477581163560c00a3a728d37ad0ea846 (patch) | |
tree | 04871012415e42d1a787748432fc3f0e8e7a03b0 /src/main/java/com/google | |
parent | 16514d37f1db23beea5739a2f26fe062ad9801d2 (diff) |
Change flag name --start_type to --start, to be consistent with adb options flag.
Add check to test options, default value of testFilter is null.
RELNOTES: None
PiperOrigin-RevId: 178337368
Diffstat (limited to 'src/main/java/com/google')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java index 518465e634..259ee9fc65 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.runtime.mobileinstall; import static com.google.devtools.build.lib.analysis.OutputGroupProvider.INTERNAL_SUFFIX; +import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.analysis.ConfiguredTarget; @@ -247,7 +248,7 @@ public class MobileInstallCommand implements BlazeCommand { } // Collect relevant adb options - cmdLine.add("--start_type=" + adbOptions.start); + cmdLine.add("--start=" + adbOptions.start); if (!adbOptions.adb.isEmpty()) { cmdLine.add("--adb=" + adbOptions.adb); } @@ -262,7 +263,8 @@ public class MobileInstallCommand implements BlazeCommand { // Collect relevant test options TestOptions testOptions = options.getOptions(TestOptions.class); - if (!testOptions.testFilter.isEmpty()){ + // Default value of testFilter is null. + if (!Strings.isNullOrEmpty(testOptions.testFilter)){ cmdLine.add("--test_filter=" + testOptions.testFilter); } for (String arg : testOptions.testArguments) { |