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

Commit 59da77e1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I8cf28041,If271c5f7 into main 

* changes:
  Add version to stub label
  Allowlist jni_libs and transitive deps of b/297405812
parents f2d858e5 9d47a82e

android/allowlists/allowlists.go

+6 −0
Original line number Diff line number Diff line
@@ -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{

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