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

Commit a2dc65a2 authored by Jihoon Kang's avatar Jihoon Kang Committed by Automerger Merge Worker
Browse files

Merge "Make java_sdk_library dependencies explicit" into main am: 10f0f9a9 am: 612b1535 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/3250185



Change-Id: I37d8a779985f820befa52be51df8101f53ed12bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98febb5f 612b1535

Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ launcher_compose_tests_java_defaults { 
android_library {

    name: "launcher-aosp-tapl",

    libs: [

        "framework-statsd",

        "framework-statsd.stubs.module_lib",

    ],

    static_libs: [

        "androidx.annotation_annotation",
@@ -388,7 +388,7 @@ android_library { 
        "quickstep/res",

    ],

    libs: [

        "framework-statsd",

        "framework-statsd.stubs.module_lib",

    ],

    static_libs: [

        "Launcher3ResLib",
@@ -453,7 +453,7 @@ android_library { 
    ],

    resource_dirs: [],

    libs: [

        "framework-statsd",

        "framework-statsd.stubs.module_lib",

    ],

    // Note the ordering here is important when it comes to resource

    // overriding. We want the most specific resource overrides defined

tests/Android.bp

+6 −6
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ android_test { 
        "com_android_launcher3_flags_lib",

    ],

    libs: [

        "android.test.base",

        "android.test.runner",

        "android.test.mock",

        "android.test.base.stubs.system",

        "android.test.runner.stubs.system",

        "android.test.mock.stubs.system",

    ],

    // Libraries used by mockito inline extended

    jni_libs: [
@@ -229,9 +229,9 @@ android_robolectric_test { 
        "android.appwidget.flags-aconfig-java",

    ],

    libs: [

        "android.test.runner",

        "android.test.base",

        "android.test.mock",

        "android.test.runner.stubs.system",

        "android.test.base.stubs.system",

        "android.test.mock.stubs.system",

        "truth",

    ],

    instrumentation_for: "Launcher3",