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

Commit 20d1928b authored by Chris Poultney's avatar Chris Poultney
Browse files

Makes separate target for common testing library 

Bug: b/297021618
Test: atest ThemePickerTests, WallpaperPickerGoogleTests
Change-Id: I73b5567e04622dc54cea09c17518e75903daf577
parent 19149a55

Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -66,8 +66,9 @@ genrule { 
        + "$(location soong_zip) -o $(out) -C $$RES_DIR -D $$RES_DIR"

}



// Common defaults that doesn't have ThemePicker specifics.

java_defaults {

    name: "ThemePicker_defaults",

    name: "ThemePicker_common_defaults",



    static_libs: [

        "guava",
@@ -92,7 +93,6 @@ java_defaults { 
    srcs: [

        ":WallpaperPicker2_srcs",

        ":ThemePicker_srcs",

        ":ThemePicker_src_overrides",

    ],



    required: ["android.software.theme_picker.xml"],
@@ -111,6 +111,12 @@ java_defaults { 
    system_ext_specific: true,

}



java_defaults {

    name: "ThemePicker_defaults",

    defaults: ["ThemePicker_common_defaults"],

    srcs: [":ThemePicker_src_overrides"],

}



prebuilt_etc {

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

    system_ext_specific: true,

tests/common/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ package { 
android_library {

    name: "ThemePickerTestLib",



    defaults: ["ThemePicker_defaults"],

    defaults: ["ThemePicker_common_defaults"],

    srcs: [

        "src/com/android/customization/testing/**/*.java",

        "src/com/android/customization/testing/**/*.kt",

tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import javax.inject.Inject 
import javax.inject.Singleton



@Singleton

class TestCustomizationInjector @Inject constructor() : TestInjector(), CustomizationInjector {

open class TestCustomizationInjector @Inject constructor() : TestInjector(), CustomizationInjector {

    private var customizationPrefs: CustomizationPreferences? = null

    private var themeManager: ThemeManager? = null

    private var themesUserEventLogger: ThemesUserEventLogger? = null