From b33e0b8b5bca6380e07b98568fcef11ba4885b61 Mon Sep 17 00:00:00 2001 From: Romain Jobredeaux Date: Thu, 13 Jan 2022 15:16:12 +0000 Subject: [PATCH] Revert "Add static_libs support to android_app bp2build converter." This reverts commit de722acd96ae9a4fd1809e4196028585916510b7. Reason for revert: broke bp2build CI Change-Id: I535e8746e846c20f1a47c2a1eb0362276af49206 --- android/bazel.go | 1 - bp2build/android_app_conversion_test.go | 4 +--- java/app.go | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/android/bazel.go b/android/bazel.go index 382e2a796..970ad0d71 100644 --- a/android/bazel.go +++ b/android/bazel.go @@ -281,7 +281,6 @@ var ( "development/samples/USB/MissileLauncher": Bp2BuildDefaultTrue, "development/samples/VoiceRecognitionService": Bp2BuildDefaultTrue, "development/samples/VoicemailProviderDemo": Bp2BuildDefaultTrue, - "development/samples/WiFiDirectDemo": Bp2BuildDefaultTrue, "development/sdk": Bp2BuildDefaultTrueRecursively, "external/arm-optimized-routines": Bp2BuildDefaultTrueRecursively, "external/boringssl": Bp2BuildDefaultTrueRecursively, diff --git a/bp2build/android_app_conversion_test.go b/bp2build/android_app_conversion_test.go index 28de06c00..153817b08 100644 --- a/bp2build/android_app_conversion_test.go +++ b/bp2build/android_app_conversion_test.go @@ -66,7 +66,7 @@ func TestAndroidAppAllSupportedFields(t *testing.T) { "resb/res.png": "", "manifest/AndroidManifest.xml": "", }, - blueprint: simpleModuleDoNotConvertBp2build("android_app", "static_lib_dep") + ` + blueprint: ` android_app { name: "TestApp", srcs: ["app.java"], @@ -74,7 +74,6 @@ android_app { package_name: "com.google", resource_dirs: ["resa", "resb"], manifest: "manifest/AndroidManifest.xml", - static_libs: ["static_lib_dep"] } `, expectedBazelTargets: []string{ @@ -86,7 +85,6 @@ android_app { "resb/res.png", ]`, "custom_package": `"com.google"`, - "deps": `[":static_lib_dep"]`, }), }}) } diff --git a/java/app.go b/java/app.go index ffe3e070e..1c69aeb7a 100755 --- a/java/app.go +++ b/java/app.go @@ -1432,7 +1432,6 @@ type bazelAndroidAppAttributes struct { Manifest bazel.Label Custom_package *string Resource_files bazel.LabelListAttribute - Deps bazel.LabelListAttribute } // ConvertWithBp2build is used to convert android_app to Bazel. @@ -1450,15 +1449,12 @@ func (a *AndroidApp) ConvertWithBp2build(ctx android.TopDownMutatorContext) { resourceFiles.Includes = append(resourceFiles.Includes, files...) } - deps := bazel.MakeLabelListAttribute(android.BazelLabelForModuleDeps(ctx, a.properties.Static_libs)) - attrs := &bazelAndroidAppAttributes{ Srcs: srcs, Manifest: android.BazelLabelForModuleSrcSingle(ctx, manifest), // TODO(b/209576404): handle package name override by product variable PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES Custom_package: a.overridableAppProperties.Package_name, Resource_files: bazel.MakeLabelListAttribute(resourceFiles), - Deps: deps, } props := bazel.BazelTargetModuleProperties{Rule_class: "android_binary", Bzl_load_location: "@rules_android//rules:rules.bzl"}