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

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

Merge "Change the impl lib name of java_sdk_library"

parents 7516606a b7540bf1

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,6 @@ stubs_defaults { 
        "ext",

        "framework",

        "voip-common",

        "android.test.mock.impl",

    ],

    local_sourcepaths: frameworks_base_subdirs,

    installable: false,

data/etc/platform.xml

+3 −3
Original line number Diff line number Diff line
@@ -223,12 +223,12 @@ 
         code to link against. -->



    <library name="android.test.base"

            file="/system/framework/android.test.base.impl.jar" />

            file="/system/framework/android.test.base.jar" />

    <library name="android.test.mock"

            file="/system/framework/android.test.mock.impl.jar"

            file="/system/framework/android.test.mock.jar"

            dependency="android.test.base" />

    <library name="android.test.runner"

            file="/system/framework/android.test.runner.impl.jar"

            file="/system/framework/android.test.runner.jar"

            dependency="android.test.base:android.test.mock" />



    <!-- In BOOT_JARS historically, and now added to legacy applications. -->

test-legacy/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ java_library_static { 
    static_libs: [

        "android.test.base-minus-junit",

        "android.test.runner-minus-junit",

        "android.test.mock.impl",

        "android.test.mock_static",

    ],



    no_framework_libs: true,

test-mock/Android.bp

+16 −0
Original line number Diff line number Diff line
@@ -30,3 +30,19 @@ java_sdk_library { 
    srcs_lib_whitelist_pkgs: ["android"],

    compile_dex: true,

}



// Build the android.test.mock_static library

// ==========================================

// This is only intended for inclusion in the legacy-android-test.

// Must not be used elewhere.

java_library_static {

    name: "android.test.mock_static",



    java_version: "1.8",

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



    no_framework_libs: true,

    libs: [

        "framework",

    ],

}