summaryrefslogtreecommitdiff
path: root/runtime/runtime_callbacks_test.cc
diff options
context:
space:
mode:
author David Srbecky <dsrbecky@google.com> 2020-05-29 21:44:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-05-29 21:44:58 +0000
commit351c717a15a2e67ce36bf58bc6ec1a7c670fc174 (patch)
treea98bffb57add1173b2842a7a8232e19c2839aaba /runtime/runtime_callbacks_test.cc
parent19e45e5e596393f15b814fad823d534d9575c2d6 (diff)
parent4a88a5af7417d9dc0bfe37cffd92a253531c8f30 (diff)
Finish move of jar compilation rules from makefile to soong. am: 4a88a5af74
Change-Id: If5c63bad40e487c3c8baf36535faff8f73a9e177
Diffstat (limited to 'runtime/runtime_callbacks_test.cc')
-rw-r--r--runtime/runtime_callbacks_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/runtime_callbacks_test.cc b/runtime/runtime_callbacks_test.cc
index 4a60c045cc..7d4f26cd2a 100644
--- a/runtime/runtime_callbacks_test.cc
+++ b/runtime/runtime_callbacks_test.cc
@@ -300,8 +300,8 @@ TEST_F(ClassLoadCallbackRuntimeCallbacksTest, ClassLoadCallback) {
hs.NewHandle(class_linker_->FindClass(soa.Self(), descriptor_y, class_loader)));
ASSERT_TRUE(h_Y != nullptr);
- bool expect1 = Expect({ "PreDefine:LY; <art-gtest-XandY.jar>",
- "PreDefine:LX; <art-gtest-XandY.jar>",
+ bool expect1 = Expect({ "PreDefine:LY; <art-gtest-jars-XandY.jar>",
+ "PreDefine:LX; <art-gtest-jars-XandY.jar>",
"Load:LX;",
"Prepare:LX;[LX;]",
"Load:LY;",
@@ -312,7 +312,7 @@ TEST_F(ClassLoadCallbackRuntimeCallbacksTest, ClassLoadCallback) {
ASSERT_TRUE(class_linker_->EnsureInitialized(Thread::Current(), h_Y, true, true));
- bool expect2 = Expect({ "PreDefine:LY$Z; <art-gtest-XandY.jar>",
+ bool expect2 = Expect({ "PreDefine:LY$Z; <art-gtest-jars-XandY.jar>",
"Load:LY$Z;",
"Prepare:LY$Z;[LY$Z;]" });
EXPECT_TRUE(expect2);