summaryrefslogtreecommitdiffstats
path: root/core/Makefile
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-02-28 17:16:06 -0800
committerYing Wang <wangying@google.com>2014-02-28 18:23:06 -0800
commit79e8319b2ea622d487a56498d657440f5935e9e9 (patch)
treeabc84af4b117e88925f32eede174ef69acd8c1e8 /core/Makefile
parent2bd77d5ebe55e0b7ac9ae4f84ec76b0c82e317a4 (diff)
downloadbuild-79e8319b2ea622d487a56498d657440f5935e9e9.zip
build-79e8319b2ea622d487a56498d657440f5935e9e9.tar.gz
build-79e8319b2ea622d487a56498d657440f5935e9e9.tar.bz2
Try to catch more misuse of $(my-dir).
Change-Id: I0c07d7115c66b30ba1383dfaa133f0cc40a33ad7
Diffstat (limited to 'core/Makefile')
-rw-r--r--core/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile
index 71eeb2e..1a008d8 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
@@ -644,10 +648,6 @@ 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