equal
deleted
inserted
replaced
45 $(call uniq, $(wildcard \ |
45 $(call uniq, $(wildcard \ |
46 $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/$(strip $2) \ |
46 $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/$(strip $2) \ |
47 $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/$(strip $2) \ |
47 $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/$(strip $2) \ |
48 $(TOPDIR)/src/$(strip $1)/share/native/$(strip $2))) |
48 $(TOPDIR)/src/$(strip $1)/share/native/$(strip $2))) |
49 |
49 |
50 FindHeaderDirForModule = \ |
50 GetJavaHeaderDir = \ |
51 $(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)) |
51 $(wildcard $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)) |
52 |
52 |
53 ProcessDir = \ |
53 ProcessDir = \ |
54 $(if $(findstring :, $1), \ |
54 $(if $(findstring :, $1), \ |
55 $(call FindSrcDirsForComponent, $(firstword $(subst :, , $1)), $(lastword $(subst :, , $1))) \ |
55 $(call FindSrcDirsForComponent, $(firstword $(subst :, , $1)), $(lastword $(subst :, , $1))) \ |
110 $1_RC_FLAGS := |
110 $1_RC_FLAGS := |
111 endif |
111 endif |
112 |
112 |
113 ifneq ($$($1_HEADERS_FROM_SRC), false) |
113 ifneq ($$($1_HEADERS_FROM_SRC), false) |
114 $1_SRC_HEADER_FLAGS := $$(foreach dir, $$(wildcard $$($1_SRC) $$($1_EXTRA_SRC) \ |
114 $1_SRC_HEADER_FLAGS := $$(foreach dir, $$(wildcard $$($1_SRC) $$($1_EXTRA_SRC) \ |
115 $$(call FindHeaderDirForModule, $$(MODULE))), -I$$(dir)) |
115 $$(call GetJavaHeaderDir, $$(MODULE))), -I$$(dir)) |
116 endif |
116 endif |
117 ifneq ($$($1_EXTRA_HEADER_DIRS), ) |
117 ifneq ($$($1_EXTRA_HEADER_DIRS), ) |
118 $1_PROCESSED_EXTRA_HEADER_DIRS := $$(foreach dir, $$($1_EXTRA_HEADER_DIRS), $$(call ProcessDir, $$(dir))) |
118 $1_PROCESSED_EXTRA_HEADER_DIRS := $$(foreach dir, $$($1_EXTRA_HEADER_DIRS), $$(call ProcessDir, $$(dir))) |
119 $1_EXTRA_HEADER_FLAGS := $$(foreach dir, $$($1_PROCESSED_EXTRA_HEADER_DIRS), -I$$(dir)) |
119 $1_EXTRA_HEADER_FLAGS := $$(foreach dir, $$($1_PROCESSED_EXTRA_HEADER_DIRS), -I$$(dir)) |
120 endif |
120 endif |