commit 1c350537cacbcdd9e210cd4edc81a6c6e3d9054c
author Nino Jagar <njagar@google.com> Mon Oct 02 23:37:03 2023 +0000
committer Nino Jagar <njagar@google.com> Tue Oct 03 17:17:19 2023 +0000
tree 13a26afd47f66b12f6a9c812aabfeb5ff985c435
parent 32e9dd706232fbc5d4509de93ae8f1af40ffb539

Onboard content protection flags

Bug: 301658008
Test: Manual with a test flag
Change-Id: I0d58859f3a7f6b48045a868b728c79610e19225b

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index ab20edc..95b6155 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -39,6 +39,7 @@
     ":android.multiuser.flags-aconfig-java{.generated_srcjars}",
     ":android.app.flags-aconfig-java{.generated_srcjars}",
     ":android.credentials.flags-aconfig-java{.generated_srcjars}",
+    ":android.view.contentprotection.flags-aconfig-java{.generated_srcjars}",
 ]
 
 filegroup {
@@ -369,3 +370,16 @@
     aconfig_declarations: "android.credentials.flags-aconfig",
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
 }
+
+// Content Protection
+aconfig_declarations {
+    name: "android.view.contentprotection.flags-aconfig",
+    package: "android.view.contentprotection.flags",
+    srcs: ["core/java/android/view/contentprotection/flags/*.aconfig"],
+}
+
+java_aconfig_library {
+    name: "android.view.contentprotection.flags-aconfig-java",
+    aconfig_declarations: "android.view.contentprotection.flags-aconfig",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}