commit fccc06e00a4cb3de990ea7073615be4ce15c53ac
author Chris Poultney <poultney@google.com> Thu Apr 25 22:01:18 2024 +0000
committer Chris Poultney <poultney@google.com> Fri Apr 26 03:34:06 2024 +0000
tree d5ab09b41e58a7122445320a3615587fe688c4f5
parent eee41f916a9e57fcc2b2b0822cc5504bf9f50dd0

Makes proper Soong targets for test modules

Bug: 331594637
Flag: NA
Test: tests compile
Change-Id: I523076cfdf7750ab5497c378fac8633acfa30b17

Android.bp

diff --git a/Android.bp b/Android.bp
index 8676f26..44ec269 100644
--- a/Android.bp
+++ b/Android.bp
@@ -93,7 +93,6 @@
     name: "ThemePicker_defaults",
     static_libs: [
         "ThemePickerLib",
-        "ThemePickerOverridesLib",
         "hilt_android",
     ],
 
@@ -115,6 +114,14 @@
     system_ext_specific: true,
 }
 
+java_defaults {
+    name: "ThemePicker_defaults_with_overrides",
+    defaults: ["ThemePicker_defaults"],
+    static_libs: [
+        "ThemePickerOverridesLib",
+    ],
+}
+
 prebuilt_etc {
     name: "android.software.theme_picker.xml",
     system_ext_specific: true,

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 690a1b6..5b12a4a 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -41,13 +41,13 @@
     srcs: [
         ":ThemePickerTests_srcs",
         ":WallpaperPicker2Tests_srcs",
-        "module/src/com/android/customization/TestModule.kt",
     ],
     exclude_srcs: [":ThemePicker_src_prod"],
     static_libs: [
         "WallpaperPicker2TestLib",
         "WallpaperPicker2TestRunner",
         "ThemePickerTestLib",
+        "ThemePickerTestModule",
         "SystemUICustomizationTestUtils",
         "androidx.test.espresso.core",
         "androidx.test.espresso.contrib",

tests/module/Android.bp

diff --git a/tests/module/Android.bp b/tests/module/Android.bp
index c174699..29d4965 100644
--- a/tests/module/Android.bp
+++ b/tests/module/Android.bp
@@ -19,6 +19,7 @@
 
 android_library {
     name: "ThemePickerTestModule",
+    defaults: ["ThemePicker_defaults_with_overrides"],
     srcs: ["src/com/android/customization/TestModule.kt"],
     static_libs: [
         "ThemePickerTestLib",