Merge "temporary unblock for builds using sdkSystem" am: 8393a0fcdc
am: c14ab51f39
am: c23361a187
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2448142 Change-Id: I328ade676de530c6f1ac9cc722d4791c13f0b039 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -273,6 +273,7 @@ var (
|
|||||||
"packages/modules/adb/pairing_connection": Bp2BuildDefaultTrueRecursively,
|
"packages/modules/adb/pairing_connection": Bp2BuildDefaultTrueRecursively,
|
||||||
"packages/modules/adb/proto": Bp2BuildDefaultTrueRecursively,
|
"packages/modules/adb/proto": Bp2BuildDefaultTrueRecursively,
|
||||||
"packages/modules/adb/tls": Bp2BuildDefaultTrueRecursively,
|
"packages/modules/adb/tls": Bp2BuildDefaultTrueRecursively,
|
||||||
|
"packages/modules/NetworkStack/common/captiveportal": Bp2BuildDefaultTrue,
|
||||||
"packages/providers/MediaProvider/tools/dialogs": Bp2BuildDefaultFalse, // TODO(b/242834374)
|
"packages/providers/MediaProvider/tools/dialogs": Bp2BuildDefaultFalse, // TODO(b/242834374)
|
||||||
"packages/screensavers/Basic": Bp2BuildDefaultTrue,
|
"packages/screensavers/Basic": Bp2BuildDefaultTrue,
|
||||||
"packages/services/Car/tests/SampleRearViewCamera": Bp2BuildDefaultFalse, // TODO(b/242834321)
|
"packages/services/Car/tests/SampleRearViewCamera": Bp2BuildDefaultFalse, // TODO(b/242834321)
|
||||||
@@ -282,6 +283,7 @@ var (
|
|||||||
"prebuilts/clang/host/linux-x86": Bp2BuildDefaultTrueRecursively,
|
"prebuilts/clang/host/linux-x86": Bp2BuildDefaultTrueRecursively,
|
||||||
"prebuilts/gradle-plugin": Bp2BuildDefaultTrueRecursively,
|
"prebuilts/gradle-plugin": Bp2BuildDefaultTrueRecursively,
|
||||||
"prebuilts/runtime/mainline/platform/sdk": Bp2BuildDefaultTrueRecursively,
|
"prebuilts/runtime/mainline/platform/sdk": Bp2BuildDefaultTrueRecursively,
|
||||||
|
"prebuilts/sdk/current/androidx": Bp2BuildDefaultTrue,
|
||||||
"prebuilts/sdk/current/extras/app-toolkit": Bp2BuildDefaultTrue,
|
"prebuilts/sdk/current/extras/app-toolkit": Bp2BuildDefaultTrue,
|
||||||
"prebuilts/sdk/current/support": Bp2BuildDefaultTrue,
|
"prebuilts/sdk/current/support": Bp2BuildDefaultTrue,
|
||||||
"prebuilts/tools": Bp2BuildDefaultTrue,
|
"prebuilts/tools": Bp2BuildDefaultTrue,
|
||||||
|
@@ -2806,6 +2806,9 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
|
|||||||
if sdkVersion.Kind == android.SdkPublic && sdkVersion.ApiLevel == android.FutureApiLevel {
|
if sdkVersion.Kind == android.SdkPublic && sdkVersion.ApiLevel == android.FutureApiLevel {
|
||||||
// TODO(b/220869005) remove forced dependency on current public android.jar
|
// TODO(b/220869005) remove forced dependency on current public android.jar
|
||||||
deps.Add(bazel.MakeLabelAttribute("//prebuilts/sdk:public_current_android_sdk_java_import"))
|
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() {
|
} else if !deps.IsEmpty() {
|
||||||
ctx.ModuleErrorf("Module has direct dependencies but no sources. Bazel will not allow this.")
|
ctx.ModuleErrorf("Module has direct dependencies but no sources. Bazel will not allow this.")
|
||||||
|
Reference in New Issue
Block a user