Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fccc06e0 authored by Chris Poultney's avatar Chris Poultney
Browse files

Makes proper Soong targets for test modules 

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

Android.bp

+8 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,6 @@ java_defaults { 
    name: "ThemePicker_defaults",

    name: "ThemePicker_defaults",

    static_libs: [

    static_libs: [

        "ThemePickerLib",

        "ThemePickerLib",

        "ThemePickerOverridesLib",

        "hilt_android",

        "hilt_android",

    ],

    ],
@@ -115,6 +114,14 @@ java_defaults { 
    system_ext_specific: true,

    system_ext_specific: true,

}

}





java_defaults {

    name: "ThemePicker_defaults_with_overrides",

    defaults: ["ThemePicker_defaults"],

    static_libs: [

        "ThemePickerOverridesLib",

    ],

}



prebuilt_etc {

prebuilt_etc {

    name: "android.software.theme_picker.xml",

    name: "android.software.theme_picker.xml",

    system_ext_specific: true,

    system_ext_specific: true,

tests/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,13 +41,13 @@ android_test { 
    srcs: [

    srcs: [

        ":ThemePickerTests_srcs",

        ":ThemePickerTests_srcs",

        ":WallpaperPicker2Tests_srcs",

        ":WallpaperPicker2Tests_srcs",

        "module/src/com/android/customization/TestModule.kt",

    ],

    ],

    exclude_srcs: [":ThemePicker_src_prod"],

    exclude_srcs: [":ThemePicker_src_prod"],

    static_libs: [

    static_libs: [

        "WallpaperPicker2TestLib",

        "WallpaperPicker2TestLib",

        "WallpaperPicker2TestRunner",

        "WallpaperPicker2TestRunner",

        "ThemePickerTestLib",

        "ThemePickerTestLib",

        "ThemePickerTestModule",

        "SystemUICustomizationTestUtils",

        "SystemUICustomizationTestUtils",

        "androidx.test.espresso.core",

        "androidx.test.espresso.core",

        "androidx.test.espresso.contrib",

        "androidx.test.espresso.contrib",

tests/module/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package { 




android_library {

android_library {

    name: "ThemePickerTestModule",

    name: "ThemePickerTestModule",

    defaults: ["ThemePicker_defaults_with_overrides"],

    srcs: ["src/com/android/customization/TestModule.kt"],

    srcs: ["src/com/android/customization/TestModule.kt"],

    static_libs: [

    static_libs: [

        "ThemePickerTestLib",

        "ThemePickerTestLib",