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

Commit 053eac85 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Move "runtime helpers" to f/b/ravenwood 

- Also make sure framework-minus-apex is prioritized
- Also some build rule cleanup

Bug: 315031371
Test: ./ravenwood/run-ravenwood-tests.sh

Change-Id: I2d0eb822517abfc17f351810a53176ad9904f908
parent f2c28047

Ravenwood.bp

+21 −4
Original line number Diff line number Diff line
@@ -93,16 +93,33 @@ java_library { 
    ],

}



// 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: [

        // Prefixed with "200" to ensure it's sorted early in Tradefed classpath

        // so that we provide a concrete implementation before Mainline stubs

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

        "200-kxml2-android",

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

        "android.test.mock.ravenwood",

        "framework-minus-apex.ravenwood",

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

        "ravenwood-helper-runtime",

        "hoststubgen-helper-runtime.ravenwood",



        // Provide runtime versions of utils linked in below

core/java/android/database/CursorWindow.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import dalvik.system.CloseGuard; 
 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

@android.ravenwood.annotation.RavenwoodNativeSubstitutionClass(

        "com.android.hoststubgen.nativesubstitution.CursorWindow_host")

        "com.android.platform.test.ravenwood.nativesubstitution.CursorWindow_host")

public class CursorWindow extends SQLiteClosable implements Parcelable {

    private static final String STATS_TAG = "CursorWindowStats";

core/java/android/os/MessageQueue.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import java.util.ArrayList; 
 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

@android.ravenwood.annotation.RavenwoodNativeSubstitutionClass(

        "com.android.hoststubgen.nativesubstitution.MessageQueue_host")

        "com.android.platform.test.ravenwood.nativesubstitution.MessageQueue_host")

public final class MessageQueue {

    private static final String TAG = "MessageQueue";

    private static final boolean DEBUG = false;

core/java/android/os/Parcel.java

+2 −1
Original line number Diff line number Diff line
@@ -233,7 +233,8 @@ import java.util.function.IntFunction; 
 * {@link #readSparseArray(ClassLoader, Class)}.

 */

@RavenwoodKeepWholeClass

@RavenwoodNativeSubstitutionClass("com.android.hoststubgen.nativesubstitution.Parcel_host")

@RavenwoodNativeSubstitutionClass(

        "com.android.platform.test.ravenwood.nativesubstitution.Parcel_host")

public final class Parcel {



    private static final boolean DEBUG_RECYCLE = false;

core/java/android/os/ParcelFileDescriptor.java

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ import java.nio.ByteOrder; 
 * you to close it when done with it.

 */

@RavenwoodKeepWholeClass

@RavenwoodNativeSubstitutionClass("com.android.hoststubgen.nativesubstitution.ParcelFileDescriptor_host")

@RavenwoodNativeSubstitutionClass(

        "com.android.platform.test.ravenwood.nativesubstitution.ParcelFileDescriptor_host")

public class ParcelFileDescriptor implements Parcelable, Closeable {

    private static final String TAG = "ParcelFileDescriptor";