commit d47d8e8636c6b2bf05795a1c86d8d297fb1c5539
author Joe Onorato <joeo@google.com> Fri Jun 09 23:04:37 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 09 23:04:37 2023 +0000
tree bab59de6d369f45958618034494dc38340477b21
parent 04d9f1e0def6a7fd166d8133a90847498923d851
parent d433bbae25c08dd6f21073ab9fffd8de0f0575e0

Merge "Fix build breakage" am: ed1e3b50f3 am: d1ac3e6971 am: d433bbae25

Original change: https://android-review.googlesource.com/c/platform/build/+/2618395

Change-Id: I05f346c5292e0c319ea92c5f6c7d9b879de5aa0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tools/aconfig/Android.bp

diff --git a/tools/aconfig/Android.bp b/tools/aconfig/Android.bp
index fd10001..25424c5 100644
--- a/tools/aconfig/Android.bp
+++ b/tools/aconfig/Android.bp
@@ -66,17 +66,22 @@
     ],
 }
 
+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"],
 }