diff options
author | 2024-09-06 18:51:55 +0000 | |
---|---|---|
committer | 2024-09-06 18:51:55 +0000 | |
commit | 720d25a1e21cc47a914224ac3fbc9ae87ee79574 (patch) | |
tree | 3eb2af7cd296c8d59238958efd6cc326dd9af876 /java/generated_java_library.go | |
parent | 63abf09fd92ab7c12e08bbef5aef3e464207f9f8 (diff) | |
parent | ace2d9884a9957b3e538f171786a7a5d7392fb82 (diff) |
Merge "Make the java static_libs property configurable" into main am: 219009f606 am: ace2d9884a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3254302
Change-Id: I9e691f10c574e768392532e22f55ccafbcc3cd34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/generated_java_library.go')
-rw-r--r-- | java/generated_java_library.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/java/generated_java_library.go b/java/generated_java_library.go index d5e6d8fec..79f1b6f08 100644 --- a/java/generated_java_library.go +++ b/java/generated_java_library.go @@ -70,14 +70,6 @@ func (module *GeneratedJavaLibraryModule) AddSharedLibrary(name string) { module.Library.properties.Libs = append(module.Library.properties.Libs, name) } -// Add a java shared library as a dependency, as if they had said `libs: [ "name" ]` -func (module *GeneratedJavaLibraryModule) AddStaticLibrary(name string) { - if module.depsMutatorDone { - panic("GeneratedJavaLibraryModule.AddStaticLibrary called after DepsMutator") - } - module.Library.properties.Static_libs = append(module.Library.properties.Static_libs, name) -} - func (module *GeneratedJavaLibraryModule) DepsMutator(ctx android.BottomUpMutatorContext) { module.callbacks.DepsMutator(module, ctx) module.depsMutatorDone = true |