Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40a8efb2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Package shared lib for camera-hal-tests" into main am: b98d218d 

Original change: https://android-review.googlesource.com/c/platform/build/+/3272860



Change-Id: I8237e9c03473e8bdbdfe84a5dfadbd9abfde43d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 39d07fc3 b98d218d

core/main.mk

+2 −2
Original line number Diff line number Diff line
@@ -687,12 +687,12 @@ endef 
# Scan all modules in general-tests, device-tests and other selected suites and

# flatten the shared library dependencies.

define update-host-shared-libs-deps-for-suites

$(foreach suite,general-tests device-tests vts tvts art-host-tests host-unit-tests,\

$(foreach suite,general-tests device-tests vts tvts art-host-tests host-unit-tests camera-hal-tests,\

  $(foreach m,$(COMPATIBILITY.$(suite).MODULES),\

    $(eval my_deps := $(call get-all-shared-libs-deps,$(m)))\

    $(foreach dep,$(my_deps),\

      $(foreach f,$(ALL_MODULES.$(dep).HOST_SHARED_LIBRARY_FILES),\

        $(if $(filter $(suite),device-tests general-tests art-host-tests host-unit-tests),\

        $(if $(filter $(suite),device-tests general-tests art-host-tests host-unit-tests camera-hal-tests),\

          $(eval my_testcases := $(HOST_OUT_TESTCASES)),\

          $(eval my_testcases := $$(COMPATIBILITY_TESTCASES_OUT_$(suite))))\

        $(eval target := $(my_testcases)/$(lastword $(subst /, ,$(dir $(f))))/$(notdir $(f)))\