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

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

Merge "Disable riscv64 dependency on bcc and ld.mc" am: d2b9ad4e am: 01321a6b am: cdbc794c 

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



Change-Id: Iaa151c740697ab6e041a8980dcc1a9266fb5ef2c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08cf8f99 cdbc794c

core/main.mk

+7 −0
Original line number Diff line number Diff line
@@ -1345,6 +1345,13 @@ else ifdef FULL_BUILD 
                  $(if $(ALL_MODULES.$(m).INSTALLED),\

                    $(if $(filter-out $(HOST_OUT_ROOT)/%,$(ALL_MODULES.$(m).INSTALLED)),,\

                      $(m))))

    ifeq ($(TARGET_ARCH),riscv64)

      # HACK: riscv64 can't build the device version of bcc and ld.mc due to a

      # dependency on an old version of LLVM, but they are listed in

      # base_system.mk which can't add them conditionally based on the target

      # architecture.

      _host_modules := $(filter-out bcc ld.mc,$(_host_modules))

    endif

    $(call maybe-print-list-and-error,$(sort $(_host_modules)),\

      Host modules should be in PRODUCT_HOST_PACKAGES$(comma) not PRODUCT_PACKAGES)

  endif