diff options
| author | Ying Wang <wangying@google.com> | 2014-03-01 09:27:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-01 09:27:43 -0800 |
| commit | a623064131f23412daa0ac4b333320e2e30d85f0 (patch) | |
| tree | abc84af4b117e88925f32eede174ef69acd8c1e8 /core/Makefile | |
| parent | d86da81fc49bcde9a5328779d13783a744ebadbb (diff) | |
| parent | 26bcd6404031a491bfd5314d605a7dcc6b64727b (diff) | |
| download | build-a623064131f23412daa0ac4b333320e2e30d85f0.zip build-a623064131f23412daa0ac4b333320e2e30d85f0.tar.gz build-a623064131f23412daa0ac4b333320e2e30d85f0.tar.bz2 | |
am 26bcd640: Merge "Try to catch more misuse of ."
* commit '26bcd6404031a491bfd5314d605a7dcc6b64727b':
Try to catch more misuse of $(my-dir).
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 8 |
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 |