Snap for 12492053 from 809f2e3bc25c7f4557d3a0838e7ed7dcd719c2f8 to 25Q2-release

Change-Id: I3bcdb5d518b5f8ec2d0154e1463294c9e909de0c

1 files changed, 15 insertions, 3 deletions

diff --git a/libfdt/Android.bp b/libfdt/Android.bp
index c30bfa5..32b3b39 100644
--- a/libfdt/Android.bp
+++ b/libfdt/Android.bp
@@ -4,9 +4,8 @@ package {
     default_applicable_licenses: ["external_dtc_libfdt_license"],
 }
 
-cc_library {
-    name: "libfdt",
-    host_supported: true,
+cc_defaults {
+    name: "libfdt_defaults",
     defaults: ["dtc_cflags_defaults"],
     srcs: [
         "fdt.c",
@@ -22,11 +21,24 @@ cc_library {
         "acpi.c",
     ],
     export_include_dirs: ["."],
+}
+
+cc_library {
+    name: "libfdt",
+    host_supported: true,
+    defaults: ["libfdt_defaults"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
     ],
+}
 
+cc_library {
+    name: "libfdt_baremetal",
+    defaults: [
+        "cc_baremetal_defaults",
+        "libfdt_defaults",
+    ],
     // b/336916369: This library gets linked into a rust rlib.  Disable LTO
     // until cross-language lto is supported.
     lto: {