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

Commit b10f7d2a authored by Petri Gynther's avatar Petri Gynther Committed by Gerrit Code Review
Browse files

Merge "Rename vendor-ramdisk to vendor_ramdisk"

parents 35d002f9 dc24d88a

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -754,6 +754,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/prop.default) 
# Workaround for Soong not being able to rebuild the host binary if its

# JNI dependencies change: b/170389375

$(call add-clean-step, rm -rf $(OUT_DIR)/soong/host/*/lib*/libconscrypt_openjdk_jni.so)

# vendor-ramdisk renamed to vendor_ramdisk

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor-ramdisk)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -1257,7 +1257,7 @@ license_modules_rehomed += $(filter $(PRODUCT_OUT)/root/%,$(license_modules_rest 
license_modules_rehomed += $(filter $(PRODUCT_OUT)/data/%,$(license_modules_rest))

license_modules_rehomed += $(filter $(PRODUCT_OUT)/ramdisk/%,$(license_modules_rest))

license_modules_rehomed += $(filter $(PRODUCT_OUT)/debug_ramdisk/%,$(license_modules_rest))

license_modules_rehomed += $(filter $(PRODUCT_OUT)/vendor-ramdisk/%,$(license_modules_rest))

license_modules_rehomed += $(filter $(PRODUCT_OUT)/vendor_ramdisk/%,$(license_modules_rest))

license_modules_rehomed += $(filter $(PRODUCT_OUT)/persist/%,$(license_modules_rest))

license_modules_rehomed += $(filter $(PRODUCT_OUT)/persist.img,$(license_modules_rest))

license_modules_rehomed += $(filter $(PRODUCT_OUT)/system_other/%,$(license_modules_rest))

core/envsetup.mk

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ _odm_path_placeholder := ||ODM-PATH-PH|| 
_vendor_dlkm_path_placeholder := ||VENDOR_DLKM-PATH-PH||

_odm_dlkm_path_placeholder := ||ODM_DLKM-PATH-PH||

TARGET_COPY_OUT_VENDOR := $(_vendor_path_placeholder)

TARGET_COPY_OUT_VENDOR_RAMDISK := vendor-ramdisk

TARGET_COPY_OUT_VENDOR_RAMDISK := vendor_ramdisk

TARGET_COPY_OUT_PRODUCT := $(_product_path_placeholder)

# TODO(b/135957588) TARGET_COPY_OUT_PRODUCT_SERVICES will copy the target to

# product