Snap for 5335558 from 1410f65a869282fff15a79e0bc14469290ba66ae to pi-qpr3-b-release
Change-Id: I6e0e113ff9882b9cf2c346a0132ef936d3a8df69
diff --git a/BUILD.gtest b/BUILD.gtest
new file mode 120000
index 0000000..fc79edf
--- /dev/null
+++ b/BUILD.gtest
@@ -0,0 +1 @@
+../../core/nugget/BUILD.gtest
\ No newline at end of file
diff --git a/WORKSPACE b/WORKSPACE
index 36b1015..c30e236 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,25 +1,27 @@
workspace(name = "nugget_test_systemtestharness")
-new_http_archive(
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
name = "gtest",
url = "https://github.com/google/googletest/archive/release-1.8.0.zip",
- build_file = "../../core/nugget/BUILD.gtest",
+ build_file = "@//:BUILD.gtest",
sha256 = "f3ed3b58511efd272eb074a3a6d6fb79d7c2e6a0e374323d1e6bcbcc1ef141bf",
strip_prefix = "googletest-release-1.8.0",
)
http_archive(
name = "com_google_protobuf",
- url = "https://github.com/google/protobuf/archive/v3.5.0.zip",
- strip_prefix = "protobuf-3.5.0",
- sha256 = "cef7f1b5a7c5fba672bec2a319246e8feba471f04dcebfe362d55930ee7c1c30",
+ url = "https://github.com/google/protobuf/archive/v3.6.1.2.zip",
+ strip_prefix = "protobuf-3.6.1.2",
+ sha256 = "d6618d117698132dadf0f830b762315807dc424ba36ab9183f1f436008a2fdb6",
)
http_archive(
name = "com_google_protobuf_cc",
- url = "https://github.com/google/protobuf/archive/v3.5.0.zip",
- strip_prefix = "protobuf-3.5.0",
- sha256 = "cef7f1b5a7c5fba672bec2a319246e8feba471f04dcebfe362d55930ee7c1c30",
+ url = "https://github.com/google/protobuf/archive/v3.6.1.2.zip",
+ strip_prefix = "protobuf-3.6.1.2",
+ sha256 = "d6618d117698132dadf0f830b762315807dc424ba36ab9183f1f436008a2fdb6",
)
http_archive(
diff --git a/scripts/release-tests.sh b/scripts/release-tests.sh
index 155e9ac..9b7378f 100755
--- a/scripts/release-tests.sh
+++ b/scripts/release-tests.sh
@@ -25,12 +25,10 @@
function keymaster_vts_tests() {
m -j VtsHalKeymasterV4_0TargetTest || return 1
adb sync data || return 1
- # TODO(b/109771020): remove test filter below.
adb shell \
/data/nativetest64/VtsHalKeymasterV4_0TargetTest/VtsHalKeymasterV4_0TargetTest \
--verbose \
- --hal_service_instance=android.hardware.keymaster@4.0::IKeymasterDevice/strongbox \
- --gtest_filter=-EncryptionOperationsTest.RsaNoPaddingShortMessage || return 1
+ --hal_service_instance=android.hardware.keymaster@4.0::IKeymasterDevice/strongbox || return 1
}
function weaver_cts_tests() {
