commit 1fcde2924ca4a1e65bf628e5273851ac48b84330
author Eino-Ville Talvala <etalvala@google.com> Mon Jun 03 11:53:05 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 03 11:53:05 2013 -0700
tree cfd43457093c72f536c3d967ac1e93edd0a67b96
parent 627b71fd43e5d77e35fa05f70c1e15b69242f1e2
parent 32b5cce78ce29a5e6e8a7a4e1667343c139d6513

am 32b5cce7: CtsVerifier: Fix PDK build.

* commit '32b5cce78ce29a5e6e8a7a4e1667343c139d6513':
  CtsVerifier: Fix PDK build.

apps/CtsVerifier/Android.mk

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
 

apps/CtsVerifier/AndroidManifest.xml

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">