From 21b18905fc65b0d0811a6c527e53297e05a0f5f3 Mon Sep 17 00:00:00 2001
From: Pierre-Clément Tosi <ptosi@google.com>
Date: Wed, 2 Oct 2024 14:22:59 +0100
Subject: ANDROID: Android.bp: Introduce libfdt_baremetal

Add dedicated library for use in baremetal environments and keep
"libfdt" for userspace targets (e.g. Android or host) so that they don't
have to share the same library configurations (e.g. apex_available or
lto:never) when not necessary.

Test: m
Change-Id: I7beda90227b37a5ad6bc0f76515c4aeddfc17bb7
---
 libfdt/Android.bp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'libfdt/Android.bp')

diff --git a/libfdt/Android.bp b/libfdt/Android.bp
index c30bfa5..5ed62df 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,21 @@ 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: ["libfdt_defaults"],
     // b/336916369: This library gets linked into a rust rlib.  Disable LTO
     // until cross-language lto is supported.
     lto: {
-- 
cgit v1.2.3-59-g8ed1b


From 3c5eb97322dcab9cdb8396e70cef7c74f8f72a74 Mon Sep 17 00:00:00 2001
From: Pierre-Clément Tosi <ptosi@google.com>
Date: Wed, 2 Oct 2024 14:36:34 +0100
Subject: ANDROID: libfdt_baremetal: Use cc_baremetal_defaults

Use the library to share configuration with other baremetal targets.

Test: m pvmfw
Change-Id: I2429f13297feb176a32281e392e832dc61e8de3d
---
 libfdt/Android.bp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libfdt/Android.bp')

diff --git a/libfdt/Android.bp b/libfdt/Android.bp
index 5ed62df..32b3b39 100644
--- a/libfdt/Android.bp
+++ b/libfdt/Android.bp
@@ -35,7 +35,10 @@ cc_library {
 
 cc_library {
     name: "libfdt_baremetal",
-    defaults: ["libfdt_defaults"],
+    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: {
-- 
cgit v1.2.3-59-g8ed1b