commit 709a2dc062fed2f6c8057a1e4693433f0db2edb0
author Matt Buckley <mattbuckley@google.com> Wed Feb 28 17:09:04 2024 +0000
committer Matt Buckley <mattbuckley@google.com> Mon Mar 04 23:15:53 2024 +0000
tree a9b0af09d9cafee5753416f82ca92b675c3b9eb9
parent 7d6692e58894f85306aefa8034beccff1fde74c5

Add support for C/C++ OS flags

Bug: 315894228
Test: manual
Change-Id: Ie23154e5af53b581fa84062110fd3d8ccdb17c11

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index eed248b..46ef663 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -335,6 +335,17 @@
     mode: "exported",
 }
 
+cc_aconfig_library {
+    name: "android.os.flags-aconfig-cc",
+    aconfig_declarations: "android.os.flags-aconfig",
+}
+
+cc_aconfig_library {
+    name: "android.os.flags-aconfig-cc-test",
+    aconfig_declarations: "android.os.flags-aconfig",
+    mode: "test",
+}
+
 // VirtualDeviceManager
 cc_aconfig_library {
     name: "android.companion.virtualdevice.flags-aconfig-cc",

native/android/Android.bp

diff --git a/native/android/Android.bp b/native/android/Android.bp
index 7f3792d..752ebdf 100644
--- a/native/android/Android.bp
+++ b/native/android/Android.bp
@@ -98,6 +98,7 @@
         "libpowermanager",
         "android.hardware.configstore@1.0",
         "android.hardware.configstore-utils",
+        "android.os.flags-aconfig-cc",
         "libnativedisplay",
     ],