commit 7e62631ea455cfb5c32abf6f668f948bad5d1cfd
author Changyeon Jo <changyeon@google.com> Mon Mar 13 22:44:01 2023 +0000
committer Changyeon Jo <changyeon@google.com> Fri Mar 24 21:03:12 2023 +0000
tree 591b26b01a5f492082ae09d4e8ecd4eb95473888
parent 8b0f27d7d01d62d9adc4cd958969144caa9aefea

Revert "Revert "Add default implementation of AIDL EVS interface""

This reverts commit d12e05929a18baf5f89b7d85e5c59483d1a793d0.

Bug: 218588089
Test: 1. Build cf_x86_64_auto lunch target.
      2. Launch cvd in the accelerated graphics mode.
      3. atest VtsHalEvsTargetTest and confirm that EVS HAL
         implementation passes all test cases except
         CameraStreamExternalBuffering that is not supported yet in new
         implementation.
      4. Run evs_app and confirm the color bar pattern is shown on the
         display.
         > adb root && adb shell evs_app --test
      5. Do the same on sdk_car_x86_64 lunch target.
Change-Id: I4647d0ef7a2bd98fdfcb3833bfb060b4063bc42e

automotive/evs/aidl/impl/default/Android.bp

diff --git a/automotive/evs/aidl/impl/default/Android.bp b/automotive/evs/aidl/impl/default/Android.bp
index dbe0314..bf6c0be 100644
--- a/automotive/evs/aidl/impl/default/Android.bp
+++ b/automotive/evs/aidl/impl/default/Android.bp
@@ -24,13 +24,56 @@
 cc_binary {
     name: "android.hardware.automotive.evs-aidl-default-service",
     defaults: ["EvsHalDefaults"],
-    local_include_dirs: ["include"],
-    vintf_fragments: ["evs-default-service.xml"],
+    vintf_fragments: ["manifest_evs-default-service.xml"],
     init_rc: ["evs-default-service.rc"],
     vendor: true,
     relative_install_path: "hw",
-    srcs: ["src/*.cpp"],
-    shared_libs: [
-        "libbinder_ndk",
+    cflags: [
+        "-DGL_GLEXT_PROTOTYPES",
+        "-DEGL_EGLEXT_PROTOTYPES",
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+        "-Wthread-safety",
     ],
+    srcs: [
+        ":libgui_frame_event_aidl",
+        "src/*.cpp"
+    ],
+    shared_libs: [
+        "android.hardware.graphics.bufferqueue@1.0",
+        "android.hardware.graphics.bufferqueue@2.0",
+        "android.hidl.token@1.0-utils",
+        "libEGL",
+        "libGLESv2",
+        "libbase",
+        "libbinder_ndk",
+        "libbufferqueueconverter",
+        "libcamera_metadata",
+        "libhardware_legacy",
+        "libhidlbase",
+        "liblog",
+        "libnativewindow",
+        "libtinyxml2",
+        "libui",
+        "libutils",
+        "libyuv",
+    ],
+    static_libs: [
+        "android.frameworks.automotive.display-V1-ndk",
+        "android.hardware.automotive.evs-V1-ndk",
+        "android.hardware.common-V2-ndk",
+        "libaidlcommonsupport",
+        "libcutils",
+    ],
+    local_include_dirs: ["include"],
+    include_dirs: ["frameworks/native/include/"],
+    required: ["evs_mock_hal_configuration.xml"],
+}
+
+prebuilt_etc {
+    name: "evs_mock_hal_configuration.xml",
+    soc_specific: true,
+    src: "resources/evs_mock_configuration.xml",
+    sub_dir: "automotive/evs",
 }