From 1282c424845bb567e1dea60a44cb987204f7cb40 Mon Sep 17 00:00:00 2001 From: Romain Jobredeaux Date: Fri, 29 Oct 2021 10:52:59 -0400 Subject: Initial bp2build converter for android_app. The only supported attributes at this point are: - srcs - manifest - package_name - resource_dirs as they most easily map to bazel's android_binary's srcs, manifest, custom_package, and resource_files respectively. Allow-listing all apps that use these fields, along with sdk_version and dex_preopt. The latter 2 are ignored by the converter, - sdk_version because we're currently relying on a single pre-built SDK, - dex_preopt because, 1. though it is not supported in Bazel builds yet, it doesn't prevent the apps from building, and 2. the apps being converted only use the dex_preopt attribute to disable dex_preopt, which is what is happening anyway. Change-Id: I4a4f771eeb8f60a1cd4844b2ac1ce3df7c070e73 Test: ./build/bazel/scripts/run_presubmits.sh Bug: 198224074 Bug: 203688791 --- java/android_resources.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/android_resources.go') diff --git a/java/android_resources.go b/java/android_resources.go index 6864ebb90..8c5908f69 100644 --- a/java/android_resources.go +++ b/java/android_resources.go @@ -43,7 +43,7 @@ var androidResourceIgnoreFilenames = []string{ // androidResourceGlob returns the list of files in the given directory, using the standard // exclusion patterns for Android resources. -func androidResourceGlob(ctx android.ModuleContext, dir android.Path) android.Paths { +func androidResourceGlob(ctx android.EarlyModuleContext, dir android.Path) android.Paths { return ctx.GlobFiles(filepath.Join(dir.String(), "**/*"), androidResourceIgnoreFilenames) } -- cgit v1.2.3-59-g8ed1b