Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d47a82e authored by Spandan Das's avatar Spandan Das
Browse files

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
parent 1262f359

bp2build/cc_library_shared_conversion_test.go

+1 −1
Original line number Diff line number Diff line
@@ -1635,7 +1635,7 @@ ndk_library { 
        ],

        "//build/bazel/rules/apex:unbundled_app": [

            ":libHasApexStubs",

            "//.:libHasApexAndNdkStubs.ndk_stub_libs",

            "//.:libHasApexAndNdkStubs.ndk_stub_libs-current",

        ],

        "//conditions:default": [

            ":libHasApexStubs",

cc/bp2build.go

+3 −1
Original line number Diff line number Diff line
@@ -1657,9 +1657,11 @@ func SetStubsForDynamicDeps(ctx android.BazelConversionPathContext, axis bazel.C 
			if depC, ok := dep.(*Module); ok && hasNdkStubs(ctx, depC) {

				// If the dependency has ndk stubs, build against the ndk stubs

				// https://cs.android.com/android/_/android/platform/build/soong/+/main:cc/cc.go;l=2642-2643;drc=e12d252e22dd8afa654325790d3298a0d67bd9d6;bpv=1;bpt=0

				ver := proptools.String(c.Properties.Sdk_version)

				// TODO - b/298085502: Add bp2build support for sdk_version: "minimum"

				ndkLibModule, _ := ctx.ModuleFromName(dep.Name() + ndkLibrarySuffix)

				label = bazel.Label{

					Label: "//" + ctx.OtherModuleDir(ndkLibModule) + ":" + ndkLibModule.Name() + "_stub_libs",

					Label: "//" + ctx.OtherModuleDir(ndkLibModule) + ":" + ndkLibModule.Name() + "_stub_libs-" + ver,

				}

			}

			// add the ndk lib label to this axis