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

Commit da5d13bb authored by Brad Stenning's avatar Brad Stenning Committed by android-build-merger
Browse files

Merge "Merge "Fix build file such that CarSystemUi can be easily extended"... 

Merge "Merge "Fix build file such that CarSystemUi can be easily extended" into qt-qpr1-dev am: c2327e54" into qt-qpr1-dev-plus-aosp
am: 218caf81

Change-Id: I5dd429adc1c120a98c38c9639012a2fa4479216c
parents faad8c1e 218caf81

packages/CarSystemUI/Android.bp

+31 −12
Original line number Original line Diff line number Diff line
@@ -13,18 +13,19 @@ 
// See the License for the specific language governing permissions and

// See the License for the specific language governing permissions and

// limitations under the License.

// limitations under the License.

//

//

android_app {

android_library {

    name: "CarSystemUI",

    name: "CarSystemUI-core",



    overrides: [

        "SystemUI",

    ],





    srcs: [

    srcs: [

        "src/**/*.java",

        "src/**/*.java",

        "src/**/I*.aidl",

        "src/**/I*.aidl",

    ],

    ],





    resource_dirs: [

        "res-keyguard",

        "res",

    ],



    static_libs: [

    static_libs: [

        "SystemUI-core",

        "SystemUI-core",

        "CarNotificationLib",

        "CarNotificationLib",
@@ -58,6 +59,28 @@ android_app { 




    manifest: "AndroidManifest.xml",

    manifest: "AndroidManifest.xml",





    plugins: ["dagger2-compiler-2.19"],



}



android_app {

    name: "CarSystemUI",



    static_libs: [

        "CarSystemUI-core",

    ],



    libs: [

        "telephony-common",

        "android.car",

    ],



    resource_dirs: [],



     overrides: [

        "SystemUI",

    ],



    platform_apis: true,

    platform_apis: true,

    product_specific: true,

    product_specific: true,

    certificate: "platform",

    certificate: "platform",
@@ -68,12 +91,6 @@ android_app { 
            "proguard.flags",

            "proguard.flags",

        ],

        ],

    },

    },

    resource_dirs: [

        "res-keyguard",

        "res",

    ],





    dxflags: ["--multi-dex"],

    dxflags: ["--multi-dex"],





    aaptflags: [

    aaptflags: [
@@ -81,6 +98,8 @@ android_app { 
        "com.android.keyguard",

        "com.android.keyguard",

    ],

    ],





    kotlincflags: ["-Xjvm-default=enable"],



    plugins: ["dagger2-compiler-2.19"],

    plugins: ["dagger2-compiler-2.19"],





    required: ["privapp_whitelist_com.android.systemui"],

    required: ["privapp_whitelist_com.android.systemui"],