aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpandan Das <spandandas@google.com>2023-06-02 22:23:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-06-02 22:23:22 +0000
commitaed05ec6da3bdff5fdca2d2e2930c9adfc43ac53 (patch)
tree2988f24d90a372bcc91f75bc2c61ce2493758040
parentd682e79d5beda2cf7fa05137b0565b454b0b8792 (diff)
parent4edbe071fca51c827a20d51c8444f81b9791459a (diff)
downloadxsdc-aed05ec6da3bdff5fdca2d2e2930c9adfc43ac53.tar.gz
Create a denylist for 1:N mapping of xsd_config am: f2c40a20d1 am: 8548bcccc5 am: 4edbe071fc
Original change: https://android-review.googlesource.com/c/platform/system/tools/xsdc/+/2604129 Change-Id: Ib672bcbcca363f657568109c758d3e8f6b834b4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--build/xsdc_bp2build_conversion.go27
1 files changed, 27 insertions, 0 deletions
diff --git a/build/xsdc_bp2build_conversion.go b/build/xsdc_bp2build_conversion.go
index 77f5165..f5ab735 100644
--- a/build/xsdc_bp2build_conversion.go
+++ b/build/xsdc_bp2build_conversion.go
@@ -55,7 +55,22 @@ func (xsd *xsdConfig) bp2buildFilegroupTarget(ctx android.TopDownMutatorContext)
)
}
+var (
+ ccXsdConfigLibraryDenylist = map[string]bool{
+ "hal_manifest": true,
+ "compatibility_matrix": true,
+ "media_profiles": true,
+ "platform-compat-config": true,
+ }
+)
+
func (xsd *xsdConfig) bp2buildCcTarget(ctx android.TopDownMutatorContext) {
+ // Every xsd_config generates .cpp files in Soong, but not all of them are compile-able
+ // One such category is .xsd file that contain xs:element not nested under xs:complexType
+ // Use a denylist to skip generating cc_xsd_config_library for these Soong modules.
+ if _, exists := ccXsdConfigLibraryDenylist[xsd.Name()]; exists {
+ return
+ }
if len(xsd.properties.Srcs) != 1 {
ctx.PropertyErrorf("srcs", "xsd_config must a single src. Got %v", xsd.properties.Srcs)
}
@@ -128,7 +143,19 @@ type xsdJavaAttributes struct {
Deps bazel.LabelListAttribute
}
+var (
+ javaXsdConfigLibraryDenylist = map[string]bool{
+ "media_profiles": true,
+ }
+)
+
func (xsd *xsdConfig) bp2buildJavaTarget(ctx android.TopDownMutatorContext) {
+ // Every xsd_config generates .srcjar in Soong, but not all of them are compile-able
+ // One such category is .xsd file that contain xs:complexType nested under xs:elementType nested under xs:complexType
+ // Use a denylist to skip generating java_xsd_config_library for these Soong modules.
+ if _, exists := javaXsdConfigLibraryDenylist[xsd.Name()]; exists {
+ return
+ }
if len(xsd.properties.Srcs) != 1 {
ctx.PropertyErrorf("srcs", "xsd_config must a single src. Got %v", xsd.properties.Srcs)
}