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

Commit 4f6e8342 authored by Ed Heyl's avatar Ed Heyl
Browse files

Fix build: Revert "Try to catch more misuse of $(my-dir)." 

This reverts commit 79e8319b.

Change-Id: I7d4d352da802deea870fbe4f61f7a7023460a405
parent f6f141a8

core/Makefile

+4 −4
Original line number Diff line number Diff line 
# Put some miscellaneous rules here



# HACK: clear LOCAL_PATH from including last build target before calling

# intermedites-dir-for

LOCAL_PATH := $(BUILD_SYSTEM)



# Pick a reasonable string to use to identify files.

ifneq "" "$(filter eng.%,$(BUILD_NUMBER))"

  # BUILD_NUMBER has a timestamp in it, which means that
@@ -654,6 +650,10 @@ ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY))) 


INSTALLED_RECOVERYIMAGE_TARGET := $(PRODUCT_OUT)/recovery.img



# HACK: clear LOCAL_PATH from including last build target before calling

# intermedites-dir-for

LOCAL_PATH := $(call my-dir)



recovery_initrc := $(call include-path-for, recovery)/etc/init.rc

recovery_kernel := $(INSTALLED_KERNEL_TARGET) # same as a non-recovery system

recovery_ramdisk := $(PRODUCT_OUT)/ramdisk-recovery.img

core/definitions.mk

+2 −5
Original line number Diff line number Diff line
@@ -118,15 +118,14 @@ endef 


###########################################################

## Retrieve the directory of the current makefile

## Must be called before including any other makefile!!

###########################################################



# Figure out where we are.

define my-dir

$(strip \

  $(eval LOCAL_MODULE_MAKEFILE := $$(lastword $$(MAKEFILE_LIST))) \

  $(if $(filter $(BUILD_SYSTEM)/% $(OUT_DIR)/%,$(LOCAL_MODULE_MAKEFILE)), \

    $(error my-dir must be called before including any other makefile.) \

  $(if $(filter $(CLEAR_VARS),$(LOCAL_MODULE_MAKEFILE)), \

    $(error LOCAL_PATH must be set before including $$(CLEAR_VARS)) \

   , \

    $(patsubst %/,%,$(dir $(LOCAL_MODULE_MAKEFILE))) \

   ) \
@@ -155,7 +154,6 @@ endef 


###########################################################

## Retrieve a list of all makefiles immediately below your directory

## Must be called before including any other makefile!!

###########################################################



define all-subdir-makefiles
@@ -165,7 +163,6 @@ endef 
###########################################################

## Look in the named list of directories for makefiles,

## relative to the current directory.

## Must be called before including any other makefile!!

###########################################################



# $(1): List of directories to look for under this directory