Replace se_filegroup to se_build_files
se_build_files is a replacement for se_filegroup module. se_build_files
can be used with the normal Soong convention ":module_name{.tag}" by
implementing android.OutputFileProducer. It's better than implementing
ad-hoc logics across various modules, which is the case for se_filegroup
module.
Test: build and boot
Change-Id: Ic0e34549601eb043145e433055f5a030eaf4347e
diff --git a/compat/Android.bp b/compat/Android.bp
index bc8409a..b473e52 100644
--- a/compat/Android.bp
+++ b/compat/Android.bp
@@ -26,42 +26,42 @@
se_cil_compat_map {
name: "plat_28.0.cil",
stem: "28.0.cil",
- bottom_half: [":28.0.board.compat.map"],
+ bottom_half: [":28.0.board.compat.map{.plat_private}"],
top_half: "plat_29.0.cil",
}
se_cil_compat_map {
name: "plat_29.0.cil",
stem: "29.0.cil",
- bottom_half: [":29.0.board.compat.map"],
+ bottom_half: [":29.0.board.compat.map{.plat_private}"],
top_half: "plat_30.0.cil",
}
se_cil_compat_map {
name: "plat_30.0.cil",
stem: "30.0.cil",
- bottom_half: [":30.0.board.compat.map"],
+ bottom_half: [":30.0.board.compat.map{.plat_private}"],
top_half: "plat_31.0.cil",
}
se_cil_compat_map {
name: "plat_31.0.cil",
stem: "31.0.cil",
- bottom_half: [":31.0.board.compat.map"],
+ bottom_half: [":31.0.board.compat.map{.plat_private}"],
top_half: "plat_32.0.cil",
}
se_cil_compat_map {
name: "plat_32.0.cil",
stem: "32.0.cil",
- bottom_half: [":32.0.board.compat.map"],
+ bottom_half: [":32.0.board.compat.map{.plat_private}"],
// top_half: "plat_33.0.cil",
}
se_cil_compat_map {
name: "system_ext_28.0.cil",
stem: "28.0.cil",
- bottom_half: [":28.0.board.compat.map"],
+ bottom_half: [":28.0.board.compat.map{.system_ext_private}"],
top_half: "system_ext_29.0.cil",
system_ext_specific: true,
}
@@ -69,7 +69,7 @@
se_cil_compat_map {
name: "system_ext_29.0.cil",
stem: "29.0.cil",
- bottom_half: [":29.0.board.compat.map"],
+ bottom_half: [":29.0.board.compat.map{.system_ext_private}"],
top_half: "system_ext_30.0.cil",
system_ext_specific: true,
}
@@ -77,7 +77,7 @@
se_cil_compat_map {
name: "system_ext_30.0.cil",
stem: "30.0.cil",
- bottom_half: [":30.0.board.compat.map"],
+ bottom_half: [":30.0.board.compat.map{.system_ext_private}"],
top_half: "system_ext_31.0.cil",
system_ext_specific: true,
}
@@ -85,7 +85,7 @@
se_cil_compat_map {
name: "system_ext_31.0.cil",
stem: "31.0.cil",
- bottom_half: [":31.0.board.compat.map"],
+ bottom_half: [":31.0.board.compat.map{.system_ext_private}"],
top_half: "system_ext_32.0.cil",
system_ext_specific: true,
}
@@ -93,7 +93,7 @@
se_cil_compat_map {
name: "system_ext_32.0.cil",
stem: "32.0.cil",
- bottom_half: [":32.0.board.compat.map"],
+ bottom_half: [":32.0.board.compat.map{.system_ext_private}"],
// top_half: "system_ext_33.0.cil",
system_ext_specific: true,
}
@@ -101,7 +101,7 @@
se_cil_compat_map {
name: "product_28.0.cil",
stem: "28.0.cil",
- bottom_half: [":28.0.board.compat.map"],
+ bottom_half: [":28.0.board.compat.map{.product_private}"],
top_half: "product_29.0.cil",
product_specific: true,
}
@@ -109,7 +109,7 @@
se_cil_compat_map {
name: "product_29.0.cil",
stem: "29.0.cil",
- bottom_half: [":29.0.board.compat.map"],
+ bottom_half: [":29.0.board.compat.map{.product_private}"],
top_half: "product_30.0.cil",
product_specific: true,
}
@@ -117,7 +117,7 @@
se_cil_compat_map {
name: "product_30.0.cil",
stem: "30.0.cil",
- bottom_half: [":30.0.board.compat.map"],
+ bottom_half: [":30.0.board.compat.map{.product_private}"],
top_half: "product_31.0.cil",
product_specific: true,
}
@@ -125,7 +125,7 @@
se_cil_compat_map {
name: "product_31.0.cil",
stem: "31.0.cil",
- bottom_half: [":31.0.board.compat.map"],
+ bottom_half: [":31.0.board.compat.map{.product_private}"],
top_half: "product_32.0.cil",
product_specific: true,
}
@@ -133,139 +133,139 @@
se_cil_compat_map {
name: "product_32.0.cil",
stem: "32.0.cil",
- bottom_half: [":32.0.board.compat.map"],
+ bottom_half: [":32.0.board.compat.map{.product_private}"],
// top_half: "product_33.0.cil",
product_specific: true,
}
se_cil_compat_map {
name: "28.0.ignore.cil",
- bottom_half: [":28.0.board.ignore.map"],
+ bottom_half: [":28.0.board.ignore.map{.plat_private}"],
top_half: "29.0.ignore.cil",
}
se_cil_compat_map {
name: "29.0.ignore.cil",
- bottom_half: [":29.0.board.ignore.map"],
+ bottom_half: [":29.0.board.ignore.map{.plat_private}"],
top_half: "30.0.ignore.cil",
}
se_cil_compat_map {
name: "30.0.ignore.cil",
- bottom_half: [":30.0.board.ignore.map"],
+ bottom_half: [":30.0.board.ignore.map{.plat_private}"],
top_half: "31.0.ignore.cil",
}
se_cil_compat_map {
name: "31.0.ignore.cil",
- bottom_half: [":31.0.board.ignore.map"],
+ bottom_half: [":31.0.board.ignore.map{.plat_private}"],
top_half: "32.0.ignore.cil",
}
se_cil_compat_map {
name: "32.0.ignore.cil",
- bottom_half: [":32.0.board.ignore.map"],
+ bottom_half: [":32.0.board.ignore.map{.plat_private}"],
// top_half: "33.0.ignore.cil",
}
se_cil_compat_map {
name: "system_ext_30.0.ignore.cil",
- bottom_half: [":30.0.board.ignore.map"],
+ bottom_half: [":30.0.board.ignore.map{.system_ext_private}"],
top_half: "system_ext_31.0.ignore.cil",
system_ext_specific: true,
}
se_cil_compat_map {
name: "system_ext_31.0.ignore.cil",
- bottom_half: [":31.0.board.ignore.map"],
+ bottom_half: [":31.0.board.ignore.map{.system_ext_private}"],
top_half: "system_ext_32.0.ignore.cil",
system_ext_specific: true,
}
se_cil_compat_map {
name: "system_ext_32.0.ignore.cil",
- bottom_half: [":32.0.board.ignore.map"],
+ bottom_half: [":32.0.board.ignore.map{.system_ext_private}"],
// top_half: "system_ext_33.0.ignore.cil",
system_ext_specific: true,
}
se_cil_compat_map {
name: "product_30.0.ignore.cil",
- bottom_half: [":30.0.board.ignore.map"],
+ bottom_half: [":30.0.board.ignore.map{.product_private}"],
top_half: "product_31.0.ignore.cil",
product_specific: true,
}
se_cil_compat_map {
name: "product_31.0.ignore.cil",
- bottom_half: [":31.0.board.ignore.map"],
+ bottom_half: [":31.0.board.ignore.map{.product_private}"],
top_half: "product_32.0.ignore.cil",
product_specific: true,
}
se_cil_compat_map {
name: "product_32.0.ignore.cil",
- bottom_half: [":32.0.board.ignore.map"],
+ bottom_half: [":32.0.board.ignore.map{.product_private}"],
// top_half: "product_33.0.ignore.cil",
product_specific: true,
}
se_compat_cil {
name: "28.0.compat.cil",
- srcs: [":28.0.board.compat.cil"],
+ srcs: [":28.0.board.compat.cil{.plat_private}"],
}
se_compat_cil {
name: "29.0.compat.cil",
- srcs: [":29.0.board.compat.cil"],
+ srcs: [":29.0.board.compat.cil{.plat_private}"],
}
se_compat_cil {
name: "30.0.compat.cil",
- srcs: [":30.0.board.compat.cil"],
+ srcs: [":30.0.board.compat.cil{.plat_private}"],
}
se_compat_cil {
name: "31.0.compat.cil",
- srcs: [":31.0.board.compat.cil"],
+ srcs: [":31.0.board.compat.cil{.plat_private}"],
}
se_compat_cil {
name: "32.0.compat.cil",
- srcs: [":32.0.board.compat.cil"],
+ srcs: [":32.0.board.compat.cil{.plat_private}"],
}
se_compat_cil {
name: "system_ext_28.0.compat.cil",
- srcs: [":28.0.board.compat.cil"],
+ srcs: [":28.0.board.compat.cil{.system_ext_private}"],
stem: "28.0.compat.cil",
system_ext_specific: true,
}
se_compat_cil {
name: "system_ext_29.0.compat.cil",
- srcs: [":29.0.board.compat.cil"],
+ srcs: [":29.0.board.compat.cil{.system_ext_private}"],
stem: "29.0.compat.cil",
system_ext_specific: true,
}
se_compat_cil {
name: "system_ext_30.0.compat.cil",
- srcs: [":30.0.board.compat.cil"],
+ srcs: [":30.0.board.compat.cil{.system_ext_private}"],
stem: "30.0.compat.cil",
system_ext_specific: true,
}
se_compat_cil {
name: "system_ext_31.0.compat.cil",
- srcs: [":31.0.board.compat.cil"],
+ srcs: [":31.0.board.compat.cil{.system_ext_private}"],
stem: "31.0.compat.cil",
system_ext_specific: true,
}
se_compat_cil {
name: "system_ext_32.0.compat.cil",
- srcs: [":32.0.board.compat.cil"],
+ srcs: [":32.0.board.compat.cil{.system_ext_private}"],
stem: "32.0.compat.cil",
system_ext_specific: true,
}