diff options
| -rw-r--r-- | android/allowlists/allowlists.go | 6 | ||||
| -rw-r--r-- | bp2build/cc_library_shared_conversion_test.go | 2 | ||||
| -rw-r--r-- | cc/bp2build.go | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 5b77ba97d..b8b0c0223 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -432,6 +432,7 @@ var ( "tools/apifinder": Bp2BuildDefaultTrue, "tools/apksig": Bp2BuildDefaultTrue, + "tools/dexter/slicer": Bp2BuildDefaultTrueRecursively, "tools/external_updater": Bp2BuildDefaultTrueRecursively, "tools/metalava": Bp2BuildDefaultTrueRecursively, "tools/platform-compat/java/android/compat": Bp2BuildDefaultTrueRecursively, @@ -914,6 +915,11 @@ var ( "androidx.test.monitor-nodeps", "androidx.test.annotation", "androidx.test.annotation-nodeps", + + // jni deps of an internal android_test (b/297405812) + "libdexmakerjvmtiagent", + "libopenjdkjvmti_headers", + "libstaticjvmtiagent", } Bp2buildModuleTypeAlwaysConvertList = []string{ diff --git a/bp2build/cc_library_shared_conversion_test.go b/bp2build/cc_library_shared_conversion_test.go index 6f600da5c..345c22632 100644 --- a/bp2build/cc_library_shared_conversion_test.go +++ b/bp2build/cc_library_shared_conversion_test.go @@ -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", diff --git a/cc/bp2build.go b/cc/bp2build.go index 6a49915aa..569f721a5 100644 --- a/cc/bp2build.go +++ b/cc/bp2build.go @@ -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 |