Revert "Fix build: Revert "Try to catch more misuse of $(my-dir).""
This reverts commit 4f6e8342ace107faa09f47bef5924882904d0634.
diff --git a/core/Makefile b/core/Makefile
index f0e8458..e7eafe8 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1,5 +1,9 @@
# 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
@@ -650,10 +654,6 @@
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