OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: move the android build scripts a level up

Browse Source 
Analogous to previous commit.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Emil Velikov
2016-04-05 14:25:19 +01:00
committed by Emil Velikov
parent abf7088eb7
commit 4db8f15a25
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.mk
View File

@@ -91,7 +91,6 @@ SUBDIRS := \
src/loader \ src/loader \
src/mapi \ src/mapi \
src/compiler \ src/compiler \
src/compiler/glsl \
src/mesa \ src/mesa \
src/util \ src/util \
src/egl \ src/egl \

13
src/compiler/glsl/Android.gen.mk → src/compiler/Android.glsl.gen.mk
View File

@@ -32,8 +32,9 @@ intermediates := $(call local-generated-sources-dir)
LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) LOCAL_SRC_FILES := $(LOCAL_SRC_FILES)
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(intermediates)/glcpp \ $(intermediates)/glsl \
$(LOCAL_PATH)/glcpp \ $(LOCAL_PATH)/glsl \
$(LOCAL_PATH)/glsl/glcpp \
LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
$(LIBGLCPP_GENERATED_FILES) \ $(LIBGLCPP_GENERATED_FILES) \
@@ -65,14 +66,14 @@ define local-yy-to-cpp-and-h
rm -f $(@:$1=$(YACC_HEADER_SUFFIX)) rm -f $(@:$1=$(YACC_HEADER_SUFFIX))
endef endef
$(intermediates)/glsl_lexer.cpp: $(LOCAL_PATH)/glsl_lexer.ll $(intermediates)/glsl/glsl_lexer.cpp: $(LOCAL_PATH)/glsl/glsl_lexer.ll
$(call local-l-or-ll-to-c-or-cpp) $(call local-l-or-ll-to-c-or-cpp)
$(intermediates)/glsl_parser.cpp: $(LOCAL_PATH)/glsl_parser.yy $(intermediates)/glsl/glsl_parser.cpp: $(LOCAL_PATH)/glsl/glsl_parser.yy
$(call local-yy-to-cpp-and-h,.cpp) $(call local-yy-to-cpp-and-h,.cpp)
$(intermediates)/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glcpp/glcpp-lex.l $(intermediates)/glsl/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-lex.l
$(call local-l-or-ll-to-c-or-cpp) $(call local-l-or-ll-to-c-or-cpp)
$(intermediates)/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glcpp/glcpp-parse.y $(intermediates)/glsl/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-parse.y
$(call glsl_local-y-to-c-and-h) $(call glsl_local-y-to-c-and-h)

2
src/compiler/glsl/Android.mk → src/compiler/Android.glsl.mk
View File

@@ -47,7 +47,7 @@ LOCAL_STATIC_LIBRARIES := libmesa_compiler
LOCAL_MODULE := libmesa_glsl LOCAL_MODULE := libmesa_glsl
include $(LOCAL_PATH)/Android.gen.mk include $(LOCAL_PATH)/Android.glsl.gen.mk
include $(MESA_COMMON_MK) include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

2
src/compiler/Android.mk
View File

@@ -65,3 +65,5 @@ LOCAL_MODULE := libmesa_nir
include $(LOCAL_PATH)/Android.gen.mk include $(LOCAL_PATH)/Android.gen.mk
include $(MESA_COMMON_MK) include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
include $(LOCAL_PATH)/Android.glsl.mk