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 # Find a library |
50 # Find a library. Used for declaring dependencies on libraries in different |
|
51 # modules. |
51 # Param 1 - module name |
52 # Param 1 - module name |
52 # Param 2 - library name |
53 # Param 2 - library name |
53 # Param 3 - optional subdir for library |
54 # Param 3 - optional subdir for library |
54 FindLib = \ |
55 FindLib = \ |
55 $(call FindLibDirForModule, \ |
56 $(call FindLibDirForModule, \ |
64 $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX)) |
65 $(strip $1)$(strip $3)/$(LIBRARY_PREFIX)$(strip $2)$(STATIC_LIBRARY_SUFFIX)) |
65 |
66 |
66 # If only generating compile_commands.json, make these return empty to avoid |
67 # If only generating compile_commands.json, make these return empty to avoid |
67 # declaring dependencies. |
68 # declaring dependencies. |
68 ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true) |
69 ifeq ($(GENERATE_COMPILE_COMMANDS_ONLY), true) |
|
70 FindLib = |
|
71 FindStaticLib = |
|
72 endif |
|
73 # If building static versions of libraries, make these return empty to avoid |
|
74 # declaring dependencies. |
|
75 ifeq ($(STATIC_LIBS), true) |
69 FindLib = |
76 FindLib = |
70 FindStaticLib = |
77 FindStaticLib = |
71 endif |
78 endif |
72 |
79 |
73 GetJavaHeaderDir = \ |
80 GetJavaHeaderDir = \ |