diff options
| author | Chirayu Desai <chirayudesai1@gmail.com> | 2012-09-27 18:11:25 +0530 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-17 17:56:51 +0000 |
| commit | 4bdb0d7bb8a5c881ee178c4dc16964acb4625894 (patch) | |
| tree | 61a19074d9548956078b1bde2c6f19792812db65 /core/Makefile | |
| parent | b0c52e0c5bdbd1b50925daf334f1192f8588d390 (diff) | |
| download | build-4bdb0d7bb8a5c881ee178c4dc16964acb4625894.zip build-4bdb0d7bb8a5c881ee178c4dc16964acb4625894.tar.gz build-4bdb0d7bb8a5c881ee178c4dc16964acb4625894.tar.bz2 | |
envsetup: set OUT_DIR to an absolute path always
OUT_DIR was set to $(TOPDIR)out previously,
but $(TOPDIR) was null, so it was a relative path.
This broke releasetools, inline kernel building, etc
since they require absolute paths.
Fix it so that it is set to $(shell readlink -f .)/out
if $(TOPDIR) is null.
Also remove hacks which checked if (OUT_DIR) was out
and changed it to $(ANDROID_BUILD_TOP)/out to workaround
the aforementioned problem.
Change-Id: I459a3b1325a1bbea0565cd73f6acf160d4ed9b39
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/Makefile b/core/Makefile index 039b227..bf76610 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1279,12 +1279,7 @@ 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) |