diff options
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/core/Makefile b/core/Makefile index e14ff88..16eb5a1 100644 --- a/core/Makefile +++ b/core/Makefile @@ -477,8 +477,16 @@ else endif # TARGET_NO_BOOTLOADER ifneq ($(strip $(TARGET_NO_KERNEL)),true) INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel + INSTALLED_RECOVERY_KERNEL_TARGET := $(PRODUCT_OUT)/kernel-recovery else INSTALLED_KERNEL_TARGET := + INSTALLED_RECOVERY_KERNEL_TARGET := +endif + +ifeq ($(TARGET_XLOADER_MLO),true) +INSTALLED_XLOADER_MODULE := $(PRODUCT_OUT)/MLO +else +INSTALLED_XLOADER_MODULE := $(PRODUCT_OUT)/x-load.bin endif # ----------------------------------------------------------------- @@ -695,7 +703,7 @@ endif # TARGET_BUILD_APPS # make the target NOTICE files depend on this particular file too, which will # then be in the right directory for the find in combine-notice-files to work. $(kernel_notice_file): \ - prebuilts/qemu-kernel/arm/LINUX_KERNEL_COPYING \ + kernel/samsung/smdk4412/COPYING \ | $(ACP) @echo -e ${CL_CYN}"Copying:"${CL_RST}" $@" $(hide) mkdir -p $(dir $@) @@ -948,10 +956,6 @@ OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem ifneq ($(OTA_PACKAGE_SIGNING_KEY),) OTA_PUBLIC_KEYS := $(OTA_PACKAGE_SIGNING_KEY).x509.pem PRODUCT_EXTRA_RECOVERY_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) -else - PRODUCT_EXTRA_RECOVERY_KEYS += \ - build/target/product/security/cm \ - build/target/product/security/cm-devkey endif # Generate a file containing the keys that will be read by the @@ -1029,7 +1033,8 @@ $(recovery_ramdisk): $(MINIGZIP) \ $(hide) $(MINIGZIP) < $(recovery_uncompressed_ramdisk) > $@ ifndef BOARD_CUSTOM_BOOTIMG_MK -$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(recovery_ramdisk) $(recovery_kernel) \ +$(INSTALLED_RECOVERYIMAGE_TARGET): $(MKBOOTIMG) $(INTERNAL_BOOTIMAGE_FILES) \ + $(recovery_ramdisk) $(recovery_kernel) \ $(RECOVERYIMAGE_EXTRA_DEPS) @echo -e ${CL_CYN}"----- Making recovery image ------"${CL_RST} $(call build-recoveryimage-target, $@) @@ -1925,7 +1930,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS) $(if $(OEM_OTA_CONFIG), -o $(OEM_OTA_CONFIG)) \ $(BUILT_TARGET_FILES_PACKAGE) $@ -CM_TARGET_PACKAGE := $(PRODUCT_OUT)/lineage-$(LINEAGE_VERSION).zip +CM_TARGET_PACKAGE := $(PRODUCT_OUT)/$(REPLICANT_VERSION).zip .PHONY: otapackage bacon otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) @@ -2115,7 +2120,7 @@ sdk_dir := $(HOST_OUT)/sdk/$(TARGET_PRODUCT) # darwin-x86 --> android-sdk_12345_mac-x86 # windows-x86 --> android-sdk_12345_windows # -sdk_name := android-sdk_$(FILE_NAME_TAG) +sdk_name := replicant-sdk ifeq ($(HOST_OS),darwin) INTERNAL_SDK_HOST_OS_NAME := mac else |