summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Motomu Utsumi <motomuman@google.com> 2023-10-16 02:54:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-16 02:54:18 +0000
commit419b5bf74d4ca9e932300701e6d556a0d290c29c (patch)
treec16487acebef9dc3d7eb53c03e303d28a3c2744b
parent0b550caa7030818e7a9d537e2a6d20e102e6a080 (diff)
parentb400160ca7c496bccb2ada50405941178915e273 (diff)
Merge "Add android_core_networking aconfig flag to AconfigFlags.bp" into main am: b400160ca7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786659 Change-Id: I2c8cf17a96b8a62aaa351e9d9bef7bf4be174170 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--AconfigFlags.bp8
1 files changed, 8 insertions, 0 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index f2cae097f518..f0e0c30fd031 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -22,6 +22,7 @@ aconfig_srcjars = [
":com.android.window.flags.window-aconfig-java{.generated_srcjars}",
":com.android.hardware.input-aconfig-java{.generated_srcjars}",
":com.android.text.flags-aconfig-java{.generated_srcjars}",
+ ":com.android.net.flags-aconfig-java{.generated_srcjars}",
]
filegroup {
@@ -178,3 +179,10 @@ java_aconfig_library {
aconfig_declarations: "android.hardware.biometrics.flags-aconfig",
defaults: ["framework-minus-apex-aconfig-java-defaults"],
}
+
+// CoreNetworking
+java_aconfig_library {
+ name: "com.android.net.flags-aconfig-java",
+ aconfig_declarations: "com.android.net.flags-aconfig",
+ defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}