From b01cf60b55b90f72237697c7d9ef76157aedeed1 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Fri, 4 Feb 2022 17:53:55 +0000 Subject: [PATCH] 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 Reviewed-by: Corentin Wallez Commit-Queue: Ben Clayton --- scripts/dawn_component.gni | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/dawn_component.gni b/scripts/dawn_component.gni index b14990b668..8a69794e77 100644 --- a/scripts/dawn_component.gni +++ b/scripts/dawn_component.gni @@ -23,8 +23,8 @@ import("dawn_overrides_with_defaults.gni") # Template that produces static and shared versions of the same library as well # as a target similar to Chromium's component targets. # - The shared version exports symbols and has dependent import the symbols -# as libname.so. If the target name matches the package directory name, then -# the shared library target will be named 'shared', otherwise +# as libdawn_${name}.so. If the target name matches the package directory +# name, then the shared library target will be named 'shared', otherwise # '${target_name}_shared'. # - The static library doesn't export symbols nor make dependents import them. # If the target name matches the package directory name, then the static @@ -81,7 +81,7 @@ template("dawn_component") { shared_library("${prefix}shared") { # 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 forward_variables_from(invoker, "*", [ "configs" ]) @@ -119,7 +119,7 @@ template("dawn_component") { } static_library("${prefix}static") { - output_name = name + "_static" + output_name = "dawn_${name}_static" complete_static_lib = dawn_complete_static_libs