commit 355851b52024668f17907d586da6e8e003b1f8bd
author Romain Jobredeaux <jobredeaux@google.com> Thu Jan 13 17:07:01 2022 +0000
committer Romain Jobredeaux <jobredeaux@google.com> Wed Jan 19 21:13:51 2022 +0000
tree 1c268892da669742172f5ca2901aa348e7f5326e
parent b33e0b8b5bca6380e07b98568fcef11ba4885b61

Revert "Revert "Add static_libs support to android_app bp2build converter.""

This reverts commit b33e0b8b5bca6380e07b98568fcef11ba4885b61.

Reason for revert: CI failure deemed to be a fluke

Change-Id: Ia804d531092921e4ad090740420c4a4e02e6ff00

bp2build/android_app_conversion_test.go

diff --git a/bp2build/android_app_conversion_test.go b/bp2build/android_app_conversion_test.go
index 153817b..28de06c 100644
--- a/bp2build/android_app_conversion_test.go
+++ b/bp2build/android_app_conversion_test.go
@@ -66,7 +66,7 @@
 			"resb/res.png":                 "",
 			"manifest/AndroidManifest.xml": "",
 		},
-		blueprint: `
+		blueprint: simpleModuleDoNotConvertBp2build("android_app", "static_lib_dep") + `
 android_app {
         name: "TestApp",
         srcs: ["app.java"],
@@ -74,6 +74,7 @@
         package_name: "com.google",
         resource_dirs: ["resa", "resb"],
         manifest: "manifest/AndroidManifest.xml",
+        static_libs: ["static_lib_dep"]
 }
 `,
 		expectedBazelTargets: []string{
@@ -85,6 +86,7 @@
         "resb/res.png",
     ]`,
 				"custom_package": `"com.google"`,
+				"deps":           `[":static_lib_dep"]`,
 			}),
 		}})
 }