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

Commit 6d8b06f2 authored by Espen Fjellvær Olsen's avatar Espen Fjellvær Olsen Committed by Brint E. Kriebel
Browse files

Fix building when OUT_DIR is out of ANDROID_BUILD_TOP 

This broke in http://review.cyanogenmod.com/#/c/23686/ / http://review.cyanogenmod.com/#/c/23687/

Change-Id: I9dc77a1fb465a30c833262ba3b1de3d2f0f968f0
parent 5e703b2e

core/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -1266,7 +1266,12 @@ ifeq ($(TARGET_BUILD_TYPE),debug) 
endif

name := $(name)-ota-$(FILE_NAME_TAG)



ifeq ($(OUT_DIR),out)

INTERNAL_OTA_PACKAGE_TARGET := $(ANDROID_BUILD_TOP)/$(PRODUCT_OUT)/$(name).zip

APKCERTS_FILE := $(ANDROID_BUILD_TOP)/$(APKCERTS_FILE)

else

INTERNAL_OTA_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip

endif



$(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
@@ -1308,10 +1313,10 @@ otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) 
bacon: otapackage

ifneq ($(TARGET_CUSTOM_RELEASETOOL),)

	@echo "Running custom releasetool..."

	$(hide) OTAPACKAGE=$(PWD)/$(INTERNAL_OTA_PACKAGE_TARGET) $(TARGET_CUSTOM_RELEASETOOL)

	$(hide) OTAPACKAGE=$(INTERNAL_OTA_PACKAGE_TARGET) APKCERTS=$(APKCERTS_FILE) $(TARGET_CUSTOM_RELEASETOOL)

else

	@echo "Running releasetool..."

	$(hide) OTAPACKAGE=$(PWD)/$(INTERNAL_OTA_PACKAGE_TARGET) ./vendor/cm/tools/squisher

	$(hide) OTAPACKAGE=$(INTERNAL_OTA_PACKAGE_TARGET) APKCERTS=$(APKCERTS_FILE) ./vendor/cm/tools/squisher

endif



# -----------------------------------------------------------------