diff options
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | runtime/parsed_options.cc | 4 | ||||
| -rw-r--r-- | runtime/runtime_options.def | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 335afbbd16..584899c87e 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -58,7 +58,7 @@ $(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib*/libandroidicu.so) $(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib*/libpac.so) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/nativetest*/art_libdexfile_support_tests/dex_file_supp_test) -$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/nativetest*/art_runtime_compiler_tests) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/nativetest*/) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index e644c04d96..6423f3b21b 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -219,9 +219,6 @@ std::unique_ptr<RuntimeParser> ParsedOptions::MakeParser(bool ignore_unrecognize .Define("-Xjnitrace:_") .WithType<std::string>() .IntoKey(M::JniTrace) - .Define("-Xpatchoat:_") - .WithType<std::string>() - .IntoKey(M::PatchOat) .Define({"-Xrelocate", "-Xnorelocate"}) .WithValues({true, false}) .IntoKey(M::Relocate) @@ -736,7 +733,6 @@ void ParsedOptions::Usage(const char* fmt, ...) { UsageMessage(stream, " -Xcompiler:filename\n"); UsageMessage(stream, " -Xcompiler-option dex2oat-option\n"); UsageMessage(stream, " -Ximage-compiler-option dex2oat-option\n"); - UsageMessage(stream, " -Xpatchoat:filename (obsolete, ignored)\n"); UsageMessage(stream, " -Xusejit:booleanvalue\n"); UsageMessage(stream, " -Xjitinitialsize:N\n"); UsageMessage(stream, " -Xjitmaxsize:N\n"); diff --git a/runtime/runtime_options.def b/runtime/runtime_options.def index 222c821df9..9b4aa0fc74 100644 --- a/runtime/runtime_options.def +++ b/runtime/runtime_options.def @@ -88,7 +88,6 @@ RUNTIME_OPTIONS_KEY (MillisecondsToNanoseconds, \ RUNTIME_OPTIONS_KEY (std::vector<std::string>, \ PropertiesList) // -D<whatever> -D<whatever> ... RUNTIME_OPTIONS_KEY (std::string, JniTrace) -RUNTIME_OPTIONS_KEY (std::string, PatchOat) RUNTIME_OPTIONS_KEY (bool, Relocate, kDefaultMustRelocate) RUNTIME_OPTIONS_KEY (bool, ImageDex2Oat, true) RUNTIME_OPTIONS_KEY (bool, Interpret, false) // -Xint |