commit 00d2931be3e8ef12a4c7d8a4cc0426392ef78e12
author Pin-chih Lin <johnylin@google.com> Wed May 15 20:47:08 2019 +0800
committer Pin-chih Lin <johnylin@google.com> Fri May 31 10:58:44 2019 +0800
tree 55e65ac299666076139bc4db0abe5710c0617526
parent df0e017ce5cbb5893237abba244db9417d0dfa6f

C2VEAComponent: enclose C2VEAAProxy into V4L2_CODEC2_ARC def

C2VEAAProxy should be compiled and instanced only on cheets_* image.

Bug: 129747937
Test: build bertha_x86_64-eng on pi-arcvm-dev branch
Change-Id: I2378879874b9a0052bdcd9f6a7c83486e69e47a7
(cherry picked from commit 46d04c3e6ade9d1f95811a0dcd18896ce64b0566)

C2VEAComponent.cpp

diff --git a/C2VEAComponent.cpp b/C2VEAComponent.cpp
index edf2c92..548d5a7 100644
--- a/C2VEAComponent.cpp
+++ b/C2VEAComponent.cpp
@@ -5,7 +5,9 @@
 //#define LOG_NDEBUG 0
 #define LOG_TAG "C2VEAComponent"
 
+#ifdef V4L2_CODEC2_ARC
 #include <C2VEAAdaptorProxy.h>
+#endif
 #include <C2VEAComponent.h>
 
 #include <video_codecs.h>
@@ -231,7 +233,9 @@
     setDerivedInstance(this);
 
     // Create new VEAAdaptor.
+#ifdef V4L2_CODEC2_ARC
     adaptor->reset(new arc::C2VEAAdaptorProxy());
+#endif
 
     // Query supported profiles in the beginning. Currently only profiles and max resolution are
     // taken into account.