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

Commit eaaae159 authored by Trevor Radcliffe's avatar Trevor Radcliffe Committed by Automerger Merge Worker
Browse files

Merge "Add comment for previous CL" am: 1e63a893 am: 7cecfb7f 

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



Change-Id: Iaecb70a18e68e9082d40d7debf129b7554cf391f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3033cc59 7cecfb7f

core/base_rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -713,6 +713,7 @@ ifeq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS) 
endif

ifdef LOCAL_MULTILIB

  multi_arch := true

# These conditionals allow this functionality to be mimicked in Soong

else ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))

  ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)

    multi_arch := true