diff options
| author | 2023-11-09 21:32:45 +0000 | |
|---|---|---|
| committer | 2023-11-09 21:32:45 +0000 | |
| commit | 6c60fb243bdac1074393b054e4e25891bf373f87 (patch) | |
| tree | 91e04124b09a1057fa9681d7447e54cfa23d3cdc | |
| parent | 714512479dfaf9c8c7afee7bb7da5a324f63c274 (diff) | |
| parent | ead726d7a3e071ba61c3973f7ba5c2481ec280b6 (diff) | |
Merge "Add dependency of liblazy_static" into main am: 10b38c4957 am: cee1b3d984 am: ead726d7a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2823411
Change-Id: If8ec82f511eb45aa579a564d8889a1e0b4aa6f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | aconfig/rust_aconfig_library.go | 1 | ||||
| -rw-r--r-- | aconfig/rust_aconfig_library_test.go | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/aconfig/rust_aconfig_library.go b/aconfig/rust_aconfig_library.go index de41776a3..71918dd21 100644 --- a/aconfig/rust_aconfig_library.go +++ b/aconfig/rust_aconfig_library.go @@ -84,6 +84,7 @@ func (a *aconfigDecorator) GenerateSource(ctx rust.ModuleContext, deps rust.Path func (a *aconfigDecorator) SourceProviderDeps(ctx rust.DepsContext, deps rust.Deps) rust.Deps { deps = a.BaseSourceProvider.SourceProviderDeps(ctx, deps) deps.Rustlibs = append(deps.Rustlibs, "libflags_rust") + deps.Rustlibs = append(deps.Rustlibs, "liblazy_static") ctx.AddDependency(ctx.Module(), rustDeclarationsTag, a.Properties.Aconfig_declarations) return deps } diff --git a/aconfig/rust_aconfig_library_test.go b/aconfig/rust_aconfig_library_test.go index 17385c3d1..a10da2dde 100644 --- a/aconfig/rust_aconfig_library_test.go +++ b/aconfig/rust_aconfig_library_test.go @@ -22,6 +22,11 @@ func TestRustAconfigLibrary(t *testing.T) { crate_name: "flags_rust", srcs: ["lib.rs"], } + rust_library { + name: "liblazy_static", // test mock + crate_name: "lazy_static", + srcs: ["src/lib.rs"], + } aconfig_declarations { name: "my_aconfig_declarations", package: "com.example.package", |