Makes proper Soong targets for test modules
Bug: 331594637
Flag: NA
Test: tests compile
Change-Id: I523076cfdf7750ab5497c378fac8633acfa30b17
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,
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",
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",