Snap for 8637088 from b470192eba2fb75babeddb0674f77ef58db23522 to tm-releaseandroid-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-release

Change-Id: Iee088de54908122f679583b66cc22ddb97d2da55

1 files changed, 2 insertions, 5 deletions

diff --git a/cameraservice/vts/functional/Android.bp b/cameraservice/vts/functional/Android.bp
index 26c09ec..1bca510 100644
--- a/cameraservice/vts/functional/Android.bp
+++ b/cameraservice/vts/functional/Android.bp
@@ -22,6 +22,7 @@ cc_test {
     name: "VtsHalCameraServiceV2_0TargetTest",
     defaults: ["VtsHalTargetTestDefaults"],
 
+    vendor: true,
     srcs: ["VtsHalCameraServiceV2_0TargetTest.cpp"],
     static_libs: [
         "android.hardware.camera.common@1.0-helper",
@@ -32,6 +33,7 @@ cc_test {
         "android.frameworks.cameraservice.service@2.2",
         "android.frameworks.cameraservice.common@2.0",
         "libfmq",
+        "libarect",
     ],
     shared_libs: [
         "libcamera_metadata",
@@ -40,10 +42,5 @@ cc_test {
         "liblog",
     ],
 
-    cflags: [
-        // TODO: Currently vts tests can't be vendor:true tests if they use VtsHalHidlTargetTestBase
-        //       (http://b/123320603). This is needed for libmediandk's llndk only api.
-        "-D__ANDROID_VNDK__",
-    ],
     test_suites: ["vts"],
 }