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

Commit 1449effd authored by Ying Zheng's avatar Ying Zheng Committed by Android (Google) Code Review
Browse files

Merge "Migrate sysUI and carSysUI to the separated car user lib."

parents 4dc4c3ae 4fd6b783

packages/CarSystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ android_app { 
    libs: [

        "telephony-common",

        "android.car",

        "android.car.user",

    ],



    manifest: "AndroidManifest.xml",

packages/SystemUI/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ android_library { 
    libs: [

        "telephony-common",

        "android.car",

        "android.car.user",

    ],



    aaptflags: [
@@ -119,6 +120,7 @@ android_library { 
        "android.test.runner",

        "telephony-common",

        "android.car",

        "android.car.user",

        "android.test.base",

    ],

    aaptflags: [
@@ -144,6 +146,7 @@ android_app { 
    libs: [

        "telephony-common",

        "android.car",

        "android.car.user",

    ],



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

packages/SystemUI/tests/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ LOCAL_JAVA_LIBRARIES := \ 
    android.test.runner \

    telephony-common \

    android.test.base \

    android.car

    android.car \

    android.car.user



LOCAL_AAPT_FLAGS := --extra-packages com.android.systemui:com.android.keyguard