From b302455879381388ab82c0cf7b4632c68dc882b7 Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Tue, 23 Nov 2021 14:53:41 -0800 Subject: Support filename and sub_dir attributes in sh_binary Test: test by building system/timezone/apex:com.android.tzdata Change-Id: I08114910fccbdacf6750e237d3e80ba37fde7651 --- sh/sh_binary.go | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'sh') diff --git a/sh/sh_binary.go b/sh/sh_binary.go index c32cde01e..a87b9cf4c 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -516,7 +516,9 @@ func ShTestHostFactory() android.Module { } type bazelShBinaryAttributes struct { - Srcs bazel.LabelListAttribute + Srcs bazel.LabelListAttribute + Filename string + Sub_dir string // Bazel also supports the attributes below, but (so far) these are not required for Bionic // deps // data @@ -547,12 +549,25 @@ func ShBinaryBp2Build(ctx android.TopDownMutatorContext) { srcs := bazel.MakeLabelListAttribute( android.BazelLabelForModuleSrc(ctx, []string{*m.properties.Src})) + var filename string + if m.properties.Filename != nil { + filename = *m.properties.Filename + } + + var subDir string + if m.properties.Sub_dir != nil { + subDir = *m.properties.Sub_dir + } + attrs := &bazelShBinaryAttributes{ - Srcs: srcs, + Srcs: srcs, + Filename: filename, + Sub_dir: subDir, } props := bazel.BazelTargetModuleProperties{ - Rule_class: "sh_binary", + Rule_class: "sh_binary", + Bzl_load_location: "//build/bazel/rules:sh_binary.bzl", } ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: m.Name()}, attrs) -- cgit v1.2.3