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

Commit fe285426 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 24Q2 Release (ab/11526283) to aosp-main-future 

Bug: 337098550
Merged-In: Ie71e752f0224aa239ba1350d50996ce4b510949a
Change-Id: Ib25c1abf055b0114e0494088df5585f65df27595
parents e2447a31 ed6f98ac

AconfigFlags.bp

+279 −13
Original line number Diff line number Diff line
@@ -20,28 +20,35 @@ aconfig_declarations_group { 
    java_aconfig_libraries: [

        // !!! KEEP THIS LIST ALPHABETICAL !!!

        "aconfig_mediacodec_flags_java_lib",

        "android.adaptiveauth.flags-aconfig-java",

        "android.app.flags-aconfig-java",

        "android.app.ondeviceintelligence-aconfig-java",

        "android.app.smartspace.flags-aconfig-java",

        "android.app.usage.flags-aconfig-java",

        "android.app.wearable.flags-aconfig-java",

        "android.appwidget.flags-aconfig-java",

        "android.chre.flags-aconfig-java",

        "android.companion.flags-aconfig-java",

        "android.companion.virtual.flags-aconfig-java",

        "android.companion.virtualdevice.flags-aconfig-java",

        "android.content.flags-aconfig-java",

        "android.content.pm.flags-aconfig-java",

        "android.content.res.flags-aconfig-java",

        "android.crashrecovery.flags-aconfig-java",

        "android.credentials.flags-aconfig-java",

        "android.database.sqlite-aconfig-java",

        "android.hardware.biometrics.flags-aconfig-java",

        "android.hardware.devicestate.feature.flags-aconfig-java",

        "android.hardware.flags-aconfig-java",

        "android.hardware.radio.flags-aconfig-java",

        "android.hardware.usb.flags-aconfig-java",

        "android.location.flags-aconfig-java",

        "android.media.codec-aconfig-java",

        "android.media.playback.flags-aconfig-java",

        "android.media.tv.flags-aconfig-java",

        "android.multiuser.flags-aconfig-java",

        "android.net.platform.flags-aconfig-java",

        "android.net.vcn.flags-aconfig-java",

        "android.net.wifi.flags-aconfig-java",

        "android.nfc.flags-aconfig-java",

        "android.os.flags-aconfig-java",

        "android.os.vibrator.flags-aconfig-java",
@@ -54,7 +61,10 @@ aconfig_declarations_group { 
        "android.service.controls.flags-aconfig-java",

        "android.service.dreams.flags-aconfig-java",

        "android.service.notification.flags-aconfig-java",

        "android.service.appprediction.flags-aconfig-java",

        "android.service.voice.flags-aconfig-java",

        "android.speech.flags-aconfig-java",

        "android.systemserver.flags-aconfig-java",

        "android.tracing.flags-aconfig-java",

        "android.view.accessibility.flags-aconfig-java",

        "android.view.contentcapture.flags-aconfig-java",
@@ -63,13 +73,17 @@ aconfig_declarations_group { 
        "android.view.inputmethod.flags-aconfig-java",

        "android.webkit.flags-aconfig-java",

        "android.widget.flags-aconfig-java",

        "backup_flags_lib",

        "camera_platform_flags_core_java_lib",

        "com.android.hardware.input-aconfig-java",

        "com.android.input.flags-aconfig-java",

        "com.android.internal.foldables.flags-aconfig-java",

        "com.android.internal.pm.pkg.component.flags-aconfig-java",

        "com.android.media.flags.bettertogether-aconfig-java",

        "com.android.media.flags.editing-aconfig-java",

        "com.android.media.flags.projection-aconfig-java",

        "com.android.net.thread.platform.flags-aconfig-java",

        "com.android.server.flags.pinner-aconfig-java",

        "com.android.server.flags.services-aconfig-java",

        "com.android.text.flags-aconfig-java",

        "com.android.window.flags.window-aconfig-java",

        "device_policy_aconfig_flags_lib",
@@ -77,6 +91,7 @@ aconfig_declarations_group { 
        "framework-jobscheduler-job.flags-aconfig-java",

        "framework_graphics_flags_java_lib",

        "hwui_flags_java_lib",

        "power_flags_lib",

        "sdk_sandbox_flags_lib",

        "surfaceflinger_flags_java_lib",

        "telecom_flags_core_java_lib",
@@ -96,10 +111,10 @@ filegroup { 
java_defaults {

    name: "framework-minus-apex-aconfig-libraries",

    // Add java_aconfig_libraries to here to add them to the core framework

    // Add aconfig-annotations-lib as a dependency for the optimization

    srcs: [

        ":framework-minus-apex-aconfig-declarations{.srcjars}",

    ],

    // Add aconfig-annotations-lib as a dependency for the optimization

    libs: ["aconfig-annotations-lib"],

}
@@ -151,6 +166,20 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// DeviceStateManager

aconfig_declarations {

    name: "android.hardware.devicestate.feature.flags-aconfig",

    package: "android.hardware.devicestate.feature.flags",

    container: "system",

    srcs: ["core/java/android/hardware/devicestate/feature/*.aconfig"],

}



java_aconfig_library {

    name: "android.hardware.devicestate.feature.flags-aconfig-java",

    aconfig_declarations: "android.hardware.devicestate.feature.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Input

aconfig_declarations {

    name: "com.android.hardware.input.input-aconfig",
@@ -200,6 +229,12 @@ aconfig_declarations { 
    ],

}



cc_aconfig_library {

    name: "android_location_flags_c_lib",

    vendor_available: true,

    aconfig_declarations: "android.location.flags-aconfig",

}



java_aconfig_library {

    name: "android.location.flags-aconfig-java",

    aconfig_declarations: "android.location.flags-aconfig",
@@ -272,6 +307,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "android.app.usage.flags-aconfig-java-host",

    aconfig_declarations: "android.app.usage.flags-aconfig",

    host_supported: true,

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// OS

aconfig_declarations {

    name: "android.os.flags-aconfig",
@@ -465,10 +507,7 @@ aconfig_declarations { 
    name: "com.android.media.flags.bettertogether-aconfig",

    package: "com.android.media.flags",

    container: "system",

    srcs: [

        "media/java/android/media/flags/media_better_together.aconfig",

        "media/java/android/media/flags/fade_manager_configuration.aconfig",

    ],

    srcs: ["media/java/android/media/flags/media_better_together.aconfig"],

}



java_aconfig_library {
@@ -477,6 +516,45 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "com.android.media.flags.bettertogether-aconfig-java-host",

    aconfig_declarations: "com.android.media.flags.bettertogether-aconfig",

    host_supported: true,

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Media Editing

aconfig_declarations {

    name: "com.android.media.flags.editing-aconfig",

    package: "com.android.media.editing.flags",

    container: "system",

    srcs: [

        "media/java/android/media/flags/editing.aconfig",

    ],

}



java_aconfig_library {

    name: "com.android.media.flags.editing-aconfig-java",

    aconfig_declarations: "com.android.media.flags.editing-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// MediaProjection

aconfig_declarations {

    name: "com.android.media.flags.projection-aconfig",

    package: "com.android.media.projection.flags",

    container: "system",

    srcs: [

        "media/java/android/media/flags/projection.aconfig",

    ],

}



java_aconfig_library {

    name: "com.android.media.flags.projection-aconfig-java",

    aconfig_declarations: "com.android.media.flags.projection-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Media TV

aconfig_declarations {

    name: "android.media.tv.flags-aconfig",
@@ -491,6 +569,20 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// OnDeviceIntelligence

aconfig_declarations {

    name: "android.app.ondeviceintelligence-aconfig",

    package: "android.app.ondeviceintelligence.flags",

    container: "system",

    srcs: ["core/java/android/app/ondeviceintelligence/flags/ondevice_intelligence.aconfig"],

}



java_aconfig_library {

    name: "android.app.ondeviceintelligence-aconfig-java",

    aconfig_declarations: "android.app.ondeviceintelligence-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Permissions

aconfig_declarations {

    name: "android.permission.flags-aconfig",
@@ -507,8 +599,8 @@ java_aconfig_library { 
    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

        "com.android.nfcservices",

    ],



}



// SQLite
@@ -635,17 +727,31 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Pinner Service

// Server Services Flags

aconfig_declarations {

    name: "com.android.server.flags.pinner-aconfig",

    name: "com.android.server.flags.services-aconfig",

    package: "com.android.server.flags",

    container: "system",

    srcs: ["services/core/java/com/android/server/flags/pinner.aconfig"],

    srcs: ["services/core/java/com/android/server/flags/*.aconfig"],

}



java_aconfig_library {

    name: "com.android.server.flags.services-aconfig-java",

    aconfig_declarations: "com.android.server.flags.services-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// App prediction

aconfig_declarations {

    name: "android.service.appprediction.flags-aconfig",

    package: "android.service.appprediction.flags",

    container: "system",

    srcs: ["core/java/android/service/appprediction/flags/*.aconfig"],

}



java_aconfig_library {

    name: "com.android.server.flags.pinner-aconfig-java",

    aconfig_declarations: "com.android.server.flags.pinner-aconfig",

    name: "android.service.appprediction.flags-aconfig-java",

    aconfig_declarations: "android.service.appprediction.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}
@@ -787,6 +893,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "device_policy_aconfig_flags_lib_host",

    aconfig_declarations: "device_policy_aconfig_flags",

    host_supported: true,

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

    name: "device_policy_aconfig_flags_c_lib",

    aconfig_declarations: "device_policy_aconfig_flags",
@@ -803,6 +916,11 @@ aconfig_declarations { 
java_aconfig_library {

    name: "android.service.chooser.flags-aconfig-java",

    aconfig_declarations: "android.service.chooser.flags-aconfig",

    min_sdk_version: "34",

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",

    ],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}
@@ -838,6 +956,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "android.service.notification.flags-aconfig",

    package: "android.service.notification",

    exportable: true,

    container: "system",

    srcs: ["core/java/android/service/notification/flags.aconfig"],

}
@@ -848,6 +967,18 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "android.service.notification.flags-aconfig-export-java",

    aconfig_declarations: "android.service.notification.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

    mode: "exported",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.extservices",

    ],

}



// Smartspace

aconfig_declarations {

    name: "android.app.smartspace.flags-aconfig",
@@ -918,6 +1049,11 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

    name: "android.tracing.flags_c_lib",

    aconfig_declarations: "android.tracing.flags-aconfig",

}



// App Widgets

aconfig_declarations {

    name: "android.appwidget.flags-aconfig",
@@ -977,6 +1113,62 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// ContextHub

java_aconfig_library {

    name: "android.chre.flags-aconfig-java",

    aconfig_declarations: "chre_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Speech

aconfig_declarations {

    name: "android.speech.flags-aconfig",

    package: "android.speech.flags",

    container: "system",

    srcs: ["core/java/android/speech/flags/*.aconfig"],

}



java_aconfig_library {

    name: "android.speech.flags-aconfig-java",

    aconfig_declarations: "android.speech.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Power

java_aconfig_library {

    name: "power_flags_lib",

    aconfig_declarations: "power_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Content

aconfig_declarations {

    name: "android.content.flags-aconfig",

    package: "android.content.flags",

    container: "system",

    srcs: ["core/java/android/content/flags/flags.aconfig"],

}



java_aconfig_library {

    name: "android.content.flags-aconfig-java",

    aconfig_declarations: "android.content.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Adaptive Auth

aconfig_declarations {

    name: "android.adaptiveauth.flags-aconfig",

    package: "android.adaptiveauth",

    container: "system",

    srcs: ["core/java/android/adaptiveauth/*.aconfig"],

}



java_aconfig_library {

    name: "android.adaptiveauth.flags-aconfig-java",

    aconfig_declarations: "android.adaptiveauth.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// CrashRecovery Module

aconfig_declarations {

    name: "android.crashrecovery.flags-aconfig",
@@ -990,3 +1182,77 @@ java_aconfig_library { 
    aconfig_declarations: "android.crashrecovery.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Backup

java_aconfig_library {

    name: "backup_flags_lib",

    aconfig_declarations: "backup_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Wifi

aconfig_declarations {

    name: "android.net.wifi.flags-aconfig",

    package: "android.net.wifi.flags",

    container: "system",

    srcs: ["wifi/*.aconfig"],

}



java_aconfig_library {

    name: "android.net.wifi.flags-aconfig-java",

    aconfig_declarations: "android.net.wifi.flags-aconfig",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.wifi",

    ],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Wearable Sensing

aconfig_declarations {

    name: "android.app.wearable.flags-aconfig",

    package: "android.app.wearable",

    container: "system",

    srcs: ["core/java/android/app/wearable/*.aconfig"],

}



java_aconfig_library {

    name: "android.app.wearable.flags-aconfig-java",

    aconfig_declarations: "android.app.wearable.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



aconfig_declarations {

    name: "com.android.internal.pm.pkg.component.flags-aconfig",

    package: "com.android.internal.pm.pkg.component.flags",

    container: "system",

    srcs: ["core/java/com/android/internal/pm/pkg/component/flags/flags.aconfig"],

}



java_aconfig_library {

    name: "com.android.internal.pm.pkg.component.flags-aconfig-java",

    aconfig_declarations: "com.android.internal.pm.pkg.component.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "com.android.internal.pm.pkg.component.flags-aconfig-java-host",

    aconfig_declarations: "com.android.internal.pm.pkg.component.flags-aconfig",

    host_supported: true,

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// System Server

aconfig_declarations {

    name: "android.systemserver.flags-aconfig",

    package: "android.server",

    container: "system",

    srcs: ["services/java/com/android/server/flags.aconfig"],

}



java_aconfig_library {

    name: "android.systemserver.flags-aconfig-java",

    aconfig_declarations: "android.systemserver.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

Android.bp

+18 −24
Original line number Diff line number Diff line
@@ -95,8 +95,10 @@ filegroup { 
        ":platform-compat-native-aidl",



        // AIDL sources from external directories

        ":android.frameworks.location.altitude-V2-java-source",

        ":android.hardware.biometrics.common-V4-java-source",

        ":android.hardware.biometrics.fingerprint-V3-java-source",

        ":android.hardware.biometrics.face-V4-java-source",

        ":android.hardware.gnss-V2-java-source",

        ":android.hardware.graphics.common-V3-java-source",

        ":android.hardware.keymaster-V4-java-source",
@@ -174,9 +176,6 @@ java_library { 
        // and remove this line.

        "//frameworks/base/tools/hoststubgen:__subpackages__",

    ],

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



// AIDL files under these paths are mixture of public and private ones.
@@ -210,6 +209,9 @@ java_defaults { 
// framework_srcs. These have no or very limited dependency to the framework.

java_library {

    name: "framework-internal-utils",

    defaults: [

        "android.hardware.power-java_static",

    ],

    static_libs: [

        "apex_aidl_interface-java",

        "packagemanager_aidl-java",
@@ -265,9 +267,6 @@ java_library { 
    ],

    sdk_version: "core_platform",

    installable: false,

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



// NOTE: This filegroup is exposed for vendor libraries to depend on and is referenced in
@@ -422,6 +421,7 @@ java_defaults { 
        "audiopolicy-aidl-java",

        "sounddose-aidl-java",

        "modules-utils-expresslog",

        "perfetto_trace_javastream_protos_jarjar",

    ],

}
@@ -434,9 +434,6 @@ java_library { 
    ],

    sdk_version: "core_platform",

    installable: false,

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



// Separated so framework-minus-apex-defaults can be used without the libs dependency
@@ -480,11 +477,6 @@ java_library { 
    ],

    compile_dex: false,

    headers_only: true,

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

    // For jarjar repackaging

    jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",

}



java_library {
@@ -515,6 +507,7 @@ java_library { 
    lint: {

        baseline_filename: "lint-baseline.xml",

    },

    jarjar_prefix: "com.android.internal.hidden_from_bootclasspath",

}



java_library {
@@ -529,7 +522,7 @@ java_library { 
    },

    lint: {

        enabled: false,

        baseline_filename: "lint-baseline.xml",



    },

}
@@ -554,9 +547,6 @@ java_library { 
    ],

    sdk_version: "core_platform",

    apex_available: ["//apex_available:platform"],

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



java_library {
@@ -572,9 +562,6 @@ java_library { 
        "calendar-provider-compat-config",

        "contacts-provider-platform-compat-config",

    ],

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



platform_compat_config {
@@ -629,9 +616,6 @@ java_library { 
        "rappor",

    ],

    dxflags: ["--core-library"],

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



// utility classes statically linked into framework-wifi and dynamically linked
@@ -677,6 +661,16 @@ filegroup { 
    visibility: ["//frameworks/base/api"],

}



java_library {

    name: "perfetto_trace_javastream_protos_jarjar",

    srcs: [

        ":perfetto_trace_javastream_protos",

    ],

    jarjar_rules: ":framework-jarjar-rules",

    sdk_version: "core_platform",

    installable: false,

}



build = [

    "AconfigFlags.bp",

    "ProtoLibraries.bp",

OWNERS

+2 −0
Original line number Diff line number Diff line
@@ -42,3 +42,5 @@ per-file *Ravenwood* = file:ravenwood/OWNERS 
per-file PERFORMANCE_OWNERS = file:/PERFORMANCE_OWNERS



per-file PACKAGE_MANAGER_OWNERS = file:/PACKAGE_MANAGER_OWNERS



per-file WEAR_OWNERS = file:/WEAR_OWNERS

Ravenwood.bp

+137 −4
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ java_genrule { 
        "@$(location ravenwood/ravenwood-standard-options.txt) " +



        "--debug-log $(location hoststubgen_framework-minus-apex.log) " +

        "--stats-file $(location hoststubgen_framework-minus-apex_stats.csv) " +



        "--out-impl-jar $(location ravenwood.jar) " +
@@ -56,6 +57,7 @@ java_genrule { 
        "hoststubgen_dump.txt",



        "hoststubgen_framework-minus-apex.log",

        "hoststubgen_framework-minus-apex_stats.csv",

    ],

    visibility: ["//visibility:private"],

}
@@ -65,7 +67,7 @@ java_genrule { 
// depend on it.

java_genrule {

    name: "framework-minus-apex.ravenwood",

    defaults: ["hoststubgen-for-prototype-only-genrule"],

    defaults: ["ravenwood-internal-only-visibility-genrule"],

    cmd: "cp $(in) $(out)",

    srcs: [

        ":framework-minus-apex.ravenwood-base{ravenwood.jar}",
@@ -75,16 +77,143 @@ java_genrule { 
    ],

}



java_library {

    name: "services.core-for-hoststubgen",

    installable: false, // host only jar.

    static_libs: [

        "services.core",

    ],

    sdk_version: "core_platform",

    visibility: ["//visibility:private"],

}



java_genrule {

    name: "services.core.ravenwood-base",

    tools: ["hoststubgen"],

    cmd: "$(location hoststubgen) " +

        "@$(location ravenwood/ravenwood-standard-options.txt) " +



        "--debug-log $(location hoststubgen_services.core.log) " +

        "--stats-file $(location hoststubgen_services.core_stats.csv) " +



        "--out-impl-jar $(location ravenwood.jar) " +



        "--gen-keep-all-file $(location hoststubgen_keep_all.txt) " +

        "--gen-input-dump-file $(location hoststubgen_dump.txt) " +



        "--in-jar $(location :services.core-for-hoststubgen) " +

        "--policy-override-file $(location ravenwood/services.core-ravenwood-policies.txt) " +

        "--annotation-allowed-classes-file $(location ravenwood/ravenwood-annotation-allowed-classes.txt) ",

    srcs: [

        ":services.core-for-hoststubgen",

        "ravenwood/services.core-ravenwood-policies.txt",

        "ravenwood/ravenwood-standard-options.txt",

        "ravenwood/ravenwood-annotation-allowed-classes.txt",

    ],

    out: [

        "ravenwood.jar",



        // Following files are created just as FYI.

        "hoststubgen_keep_all.txt",

        "hoststubgen_dump.txt",



        "hoststubgen_services.core.log",

        "hoststubgen_services.core_stats.csv",

    ],

    visibility: ["//visibility:private"],

}



java_genrule {

    name: "services.core.ravenwood",

    defaults: ["ravenwood-internal-only-visibility-genrule"],

    cmd: "cp $(in) $(out)",

    srcs: [

        ":services.core.ravenwood-base{ravenwood.jar}",

    ],

    out: [

        "services.core.ravenwood.jar",

    ],

}



java_library {

    name: "services.core.ravenwood-jarjar",

    installable: false,

    static_libs: [

        "services.core.ravenwood",

    ],

    jarjar_rules: ":ravenwood-services-jarjar-rules",

}



java_library {

    name: "services.fakes.ravenwood-jarjar",

    installable: false,

    srcs: [":services.fakes-sources"],

    libs: [

        "ravenwood-framework",

        "services.core.ravenwood",

    ],

    jarjar_rules: ":ravenwood-services-jarjar-rules",

}



java_library {

    name: "mockito-ravenwood-prebuilt",

    installable: false,

    static_libs: [

        "mockito-robolectric-prebuilt",

    ],

}



java_library {

    name: "inline-mockito-ravenwood-prebuilt",

    installable: false,

    static_libs: [

        "inline-mockito-robolectric-prebuilt",

    ],

}



// Jars in "ravenwood-runtime" are set to the classpath, sorted alphabetically.

// Rename some of the dependencies to make sure they're included in the intended order.

java_genrule {

    name: "100-framework-minus-apex.ravenwood",

    cmd: "cp $(in) $(out)",

    srcs: [":framework-minus-apex.ravenwood"],

    out: ["100-framework-minus-apex.ravenwood.jar"],

    visibility: ["//visibility:private"],

}



java_genrule {

    // Use 200 to make sure it comes before the mainline stub ("all-updatable...").

    name: "200-kxml2-android",

    cmd: "cp $(in) $(out)",

    srcs: [":kxml2-android"],

    out: ["200-kxml2-android.jar"],

    visibility: ["//visibility:private"],

}



android_ravenwood_libgroup {

    name: "ravenwood-runtime",

    libs: [

        "framework-minus-apex.ravenwood",

        "100-framework-minus-apex.ravenwood",

        "200-kxml2-android",

        "all-updatable-modules-system-stubs",

        "android.test.mock.ravenwood",

        "ravenwood-helper-runtime",

        "hoststubgen-helper-runtime.ravenwood",

        "hoststubgen-helper-framework-runtime.ravenwood",

        "services.core.ravenwood-jarjar",

        "services.fakes.ravenwood-jarjar",



        // Provide runtime versions of utils linked in below

        "junit",

        "truth",

        "flag-junit",

        "ravenwood-framework",

        "ravenwood-junit-impl",

        "android.test.mock.ravenwood",

        "ravenwood-junit-impl-flag",

        "mockito-ravenwood-prebuilt",

        "inline-mockito-ravenwood-prebuilt",

    ],

    jni_libs: [

        "libandroid_runtime",

    ],

}
@@ -93,6 +222,10 @@ android_ravenwood_libgroup { 
    libs: [

        "junit",

        "truth",

        "flag-junit",

        "ravenwood-framework",

        "ravenwood-junit",

        "mockito-ravenwood-prebuilt",

        "inline-mockito-ravenwood-prebuilt",

    ],

}

TEST_MAPPING

+7 −9
Original line number Diff line number Diff line
@@ -138,15 +138,13 @@ 
    }

  ],

  "postsubmit-ravenwood": [

    // TODO(ravenwood) promote it to presubmit

    // TODO: Enable it once the infra knows how to run it.

//    {

//      "name": "CtsUtilTestCasesRavenwood",

//      "file_patterns": [

//        "*Ravenwood*",

//        "*ravenwood*"

//      ]

//    }

    {

      "name": "CtsUtilTestCasesRavenwood",

      "host": true,

      "file_patterns": [

        "[Rr]avenwood"

      ]

    }

  ],

  "postsubmit-managedprofile-stress": [

    {