diff options
| author | 2021-03-02 23:54:08 -0800 | |
|---|---|---|
| committer | 2021-03-03 13:56:48 -0800 | |
| commit | dc24d88aa99bcea5a333788f1936133d4b8768c1 (patch) | |
| tree | 165fdbfa419b03e161cb392311a3432ae3d93bc2 | |
| parent | 36c1435ec4ac40dc273c916028d7f818f71ae9f3 (diff) | |
Rename vendor-ramdisk to vendor_ramdisk
Rename to get consistent ramdisk directory naming in
out/target/product/<name>:
debug_ramdisk
ramdisk
vendor_debug_ramdisk
vendor_ramdisk
Test: build and inspect out/target/product/<name>
Change-Id: I81d8f2cafe5e1b9024196cd74772b78d4a4aec58
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/envsetup.mk | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 41defb208f..3beadff9b0 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 diff --git a/core/Makefile b/core/Makefile index cb5e44cb72..ed9465da86 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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)) diff --git a/core/envsetup.mk b/core/envsetup.mk index 33f4f25780..8c25086a41 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -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 |