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

Commit 7c970b4b authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge changes from topic "odm_dlkm" am: 997d2276 am: a3145919 

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

Change-Id: I3d653c3ba350ca9d4b44ee0e5aa5e2bf69bb0241
parents 3406d5c3 a3145919

core/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2806,6 +2806,7 @@ endif 
# are not guaranteed to exist on all devices.

ifdef BOARD_USES_VENDOR_DLKMIMAGE

define create-vendor-vendor_dlkm-symlink

$(hide) mkdir -p $(TARGET_OUT_VENDOR)/lib

$(hide) if [ -d $(TARGET_OUT_VENDOR)/lib/modules ] && [ ! -h $(TARGET_OUT_VENDOR)/lib/modules ]; then \

  echo 'Non-symlink $(TARGET_OUT_VENDOR)/lib/modules detected!' 1>&2; \

  echo 'You cannot install files to $(TARGET_OUT_VENDOR)/lib/modules while building a separate vendor_dlkm.img!' 1>&2; \
@@ -2834,6 +2835,7 @@ endif 
# are not guaranteed to exist on all devices.

ifdef BOARD_USES_ODM_DLKMIMAGE

define create-odm-odm_dlkm-symlink

$(hide) mkdir -p $(TARGET_OUT_ODM)/lib

$(hide) if [ -d $(TARGET_OUT_ODM)/lib/modules ] && [ ! -h $(TARGET_OUT_ODM)/lib/modules ]; then \

  echo 'Non-symlink $(TARGET_OUT_ODM)/lib/modules detected!' 1>&2; \

  echo 'You cannot install files to $(TARGET_OUT_ODM)/lib/modules while building a separate odm_dlkm.img!' 1>&2; \