Stop sdk package depending on testing.T being embedded in TestResult
This change is in preparation for removing testing.T from TestResult.
Bug: 181070625
Test: m nothing
Change-Id: I67535aff0d894e6e3d8456b75540f340af853355
diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go
index 28c9e9e..a2539c9 100644
--- a/sdk/cc_sdk_test.go
+++ b/sdk/cc_sdk_test.go
@@ -101,7 +101,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -353,7 +353,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -440,7 +440,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkAllCopyRules(`
myinclude/Test.h -> include/myinclude/Test.h
.intermediates/mynativelib1/android_arm64_armv8-a_shared/mynativelib1.so -> arm64/lib/mynativelib1.so
@@ -486,7 +486,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -556,7 +556,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -615,7 +615,7 @@
}
`)
- CheckSnapshot(result, "mymodule_exports", "",
+ CheckSnapshot(t, result, "mymodule_exports", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -700,7 +700,7 @@
}
`)
- CheckSnapshot(result, "myexports", "",
+ CheckSnapshot(t, result, "myexports", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -859,7 +859,7 @@
}
`)
- CheckSnapshot(result, "myexports", "",
+ CheckSnapshot(t, result, "myexports", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -997,7 +997,7 @@
}
`)
- CheckSnapshot(result, "mymodule_exports", "",
+ CheckSnapshot(t, result, "mymodule_exports", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1105,7 +1105,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1206,7 +1206,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1303,7 +1303,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1430,7 +1430,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1558,7 +1558,7 @@
}
`)
- CheckSnapshot(result, "myexports", "",
+ CheckSnapshot(t, result, "myexports", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1621,7 +1621,7 @@
}
`)
- CheckSnapshot(result, "myexports", "",
+ CheckSnapshot(t, result, "myexports", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1735,7 +1735,7 @@
}
`)
- CheckSnapshot(result, "myexports", "",
+ CheckSnapshot(t, result, "myexports", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1849,7 +1849,7 @@
}
`)
- CheckSnapshot(result, "myexports", "",
+ CheckSnapshot(t, result, "myexports", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1946,7 +1946,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1984,7 +1984,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -2086,7 +2086,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -2118,7 +2118,6 @@
},
}
`),
- // Verifi
checkVersionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -2199,7 +2198,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -2272,7 +2271,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -2383,7 +2382,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -2436,7 +2435,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -2549,7 +2548,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -2664,7 +2663,7 @@
}
`)
- CheckSnapshot(result, "mysdk", "",
+ CheckSnapshot(t, result, "mysdk", "",
checkUnversionedAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.