diff options
| author | Mykhailo Sopiha <mykhailo.sopiha@linaro.org> | 2018-05-23 20:31:51 +0000 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2018-05-23 17:04:09 -0500 |
| commit | 0675d6ab279b995c4ca034cdda272b561a11fa4b (patch) | |
| tree | a7ca5fb5da2160ce6f3267d70db87f1298d8b571 | |
| parent | a5c9703a823bb7c503fadfb4b273190476f73623 (diff) | |
| download | proprietary-open-d-oreo-mr1-core-release.tar.gz | |
jacinto6: Fix build for manual Android out dird-oreo-mr1-core-release
While building Android image with manually set OUT_DIR_COMMON_BASE
faced with falures on building pvrsrvkm.ko intermediates: output
directory was a mix of default android output folder and
OUT_DIR_COMMON_BASE. Patch fixes this problem by changing dependencies
from root android directory to output directory and using absolute path
for out-intermediates in Android.mk for jacinto6.
Signed-off-by: Mykhailo Sopiha <mykhailo.sopiha@linaro.org>
Acked-by: Andrew F. Davis <afd@ti.com>
| -rw-r--r-- | jacinto6/sgx_src/Android.mk | 4 | ||||
| -rw-r--r-- | jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/jacinto6/sgx_src/Android.mk b/jacinto6/sgx_src/Android.mk index b5c011d..36dcb85 100644 --- a/jacinto6/sgx_src/Android.mk +++ b/jacinto6/sgx_src/Android.mk @@ -35,8 +35,8 @@ $(PVRSRVKM): $(local-build)/Makefile $(KERNELDIR)/.version ARCH=arm \ ANDROID_ROOT=$(ANDROID_BUILD_TOP) \ PLATFORM_RELEASE="8.0" \ - OUT=$(ANDROID_BUILD_TOP)/$(out-intermediates) - @$(ACP) -fp $(ANDROID_BUILD_TOP)/$(out-intermediates)/target_armv7-a/$(MODULE_TARGET) $@ + OUT=$(abspath $(out-intermediates)) + @$(ACP) -fp $(abspath $(out-intermediates))/target_armv7-a/$(MODULE_TARGET) $@ @echo "Finished building $@" GEN := $(out-intermediates)/$(MODULE_TARGET) diff --git a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk index 4debd7c..fa91e86 100644 --- a/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk +++ b/jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk @@ -43,12 +43,14 @@ TARGET_BUILD_TYPE ?= release HOST_OS ?= linux HOST_ARCH ?= x86 -OUT_DIR ?= $(ANDROID_ROOT)/out +ifeq ($(wildcard $(OUT_DIR)),) +OUT_DIR = $(ANDROID_ROOT)/out +endif ifeq ($(TARGET_BUILD_TYPE),debug) -TARGET_ROOT := $(ANDROID_ROOT)/out/debug/target +TARGET_ROOT := $(OUT_DIR)/debug/target else -TARGET_ROOT := $(ANDROID_ROOT)/out/target +TARGET_ROOT := $(OUT_DIR)/target endif ifeq ($(NDK_ROOT),) |