Revert^3 "Use Soong-built system/build.prop"
625f66136dda856ec03642bf5699b9aa4f614953
Change-Id: I69b09646fb3286dcc5df638f87625f4eb8dcfcb2
diff --git a/Android.bp b/Android.bp
index c37d777..0d1ff02 100644
--- a/Android.bp
+++ b/Android.bp
@@ -121,6 +121,20 @@
name: "dexpreopt_systemserver_check",
}
+// buildinfo.prop contains common properties for system/build.prop, like ro.build.version.*
+// TODO(b/322090587): merge this to gen_build_prop.py script.
+buildinfo_prop {
+ name: "buildinfo.prop",
+
+ // not installable because this will be included to system/build.prop
+ installable: false,
+
+ product_config: ":product_config",
+
+ // Currently, only microdroid can refer to buildinfo.prop
+ visibility: ["//packages/modules/Virtualization/build/microdroid"],
+}
+
// container for apex_contributions selected using build flags
all_apex_contributions {
name: "all_apex_contributions",
@@ -130,14 +144,3 @@
name: "product_config",
visibility: ["//device/google/cuttlefish/system_image"],
}
-
-build_prop {
- name: "system-build.prop",
- stem: "build.prop",
- product_config: ":product_config",
- // Currently, only microdroid and cf system image can refer to system-build.prop
- visibility: [
- "//device/google/cuttlefish/system_image",
- "//packages/modules/Virtualization/build/microdroid",
- ],
-}