• R/O
  • HTTP
  • SSH
  • HTTPS

提交

标签
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

hardware/intel/common/libva


Commit MetaInfo

修订版cfcd7c5e1a65a08b36ae3114f7248f5fb92ed64b (tree)
时间2017-04-26 14:25:29
作者Chih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

android: fix the rules to generate va_version.h

Android source tree has to be read-only. The generated files should
be put to the $(OUT)/gen/ dir. Besides, LOCAL_GENERATED_SOURCES must
be set before include $(BUILD_SHARED_LIBRARY). Otherwise it has no
effect.

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>

更改概述

差异

--- a/va/Android.mk
+++ b/va/Android.mk
@@ -82,19 +82,21 @@ LOCAL_COPY_HEADERS_TO := libva/va
8282
8383 LOCAL_MODULE_TAGS := optional
8484 LOCAL_MODULE := libva
85+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
8586
8687 LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils liblog
8788
88-include $(BUILD_SHARED_LIBRARY)
89+intermediates := $(call local-generated-sources-dir)
8990
90-GEN := $(LOCAL_PATH)/va_version.h
91+GEN := $(intermediates)/va/va_version.h
9192 $(GEN): SCRIPT := $(LOCAL_PATH)/../build/gen_version.sh
92-$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
93-$(GEN): PRIVATE_CUSTOM_TOOL = sh $(SCRIPT) $(PRIVATE_PATH)/.. $(PRIVATE_PATH)/va_version.h.in > $@
94-$(GEN): $(LOCAL_PATH)/%.h : $(LOCAL_PATH)/%.h.in $(SCRIPT) $(LOCAL_PATH)/../configure.ac
93+$(GEN): PRIVATE_CUSTOM_TOOL = sh $(SCRIPT) $(<D)/.. $< > $@
94+$(GEN): $(intermediates)/va/%.h : $(LOCAL_PATH)/%.h.in $(LOCAL_PATH)/../configure.ac
9595 $(transform-generated-source)
9696 LOCAL_GENERATED_SOURCES += $(GEN)
9797
98+include $(BUILD_SHARED_LIBRARY)
99+
98100 # For libva-android
99101 # =====================================================
100102