diff options
| author | 2019-04-24 06:53:14 +0000 | |
|---|---|---|
| committer | 2019-04-24 06:53:14 +0000 | |
| commit | 913478401a6c9718d4133f4cf7f28ba2d71a8b6c (patch) | |
| tree | 60c7df8b3b763a3a85c58be31de2df15fc41a03d | |
| parent | 2f401655a9398acfdebfd22c429dffb46457f34f (diff) | |
| parent | c3e8cc9bd13f0ac0c61595b237006c56dc572826 (diff) | |
Merge "Fix aosp_arm64 build error when `make ramdisk_debug`"
| -rw-r--r-- | core/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile index 73615503b4..d00f7bf302 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1982,9 +1982,14 @@ endif # BOARD_USES_RECOVERY_AS_BOOT $(INSTALLED_DEBUG_RAMDISK_TARGET): DEBUG_RAMDISK_SYNC_DIR := $(my_debug_ramdisk_sync_dir) $(INSTALLED_DEBUG_RAMDISK_TARGET): DEBUG_RAMDISK_ROOT_DIR := $(my_debug_ramdisk_root_dir) -# We should have just depended on ramdisk.img or ramdisk-recovery.img. -# But ramdisk-recovery.img is not a make target, so let's depend on the boot.img directly. + +ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) +# ramdisk-recovery.img isn't a make target, need to depend on boot.img if it's for recovery. $(INSTALLED_DEBUG_RAMDISK_TARGET): $(INSTALLED_BOOTIMAGE_TARGET) +else +# Depends on ramdisk.img, note that some target has ramdisk.img but no boot.img, e.g., emulator. +$(INSTALLED_DEBUG_RAMDISK_TARGET): $(INSTALLED_RAMDISK_TARGET) +endif # BOARD_USES_RECOVERY_AS_BOOT $(INSTALLED_DEBUG_RAMDISK_TARGET): $(MKBOOTFS) $(INTERNAL_DEBUG_RAMDISK_FILES) | $(MINIGZIP) $(call pretty,"Target debug ram disk: $@") mkdir -p $(TARGET_DEBUG_RAMDISK_OUT) |