commit 0e0fd9ab54808180ef9ebe64f099b8713e425a72
author Changfei Chen <changfeichen@google.com> Tue Dec 10 16:51:20 2019 -0800
committer Changfei Chen <changfeichen@google.com> Thu Dec 12 14:34:04 2019 -0800
tree 47bdfdcb462eadbb595039169aae5a6703f50d1b
parent bd13fb76325d0d6a40daf4b096888da74b229118

Convert Camera Performance Test to JUnit4

Test: Run test locally
Test: Build CtsVerifier and test locally
Bug: 145607733
Change-Id: I81e568304f162bf0584931238c98078909ca4015

tests/camera/Android.mk

diff --git a/tests/camera/Android.mk b/tests/camera/Android.mk
index 083359a..df9e106 100644
--- a/tests/camera/Android.mk
+++ b/tests/camera/Android.mk
@@ -50,9 +50,9 @@
 	androidx.test.rules
 
 LOCAL_SRC_FILES := \
-	src/android/hardware/camera2/cts/testcases/Camera2AndroidBasicTestCase.java \
+	src/android/hardware/camera2/cts/testcases/Camera2AndroidTestRule.java \
 	src/android/hardware/camera2/cts/PerformanceTest.java \
-	src/android/hardware/cts/CameraTestCase.java \
+	src/android/hardware/cts/CameraPerformanceTestHelper.java \
 	src/android/hardware/cts/LegacyCameraPerformanceTest.java
 
 LOCAL_SDK_VERSION := test_current