From 88770a3c3daba517114dea7cd263936b7a5a3ea5 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Thu, 6 Apr 2017 18:33:57 +0800 Subject: [PATCH] android: fix the rules to generate intel_version.h Android source tree has to be read-only. The generated files should be put to the $(OUT)/gen/ dir. Rewrite the makefile to be compliant with the rules. Signed-off-by: Chih-Wei Huang (cherry picked from commit a177751246b8d57aa6223060415fa4824b7cebf1) --- src/Android.mk | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Android.mk b/src/Android.mk index 1fbb773..b64f6d1 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -75,19 +75,21 @@ LOCAL_SRC_FILES := \ intel_media_common.c \ $(NULL) -GEN := $(LOCAL_PATH)/intel_version.h -$(GEN): SCRIPT := $(LOCAL_PATH)/../build/gen_version.sh -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = sh $(SCRIPT) $(PRIVATE_PATH)/.. $(PRIVATE_PATH) > $@ -$(GEN): $(LOCAL_PATH)/%.h : $(LOCAL_PATH)/%.h.in $(SCRIPT) - $(transform-generated-source) +LOCAL_MODULE := i965_drv_video +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := SHARED_LIBRARIES + +intermediates := $(call local-generated-sources-dir) + +GEN := $(intermediates)/intel_version.h +$(GEN): $(LOCAL_PATH)/intel_version.h.in $(wildcard $(LOCAL_PATH)/../.git/logs/HEAD) + @echo "Generating: $@ <= git"; mkdir -p $(@D) + $(hide) VER=`cd $( $@ LOCAL_GENERATED_SOURCES += $(GEN) LOCAL_CFLAGS := -DLINUX -g -Wall -Wno-unused -fvisibility=hidden -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := i965_drv_video - LOCAL_SHARED_LIBRARIES := libdl libdrm libdrm_intel libcutils \ libva libva-android libstdc++ -- 2.11.0