Merge changes from topic "odm_dlkm" am: 997d227648

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

Change-Id: I62b4a01ce8f1884bac7dab9d2381ae5a42d3a3d8
This commit is contained in:
Yifan Hong 2020-07-17 22:27:25 +00:00 committed by Automerger Merge Worker
commit a3145919f0

View file

@ -2804,6 +2804,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; \
@ -2832,6 +2833,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; \