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

Commit 6745b68f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Provide java_defaults as a counterpart to the settings.mk file"

parents f264eebd 0f019d08

packages/SettingsLib/Android.bp

+16 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ android_library { 
        "SettingsLibLayoutPreference",

        "SettingsLibActionButtonsPreference",

        "SettingsLibEntityHeaderWidgets",

        "SettingsLibBarChartPreference"

        "SettingsLibBarChartPreference",

    ],



    // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES
@@ -34,4 +34,18 @@ android_library { 


}



// For the test package.
 
// NOTE: Keep this module in sync with ./common.mk

java_defaults {

    name: "SettingsLibDefaults",

    static_libs: [

        "androidx.annotation_annotation",

        "androidx.lifecycle_lifecycle-common",

        "androidx.legacy_legacy-support-v4",

        "androidx.lifecycle_lifecycle-runtime",

        "androidx.recyclerview_recyclerview",

        "androidx.preference_preference",

        "androidx.appcompat_appcompat",

        "androidx.legacy_legacy-preference-v14",

        "SettingsLib",

    ],

}

packages/SettingsLib/common.mk

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,11 @@ 
#

#   include frameworks/base/packages/SettingsLib/common.mk

#

# During the conversion to Soong bluprint files, the equivalent

# functionality is provided by adding

#   defaults: ["SettingsLibDefaults"],

# to the corresponding module.

# NOTE: keep this file and ./Android.bp in sync.



LOCAL_STATIC_JAVA_LIBRARIES += \

    androidx.annotation_annotation \