diff options
| -rw-r--r-- | tools/veridex/veridex.cc | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/tools/veridex/veridex.cc b/tools/veridex/veridex.cc index 87e3af06e0..7206c7d1e3 100644 --- a/tools/veridex/veridex.cc +++ b/tools/veridex/veridex.cc @@ -65,6 +65,16 @@ VeriMethod VeriClass::getClass_ = nullptr; VeriMethod VeriClass::loadClass_ = nullptr; VeriField VeriClass::sdkInt_ = nullptr; +static const char* kDexFileOption = "--dex-file="; +static const char* kStubsOption = "--core-stubs="; +static const char* kWhitelistOption = "--whitelist="; +static const char* kBlacklistOption = "--blacklist="; +static const char* kDarkGreylistOption = "--dark-greylist="; +static const char* kLightGreylistOption = "--light-greylist="; +static const char* kImprecise = "--imprecise"; +static const char* kTargetSdkVersion = "--target-sdk-version="; +static const char* kOnlyReportSdkUses = "--only-report-sdk-uses"; + struct VeridexOptions { const char* dex_file = nullptr; const char* core_stubs = nullptr; @@ -90,16 +100,6 @@ static void ParseArgs(VeridexOptions* options, int argc, char** argv) { argv++; argc--; - static const char* kDexFileOption = "--dex-file="; - static const char* kStubsOption = "--core-stubs="; - static const char* kWhitelistOption = "--whitelist="; - static const char* kBlacklistOption = "--blacklist="; - static const char* kDarkGreylistOption = "--dark-greylist="; - static const char* kLightGreylistOption = "--light-greylist="; - static const char* kImprecise = "--imprecise"; - static const char* kTargetSdkVersion = "--target-sdk-version="; - static const char* kOnlyReportSdkUses = "--only-report-sdk-uses"; - for (int i = 0; i < argc; ++i) { if (StartsWith(argv[i], kDexFileOption)) { options->dex_file = Substr(argv[i], strlen(kDexFileOption)); @@ -138,6 +138,12 @@ class Veridex { static int Run(int argc, char** argv) { VeridexOptions options; ParseArgs(&options, argc, argv); + + if (!options.dex_file) { + LOG(ERROR) << "Required argument '" << kDexFileOption << "' not provided."; + return 1; + } + gTargetSdkVersion = options.target_sdk_version; std::vector<std::string> boot_content; |