summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMykhailo Sopiha2018-05-23 15:31:51 -0500
committerPraneeth Bajjuri2018-05-23 17:04:09 -0500
commit0675d6ab279b995c4ca034cdda272b561a11fa4b (patch)
treea7ca5fb5da2160ce6f3267d70db87f1298d8b571
parenta5c9703a823bb7c503fadfb4b273190476f73623 (diff)
downloaddevice-ti-proprietary-open-0675d6ab279b995c4ca034cdda272b561a11fa4b.tar.gz
device-ti-proprietary-open-0675d6ab279b995c4ca034cdda272b561a11fa4b.tar.xz
device-ti-proprietary-open-0675d6ab279b995c4ca034cdda272b561a11fa4b.zip
jacinto6: Fix build for manual Android out dir
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.mk4
-rw-r--r--jacinto6/sgx_src/eurasia_km/eurasiacon/build/linux2/common/android/paths.mk8
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
35 ARCH=arm \ 35 ARCH=arm \
36 ANDROID_ROOT=$(ANDROID_BUILD_TOP) \ 36 ANDROID_ROOT=$(ANDROID_BUILD_TOP) \
37 PLATFORM_RELEASE="8.0" \ 37 PLATFORM_RELEASE="8.0" \
38 OUT=$(ANDROID_BUILD_TOP)/$(out-intermediates) 38 OUT=$(abspath $(out-intermediates))
39 @$(ACP) -fp $(ANDROID_BUILD_TOP)/$(out-intermediates)/target_armv7-a/$(MODULE_TARGET) $@ 39 @$(ACP) -fp $(abspath $(out-intermediates))/target_armv7-a/$(MODULE_TARGET) $@
40 @echo "Finished building $@" 40 @echo "Finished building $@"
41 41
42GEN := $(out-intermediates)/$(MODULE_TARGET) 42GEN := $(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
43HOST_OS ?= linux 43HOST_OS ?= linux
44HOST_ARCH ?= x86 44HOST_ARCH ?= x86
45 45
46OUT_DIR ?= $(ANDROID_ROOT)/out 46ifeq ($(wildcard $(OUT_DIR)),)
47OUT_DIR = $(ANDROID_ROOT)/out
48endif
47 49
48ifeq ($(TARGET_BUILD_TYPE),debug) 50ifeq ($(TARGET_BUILD_TYPE),debug)
49TARGET_ROOT := $(ANDROID_ROOT)/out/debug/target 51TARGET_ROOT := $(OUT_DIR)/debug/target
50else 52else
51TARGET_ROOT := $(ANDROID_ROOT)/out/target 53TARGET_ROOT := $(OUT_DIR)/target
52endif 54endif
53 55
54ifeq ($(NDK_ROOT),) 56ifeq ($(NDK_ROOT),)