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

Commit 216040ca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Makefile: exclude cache symlink on devices with no cache partition" into nyc-mr1-dev

parents e71fa0d8 f3b0dc29

core/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ define build-recoveryimage-target 
  $(hide) mkdir -p $(TARGET_RECOVERY_OUT)

  $(hide) mkdir -p $(TARGET_RECOVERY_ROOT_OUT)/etc $(TARGET_RECOVERY_ROOT_OUT)/sdcard $(TARGET_RECOVERY_ROOT_OUT)/tmp

  @echo Copying baseline ramdisk...

  $(hide) rsync -a --exclude=etc --exclude=sdcard $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) # "cp -Rf" fails to overwrite broken symlinks on Mac.

  $(hide) rsync -a --exclude=etc --exclude=sdcard $(IGNORE_CACHE_LINK) $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT) # "cp -Rf" fails to overwrite broken symlinks on Mac.

  @echo Modifying ramdisk contents...

  $(hide) rm -f $(TARGET_RECOVERY_ROOT_OUT)/init*.rc

  $(hide) cp -f $(recovery_initrc) $(TARGET_RECOVERY_ROOT_OUT)/
@@ -1391,6 +1391,9 @@ $(INSTALLED_CACHEIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_CACHEIMAG 
cacheimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS)

	$(build-cacheimage-target)



else # BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE

# we need to ignore the broken cache link when doing the rsync

IGNORE_CACHE_LINK := --exclude=cache

endif # BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE