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

Commit e266f468 authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Revert "Rename two targets to have SettingsLib prefix""

parents df4ae4ac d7687f98

packages/SettingsLib/ActionButtonsPreference/Android.bp

+1 −1
Original line number Diff line number Diff line 
android_library {

    name: "SettingsLibActionButtonsPreference",

    name: "ActionButtonsPreference",



    srcs: ["src/**/*.java"],

    resource_dirs: ["res"],

packages/SettingsLib/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ android_library { 
        "SettingsLibAppPreference",

        "SettingsLibSearchWidget",

        "SettingsLibSettingsSpinner",

        "SettingsLibLayoutPreference",

        "SettingsLibActionButtonsPreference",

        "SettingsLayoutPreference",

        "ActionButtonsPreference",

    ],



    // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES

packages/SettingsLib/LayoutPreference/Android.bp→packages/SettingsLib/SettingsLayoutPreference/Android.bp

+1 −1
Original line number Diff line number Diff line 
android_library {

    name: "SettingsLibLayoutPreference",

    name: "SettingsLayoutPreference",



    srcs: ["src/**/*.java"],

    resource_dirs: ["res"],