encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tint->dawn: Fix output_name of dawn_component template 

The output library names should keep the 'dawn_' prefix, even when the target doesn't have this.

Bug: dawn:1275
Change-Id: I153c64b96594a05f599d847e455dca967e8ce0f9
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/79360
Commit-Queue: Ben Clayton <bclayton@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Ben Clayton <bclayton@google.com>
This commit is contained in:
Ben Clayton 2022-02-04 17:53:55 +00:00 committed by Dawn LUCI CQ
parent 35940f9b83
commit b01cf60b55
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/dawn_component.gni
View File

@ -23,8 +23,8 @@ import("dawn_overrides_with_defaults.gni")
# Template that produces static and shared versions of the same library as well # Template that produces static and shared versions of the same library as well
# as a target similar to Chromium's component targets. # as a target similar to Chromium's component targets.
# - The shared version exports symbols and has dependent import the symbols # - The shared version exports symbols and has dependent import the symbols
# as libname.so. If the target name matches the package directory name, then # as libdawn_${name}.so. If the target name matches the package directory
# the shared library target will be named 'shared', otherwise # name, then the shared library target will be named 'shared', otherwise
# '${target_name}_shared'. # '${target_name}_shared'.
# - The static library doesn't export symbols nor make dependents import them. # - The static library doesn't export symbols nor make dependents import them.
# If the target name matches the package directory name, then the static # If the target name matches the package directory name, then the static
@ -81,7 +81,7 @@ template("dawn_component") {
shared_library("${prefix}shared") { shared_library("${prefix}shared") {
# The "tool" for creating shared libraries will automatically add the "lib" prefix # The "tool" for creating shared libraries will automatically add the "lib" prefix
output_name = name output_name = "dawn_${name}"
# Copy all variables except "configs", which has a default value # Copy all variables except "configs", which has a default value
forward_variables_from(invoker, "*", [ "configs" ]) forward_variables_from(invoker, "*", [ "configs" ])
@ -119,7 +119,7 @@ template("dawn_component") {
} }
static_library("${prefix}static") { static_library("${prefix}static") {
output_name = name + "_static" output_name = "dawn_${name}_static"
complete_static_lib = dawn_complete_static_libs complete_static_lib = dawn_complete_static_libs