commit 9447e1ee12b6c56f96ebcb8c312a11ae68b507b6
author Rupert Shuttleworth <ruperts@google.com> Wed Jul 28 05:53:42 2021 -0400
committer Rupert Shuttleworth <ruperts@google.com> Wed Jul 28 06:03:17 2021 -0400
tree 70ea92aaa89b9d98794e23a658d31c4b0e8b1e02
parent 8e5b4c5043f12c4642b234b08e0a4f03e7cbed92

Add support for prebuilts attribute to the bp2build APEX converter.

Test: Updated unit test.

Change-Id: I73dfa84d7a55c0b94393ad6257b5f16313422852

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index 0857946..149f782 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -3197,6 +3197,7 @@
 	Installable        bazel.BoolAttribute
 	Native_shared_libs bazel.LabelListAttribute
 	Binaries           bazel.StringListAttribute
+	Prebuilts          bazel.LabelListAttribute
 }
 
 type bazelApexBundle struct {
@@ -3262,6 +3263,10 @@
 	nativeSharedLibsLabelList := android.BazelLabelForModuleDeps(ctx, nativeSharedLibs)
 	nativeSharedLibsLabelListAttribute := bazel.MakeLabelListAttribute(nativeSharedLibsLabelList)
 
+	prebuilts := module.properties.Prebuilts
+	prebuiltsLabelList := android.BazelLabelForModuleDeps(ctx, prebuilts)
+	prebuiltsLabelListAttribute := bazel.MakeLabelListAttribute(prebuiltsLabelList)
+
 	binaries := module.properties.ApexNativeDependencies.Binaries
 	binariesStringListAttribute := bazel.MakeStringListAttribute(binaries)
 
@@ -3286,6 +3291,7 @@
 		Installable:        installableAttribute,
 		Native_shared_libs: nativeSharedLibsLabelListAttribute,
 		Binaries:           binariesStringListAttribute,
+		Prebuilts:          prebuiltsLabelListAttribute,
 	}
 
 	props := bazel.BazelTargetModuleProperties{

bp2build/apex_conversion_test.go

diff --git a/bp2build/apex_conversion_test.go b/bp2build/apex_conversion_test.go
index e2e08bd..456f18a 100644
--- a/bp2build/apex_conversion_test.go
+++ b/bp2build/apex_conversion_test.go
@@ -69,6 +69,18 @@
 	bazel_module: { bp2build_available: false },
 }
 
+// TODO(b/194878861): Add bp2build support for prebuilt_etc
+cc_library {
+        name: "pretend_prebuilt_1",
+        bazel_module: { bp2build_available: false },
+}
+
+// TODO(b/194878861): Add bp2build support for prebuilt_etc
+cc_library {
+        name: "pretend_prebuilt_2",
+        bazel_module: { bp2build_available: false },
+}
+
 filegroup {
 	name: "com.android.apogee-file_contexts",
         srcs: [
@@ -95,6 +107,10 @@
             "binary_1",
 	    "binary_2",
 	],
+	prebuilts: [
+	    "pretend_prebuilt_1",
+	    "pretend_prebuilt_2",
+	],
 }
 `,
 		expectedBazelTargets: []string{`apex(
@@ -114,6 +130,10 @@
         ":native_shared_lib_1",
         ":native_shared_lib_2",
     ],
+    prebuilts = [
+        ":pretend_prebuilt_1",
+        ":pretend_prebuilt_2",
+    ],
     updatable = False,
 )`}})
 }