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

Commit 79f853d7 authored by Alix's avatar Alix
Browse files

temporary unblock for builds using sdkSystem 

Bug: 215230098
Change-Id: I521342c676f3362d3e1db0aab7924a04602525e1
Test:  built captiveportal-lib and inspected BUILD file
parent 789e532a

android/allowlists/allowlists.go

+20 −18
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ var ( 
		"packages/modules/adb/pairing_connection":            Bp2BuildDefaultTrueRecursively,

		"packages/modules/adb/proto":                         Bp2BuildDefaultTrueRecursively,

		"packages/modules/adb/tls":                           Bp2BuildDefaultTrueRecursively,

		"packages/modules/NetworkStack/common/captiveportal": Bp2BuildDefaultTrue,

		"packages/providers/MediaProvider/tools/dialogs":     Bp2BuildDefaultFalse, // TODO(b/242834374)

		"packages/screensavers/Basic":                        Bp2BuildDefaultTrue,

		"packages/services/Car/tests/SampleRearViewCamera":   Bp2BuildDefaultFalse, // TODO(b/242834321)
@@ -281,6 +282,7 @@ var ( 
		"prebuilts/clang/host/linux-x86":           Bp2BuildDefaultTrueRecursively,

		"prebuilts/gradle-plugin":                  Bp2BuildDefaultTrueRecursively,

		"prebuilts/runtime/mainline/platform/sdk":  Bp2BuildDefaultTrueRecursively,

		"prebuilts/sdk/current/androidx":           Bp2BuildDefaultTrue,

		"prebuilts/sdk/current/extras/app-toolkit": Bp2BuildDefaultTrue,

		"prebuilts/sdk/current/support":            Bp2BuildDefaultTrue,

		"prebuilts/tools":                          Bp2BuildDefaultTrue,

java/java.go

+3 −0
Original line number Diff line number Diff line
@@ -2807,6 +2807,9 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) { 
		if sdkVersion.Kind == android.SdkPublic && sdkVersion.ApiLevel == android.FutureApiLevel {

			// TODO(b/220869005) remove forced dependency on current public android.jar

			deps.Add(bazel.MakeLabelAttribute("//prebuilts/sdk:public_current_android_sdk_java_import"))

		} else if sdkVersion.Kind == android.SdkSystem && sdkVersion.ApiLevel == android.FutureApiLevel {

			// TODO(b/215230098) remove forced dependency on current public android.jar

			deps.Add(bazel.MakeLabelAttribute("//prebuilts/sdk:system_current_android_sdk_java_import"))

		}

	} else if !deps.IsEmpty() {

		ctx.ModuleErrorf("Module has direct dependencies but no sources. Bazel will not allow this.")