From 8b518593172de2a3747e267e8e6f4e1f936bb4c6 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Fri, 9 Jun 2023 13:38:43 -0700
Subject: [PATCH] Fix build breakage

error: build/make/tools/aconfig/Android.bp:69:1: module "aconfig.test.java" variant "android_common": path dependency ":aconfig.test.flags{.srcjar}": unsupported device_config_definitions module reference tag ".srcjar"

Test: m aconfig.test.java
Change-Id: I3df980b06796c90dafee3940fe52809748305950
---
 tools/aconfig/Android.bp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/aconfig/Android.bp b/tools/aconfig/Android.bp
index fd10001d46..25424c5d86 100644
--- a/tools/aconfig/Android.bp
+++ b/tools/aconfig/Android.bp
@@ -66,17 +66,22 @@ device_config_value_set {
     ],
 }
 
+java_device_config_definitions_library {
+    name: "aconfig_test_java",
+    device_config_definitions: "aconfig.test.flags",
+}
+
 android_test {
     name: "aconfig.test.java",
     srcs: [
         "tests/**/*.java",
-        ":aconfig.test.flags{.srcjar}",
     ],
     manifest: "tests/AndroidManifest.xml",
     certificate: "platform",
     static_libs: [
         "androidx.test.rules",
         "testng",
+        "aconfig_test_java",
     ],
     test_suites: ["device-tests"],
 }