Revert odrefresh split
This change is a manual revert of aosp/1843654, since there have been
lots of changes. odrefresh.cc and odrefresh_test.cc are the files that
conflict the most.
Bug: 211977683
Test: atest art_standalone_odrefresh_tests
Test: atest odsign_e2e_tests
Test: art/build/apex/runtests.sh
Test: lunch full-eng; m; art/build/apex/runtests.sh
Test: with master-art, art/tools/run-gtests.sh \
/apex/com.android.art/bin/art/arm64/art_odrefresh_tests
Test: atest ComposHostTestCases
Change-Id: If279c4326ad4d4e5f4b7f5c7c0d995d522f795f5
diff --git a/odrefresh/odrefresh.h b/odrefresh/odrefresh.h
index d749b2b..21e5f61 100644
--- a/odrefresh/odrefresh.h
+++ b/odrefresh/odrefresh.h
@@ -32,7 +32,6 @@
#include "exec_utils.h"
#include "odr_artifacts.h"
#include "odr_config.h"
-#include "odr_dexopt.h"
#include "odr_metrics.h"
#include "odrefresh/odrefresh.h"
@@ -57,8 +56,7 @@
// Constructor with injections. For testing and internal use only.
OnDeviceRefresh(const OdrConfig& config,
const std::string& cache_info_filename,
- std::unique_ptr<ExecUtils> exec_utils,
- std::unique_ptr<OdrDexopt> odr_dexopt);
+ std::unique_ptr<ExecUtils> exec_utils);
// Returns the exit code and specifies what should be compiled in `compilation_options`.
WARN_UNUSED ExitCode
@@ -200,8 +198,6 @@
std::unique_ptr<ExecUtils> exec_utils_;
- std::unique_ptr<OdrDexopt> odr_dexopt_;
-
DISALLOW_COPY_AND_ASSIGN(OnDeviceRefresh);
};