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

Commit 0d88e5b1 authored Oct 03, 2012 by Steve Kondik Committed by Gerrit Code Review Oct 03, 2012

Merge "envsetup: set OUT_DIR to an absolute path always" into jellybean

parents eb74c2f2 21439c93

core/Makefile

+0 −5

Original line number	Diff line number	Diff line
		@@ -1266,12 +1266,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)

core/base_rules.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -526,11 +526,7 @@ ifndef LOCAL_UNINSTALLABLE_MODULE
		# installation; hence, LOCAL_ACP_UNAVAILABLE.
		ifneq ($(LOCAL_ACP_UNAVAILABLE),true)
		$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) \| $(ACP)
		ifeq ($(OUT_DIR),out)
		@echo -e ${CL_INS}"Install: $(ANDROID_BUILD_TOP)/$@"${CL_RST}
		else
		@echo -e ${CL_INS}"Install: $@"${CL_RST}
		endif
		$(copy-file-to-new-target)
		else
		$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

core/envsetup.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -158,8 +158,12 @@ endif

		ifeq (,$(strip $(OUT_DIR)))
		ifeq (,$(strip $(OUT_DIR_COMMON_BASE)))
		ifneq ($(TOPDIR),)
		OUT_DIR := $(TOPDIR)out
		else
		OUT_DIR := $(shell readlink -f .)/out
		endif
		else
		OUT_DIR := $(OUT_DIR_COMMON_BASE)/$(notdir $(PWD))
		endif
		endif

core/tasks/kernel.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -24,11 +24,7 @@ KERNEL_SRC := $(TARGET_KERNEL_SOURCE)
		KERNEL_DEFCONFIG := $(TARGET_KERNEL_CONFIG)

		## Internal variables
		ifeq ($(OUT_DIR),out)
		KERNEL_OUT := $(ANDROID_BUILD_TOP)/$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ
		else
		KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ
		endif
		KERNEL_CONFIG := $(KERNEL_OUT)/.config

		ifeq ($(BOARD_USES_UBOOT),true)