CtsVerifier: Fix PDK build.
Remove libcameraanalyzer from the build, since it's only used
by the disabled CameraAnalyzer tests.
Bug: 9258891
Change-Id: I63f1100e3cb474b2725bb29fb76388ce3d8a3824
diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk
index c14728e..3b1674e 100644
--- a/apps/CtsVerifier/Android.mk
+++ b/apps/CtsVerifier/Android.mk
@@ -25,7 +25,8 @@
LOCAL_PACKAGE_NAME := CtsVerifier
-LOCAL_JNI_SHARED_LIBRARIES := libctsverifier_jni libcameraanalyzer
+LOCAL_JNI_SHARED_LIBRARIES := libctsverifier_jni \
+ #libcameraanalyzer # Needed for the disabled CameraAnalyzer tests
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index e75fcbb..88c5069 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -302,7 +302,7 @@
<meta-data android:name="test_required_features" android:value="android.hardware.camera.any"/>
</activity>
-<!-- Experimental
+<!-- Experimental. If re-enabling, libcameraanalyzer must be included in the build
<activity android:name=".camera.analyzer.CameraAnalyzerActivity"
android:label="@string/camera_analyzer"
android:screenOrientation="landscape">
