commit 9d47a82e27fe98de55eb929be204b9df1271a7ef
author Spandan Das <spandandas@google.com> Tue Sep 19 18:23:26 2023 +0000
committer Spandan Das <spandandas@google.com> Wed Sep 20 23:04:02 2023 +0000
tree 64b5914ffe1bdb6fdbdc33b793f9e5e1e6314ffb
parent 1262f359a4268c3546d66b952b3d702d86d3b832

Add version to stub label

This is a followup fix for aosp/2753352 that added the name of the
`cc_stub_suite` as deps of `unbundled_app` config setting. However,
cc_stub_suite is really a macro that expands to <name>-<ver>.

Add the version explicitly to rdeps

Bug: 298085502
Test: b build //build/bazel/examples/android_app/java/com/app:app_with_sdk_variant_of_jni_deps --config=android (with aosp/2755284)

Change-Id: I8cf2804141bb14589e11b03a138b715538a3f1ee

bp2build/cc_library_shared_conversion_test.go

diff --git a/bp2build/cc_library_shared_conversion_test.go b/bp2build/cc_library_shared_conversion_test.go
index 6f600da..345c226 100644
--- a/bp2build/cc_library_shared_conversion_test.go
+++ b/bp2build/cc_library_shared_conversion_test.go
@@ -1635,7 +1635,7 @@
         ],
         "//build/bazel/rules/apex:unbundled_app": [
             ":libHasApexStubs",
-            "//.:libHasApexAndNdkStubs.ndk_stub_libs",
+            "//.:libHasApexAndNdkStubs.ndk_stub_libs-current",
         ],
         "//conditions:default": [
             ":libHasApexStubs",