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/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 17eb18e..970fff0 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -552,8 +552,6 @@
# Check internal libraries for ART.
self._checker.check_native_library('libperfetto_hprof')
self._checker.check_prefer64_library('artd-aidl-ndk')
- self._checker.check_prefer64_library('artd-private-aidl-ndk')
- self._checker.check_prefer64_library('libdexopt')
# Check internal Java libraries
self._checker.check_java_library("service-art")
@@ -684,15 +682,13 @@
self._checker.check_art_test_executable('art_libdexfile_tests')
self._checker.check_art_test_executable('art_libprofile_tests')
self._checker.check_art_test_executable('art_oatdump_tests')
- self._checker.check_art_test_executable('art_odrefresh_tests',
- multilib=MULTILIB_FIRST)
+ self._checker.check_art_test_executable('art_odrefresh_tests')
self._checker.check_art_test_executable('art_profman_tests')
self._checker.check_art_test_executable('art_runtime_compiler_tests')
self._checker.check_art_test_executable('art_runtime_tests')
self._checker.check_art_test_executable('art_sigchain_tests')
# Check ART test (internal) libraries.
- self._checker.check_prefer64_library('libdexoptd')
self._checker.check_native_library('libartd-gtest')
self._checker.check_native_library('libartd-simulator-container')