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

Commit 3d7c275c authored by John Wu's avatar John Wu Committed by Gerrit Code Review
Browse files

Merge changes from topic "2024-09-raven-aosp-cherry-pick" into main 

* changes:
  Use JVM-compatible libnativehelper for host builds
  [Ravenwood] Use native system property implementation
  Cherry-pick Ravenwood "core" code
parents cd682f63 2f548347

Ravenwood.bp

+66 −166
Original line number Diff line number Diff line
@@ -25,13 +25,15 @@ java_library { 
    visibility: ["//visibility:private"],

}



// Generate the stub/impl from framework-all, with hidden APIs.

// Process framework-all with hoststubgen for Ravenwood.

// This step takes several tens of seconds, so we manually shard it to multiple modules.

// All the copies have to be kept in sync.

// TODO: Do the sharding better.

// TODO: Do the sharding better, either by making hostsubgen support sharding natively, or

// making a better build rule.



genrule_defaults {

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

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

    tools: ["hoststubgen"],

    srcs: [

        ":framework-minus-apex-for-hoststubgen",
@@ -41,148 +43,101 @@ genrule_defaults { 
    ],

    out: [

        "ravenwood.jar",



        // Following files are created just as FYI.

        "hoststubgen_framework-minus-apex_keep_all.txt",

        "hoststubgen_framework-minus-apex_dump.txt",



        "hoststubgen_framework-minus-apex.log",

        "hoststubgen_framework-minus-apex_stats.csv",

        "hoststubgen_framework-minus-apex_apis.csv",

    ],

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

}



java_genrule {

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

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: "$(location hoststubgen) " +

        "--num-shards 6 --shard-index 0 " + // Only this line differs



framework_minus_apex_cmd = "$(location hoststubgen) " +

    "@$(location :ravenwood-standard-options) " +



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

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

        "--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +



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



        "--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +

        "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +



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

    "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

    "--policy-override-file $(location :ravenwood-framework-policies) " +

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

    "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) "



java_genrule {

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

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 0",

}



java_genrule {

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

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: "$(location hoststubgen) " +

        "--num-shards 6 --shard-index 1 " + // Only this line differs



        "@$(location :ravenwood-standard-options) " +



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

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

        "--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +



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



        "--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +

        "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +



        "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

        "--policy-override-file $(location :ravenwood-framework-policies) " +

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 1",

}



java_genrule {

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

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: "$(location hoststubgen) " +

        "--num-shards 6 --shard-index 2 " + // Only this line differs



        "@$(location :ravenwood-standard-options) " +



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

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

        "--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +



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



        "--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +

        "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +



        "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

        "--policy-override-file $(location :ravenwood-framework-policies) " +

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 2",

}



java_genrule {

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

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: "$(location hoststubgen) " +

        "--num-shards 6 --shard-index 3 " + // Only this line differs



        "@$(location :ravenwood-standard-options) " +



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

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

        "--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +



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



        "--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +

        "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +



        "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

        "--policy-override-file $(location :ravenwood-framework-policies) " +

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 3",

}



java_genrule {

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

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: "$(location hoststubgen) " +

        "--num-shards 6 --shard-index 4 " + // Only this line differs



        "@$(location :ravenwood-standard-options) " +



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

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

        "--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 4",

}



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

java_genrule {

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

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 5",

}



        "--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +

        "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +

java_genrule {

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

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 6",

}



        "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

        "--policy-override-file $(location :ravenwood-framework-policies) " +

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

java_genrule {

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

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 7",

}



java_genrule {

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

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

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: "$(location hoststubgen) " +

        "--num-shards 6 --shard-index 5 " + // Only this line differs

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 8",

}



        "@$(location :ravenwood-standard-options) " +

java_genrule {

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

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: framework_minus_apex_cmd + " --num-shards 10 --shard-index 9",

}



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

// Build framework-minus-apex.ravenwood-base without sharding.

// We extract the various dump files from this one, rather than the sharded ones, because

// some dumps use the output from other classes (e.g. base classes) which may not be in the

// same shard. Also some of the dump files ("apis") may be slow even when sharded, because

// the output contains the information from all the input classes, rather than the output classes.

// Not using sharding is fine for this module because it's only used for collecting the

// dump / stats files, which don't have to happen regularly.

java_genrule {

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

    defaults: ["framework-minus-apex.ravenwood-base_defaults"],

    cmd: framework_minus_apex_cmd +

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

        "--supported-api-list-file $(location hoststubgen_framework-minus-apex_apis.csv) " +



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



        "--gen-keep-all-file $(location hoststubgen_framework-minus-apex_keep_all.txt) " +

        "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) " +

        "--gen-input-dump-file $(location hoststubgen_framework-minus-apex_dump.txt) ",



        "--in-jar $(location :framework-minus-apex-for-hoststubgen) " +

        "--policy-override-file $(location :ravenwood-framework-policies) " +

        "--annotation-allowed-classes-file $(location :ravenwood-annotation-allowed-classes) ",

    out: [

        "hoststubgen_framework-minus-apex_keep_all.txt",

        "hoststubgen_framework-minus-apex_dump.txt",

        "hoststubgen_framework-minus-apex_stats.csv",

        "hoststubgen_framework-minus-apex_apis.csv",

    ],

}



// Marge all the sharded jars
@@ -198,73 +153,16 @@ java_genrule { 
        ":framework-minus-apex.ravenwood-base_X3{ravenwood.jar}",

        ":framework-minus-apex.ravenwood-base_X4{ravenwood.jar}",

        ":framework-minus-apex.ravenwood-base_X5{ravenwood.jar}",

        ":framework-minus-apex.ravenwood-base_X6{ravenwood.jar}",

        ":framework-minus-apex.ravenwood-base_X7{ravenwood.jar}",

        ":framework-minus-apex.ravenwood-base_X8{ravenwood.jar}",

        ":framework-minus-apex.ravenwood-base_X9{ravenwood.jar}",

    ],

    out: [

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

    ],

}



// Merge the sharded text files

genrule {

    name: "hoststubgen_framework-minus-apex_stats.csv",

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

    cmd: "cat $(in) > $(out)",

    srcs: [

        ":framework-minus-apex.ravenwood-base_X0{hoststubgen_framework-minus-apex_stats.csv}",

        ":framework-minus-apex.ravenwood-base_X1{hoststubgen_framework-minus-apex_stats.csv}",

        ":framework-minus-apex.ravenwood-base_X2{hoststubgen_framework-minus-apex_stats.csv}",

        ":framework-minus-apex.ravenwood-base_X3{hoststubgen_framework-minus-apex_stats.csv}",

        ":framework-minus-apex.ravenwood-base_X4{hoststubgen_framework-minus-apex_stats.csv}",

        ":framework-minus-apex.ravenwood-base_X5{hoststubgen_framework-minus-apex_stats.csv}",

    ],

    out: ["hoststubgen_framework-minus-apex_stats.csv"],

}



genrule {

    name: "hoststubgen_framework-minus-apex_apis.csv",

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

    cmd: "cat $(in) > $(out)",

    srcs: [

        ":framework-minus-apex.ravenwood-base_X0{hoststubgen_framework-minus-apex_apis.csv}",

        ":framework-minus-apex.ravenwood-base_X1{hoststubgen_framework-minus-apex_apis.csv}",

        ":framework-minus-apex.ravenwood-base_X2{hoststubgen_framework-minus-apex_apis.csv}",

        ":framework-minus-apex.ravenwood-base_X3{hoststubgen_framework-minus-apex_apis.csv}",

        ":framework-minus-apex.ravenwood-base_X4{hoststubgen_framework-minus-apex_apis.csv}",

        ":framework-minus-apex.ravenwood-base_X5{hoststubgen_framework-minus-apex_apis.csv}",

    ],

    out: ["hoststubgen_framework-minus-apex_apis.csv"],

}



genrule {

    name: "hoststubgen_framework-minus-apex_keep_all.txt",

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

    cmd: "cat $(in) > $(out)",

    srcs: [

        ":framework-minus-apex.ravenwood-base_X0{hoststubgen_framework-minus-apex_keep_all.txt}",

        ":framework-minus-apex.ravenwood-base_X1{hoststubgen_framework-minus-apex_keep_all.txt}",

        ":framework-minus-apex.ravenwood-base_X2{hoststubgen_framework-minus-apex_keep_all.txt}",

        ":framework-minus-apex.ravenwood-base_X3{hoststubgen_framework-minus-apex_keep_all.txt}",

        ":framework-minus-apex.ravenwood-base_X4{hoststubgen_framework-minus-apex_keep_all.txt}",

        ":framework-minus-apex.ravenwood-base_X5{hoststubgen_framework-minus-apex_keep_all.txt}",

    ],

    out: ["hoststubgen_framework-minus-apex_keep_all.txt"],

}



genrule {

    name: "hoststubgen_framework-minus-apex_dump.txt",

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

    cmd: "cat $(in) > $(out)",

    srcs: [

        ":framework-minus-apex.ravenwood-base_X0{hoststubgen_framework-minus-apex_dump.txt}",

        ":framework-minus-apex.ravenwood-base_X1{hoststubgen_framework-minus-apex_dump.txt}",

        ":framework-minus-apex.ravenwood-base_X2{hoststubgen_framework-minus-apex_dump.txt}",

        ":framework-minus-apex.ravenwood-base_X3{hoststubgen_framework-minus-apex_dump.txt}",

        ":framework-minus-apex.ravenwood-base_X4{hoststubgen_framework-minus-apex_dump.txt}",

        ":framework-minus-apex.ravenwood-base_X5{hoststubgen_framework-minus-apex_dump.txt}",

    ],

    out: ["hoststubgen_framework-minus-apex_dump.txt"],

}



java_library {

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

    installable: false, // host only jar.
@@ -285,7 +183,7 @@ java_genrule { 
        "--stats-file $(location hoststubgen_services.core_stats.csv) " +

        "--supported-api-list-file $(location hoststubgen_services.core_apis.csv) " +



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

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



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

        "--gen-input-dump-file $(location hoststubgen_services.core_dump.txt) " +
@@ -325,6 +223,9 @@ java_genrule { 
    ],

}



// TODO(b/313930116) This jarjar is a bit slow. We should use hoststubgen for renaming,

// but services.core.ravenwood has complex dependencies, so it'll take more than

// just using hoststubgen "rename"s.

java_library {

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

    defaults: ["ravenwood-internal-only-visibility-java"],
@@ -337,7 +238,6 @@ 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.

// Also apply jarjar.

java_library {

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

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

core/java/android/app/Instrumentation.java

+3 −3
Original line number Diff line number Diff line
@@ -2406,9 +2406,9 @@ public class Instrumentation { 
     * @hide

     */

    @android.ravenwood.annotation.RavenwoodKeep

    public final void basicInit(Context context) {

        mInstrContext = context;

        mAppContext = context;

    public final void basicInit(Context instrContext, Context appContext) {

        mInstrContext = instrContext;

        mAppContext = appContext;

    }



    /** @hide */

core/java/android/database/CursorWindow.java

+31 −3
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.database;



import static java.util.Objects.requireNonNull;



import android.annotation.BytesLong;

import android.annotation.IntRange;

import android.compat.annotation.UnsupportedAppUsage;
@@ -24,6 +26,10 @@ import android.database.sqlite.SQLiteClosable; 
import android.database.sqlite.SQLiteException;

import android.os.Parcel;

import android.os.Parcelable;

import android.ravenwood.annotation.RavenwoodKeepWholeClass;

import android.ravenwood.annotation.RavenwoodRedirect;

import android.ravenwood.annotation.RavenwoodRedirectionClass;

import android.ravenwood.annotation.RavenwoodThrow;



import dalvik.annotation.optimization.FastNative;

import dalvik.system.CloseGuard;
@@ -38,9 +44,8 @@ import dalvik.system.CloseGuard; 
 * consumer for reading.

 * </p>

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

@android.ravenwood.annotation.RavenwoodNativeSubstitutionClass(

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

@RavenwoodKeepWholeClass

@RavenwoodRedirectionClass("CursorWindow_host")

public class CursorWindow extends SQLiteClosable implements Parcelable {

    private static final String STATS_TAG = "CursorWindowStats";
@@ -61,48 +66,69 @@ public class CursorWindow extends SQLiteClosable implements Parcelable { 
    private final CloseGuard mCloseGuard;



    // May throw CursorWindowAllocationException

    @RavenwoodRedirect

    private static native long nativeCreate(String name, int cursorWindowSize);



    // May throw CursorWindowAllocationException

    @RavenwoodRedirect

    private static native long nativeCreateFromParcel(Parcel parcel);

    @RavenwoodRedirect

    private static native void nativeDispose(long windowPtr);

    @RavenwoodRedirect

    private static native void nativeWriteToParcel(long windowPtr, Parcel parcel);



    @RavenwoodRedirect

    private static native String nativeGetName(long windowPtr);

    @RavenwoodRedirect

    private static native byte[] nativeGetBlob(long windowPtr, int row, int column);

    @RavenwoodRedirect

    private static native String nativeGetString(long windowPtr, int row, int column);

    @RavenwoodThrow

    private static native void nativeCopyStringToBuffer(long windowPtr, int row, int column,

            CharArrayBuffer buffer);

    @RavenwoodRedirect

    private static native boolean nativePutBlob(long windowPtr, byte[] value, int row, int column);

    @RavenwoodRedirect

    private static native boolean nativePutString(long windowPtr, String value,

            int row, int column);



    // Below native methods don't do unconstrained work, so are FastNative for performance



    @FastNative

    @RavenwoodThrow

    private static native void nativeClear(long windowPtr);



    @FastNative

    @RavenwoodRedirect

    private static native int nativeGetNumRows(long windowPtr);

    @FastNative

    @RavenwoodRedirect

    private static native boolean nativeSetNumColumns(long windowPtr, int columnNum);

    @FastNative

    @RavenwoodRedirect

    private static native boolean nativeAllocRow(long windowPtr);

    @FastNative

    @RavenwoodThrow

    private static native void nativeFreeLastRow(long windowPtr);



    @FastNative

    @RavenwoodRedirect

    private static native int nativeGetType(long windowPtr, int row, int column);

    @FastNative

    @RavenwoodRedirect

    private static native long nativeGetLong(long windowPtr, int row, int column);

    @FastNative

    @RavenwoodRedirect

    private static native double nativeGetDouble(long windowPtr, int row, int column);



    @FastNative

    @RavenwoodRedirect

    private static native boolean nativePutLong(long windowPtr, long value, int row, int column);

    @FastNative

    @RavenwoodRedirect

    private static native boolean nativePutDouble(long windowPtr, double value, int row, int column);

    @FastNative

    @RavenwoodThrow

    private static native boolean nativePutNull(long windowPtr, int row, int column);
@@ -640,6 +666,7 @@ public class CursorWindow extends SQLiteClosable implements Parcelable { 
     */

    public boolean putBlob(byte[] value,

            @IntRange(from = 0) int row, @IntRange(from = 0) int column) {

        requireNonNull(value);

        acquireReference();

        try {

            return nativePutBlob(mWindowPtr, value, row - mStartPos, column);
@@ -658,6 +685,7 @@ public class CursorWindow extends SQLiteClosable implements Parcelable { 
     */

    public boolean putString(String value,

            @IntRange(from = 0) int row, @IntRange(from = 0) int column) {

        requireNonNull(value);

        acquireReference();

        try {

            return nativePutString(mWindowPtr, value, row - mStartPos, column);

core/java/android/os/Binder.java

+5 −114

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/os/MessageQueue.java

+8 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.ravenwood.annotation.RavenwoodRedirect;

import android.util.Log;

import android.util.Printer;

import android.util.SparseArray;
@@ -39,8 +40,7 @@ import java.util.ArrayList; 
 * {@link Looper#myQueue() Looper.myQueue()}.

 */

@android.ravenwood.annotation.RavenwoodKeepWholeClass

@android.ravenwood.annotation.RavenwoodNativeSubstitutionClass(

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

@android.ravenwood.annotation.RavenwoodRedirectionClass("MessageQueue_host")

public final class MessageQueue {

    private static final String TAG = "MessageQueue";

    private static final boolean DEBUG = false;
@@ -74,12 +74,18 @@ public final class MessageQueue { 
    @UnsupportedAppUsage

    private int mNextBarrierToken;



    @RavenwoodRedirect

    private native static long nativeInit();

    @RavenwoodRedirect

    private native static void nativeDestroy(long ptr);

    @UnsupportedAppUsage

    @RavenwoodRedirect

    private native void nativePollOnce(long ptr, int timeoutMillis); /*non-static for callbacks*/

    @RavenwoodRedirect

    private native static void nativeWake(long ptr);

    @RavenwoodRedirect

    private native static boolean nativeIsPolling(long ptr);

    @RavenwoodRedirect

    private native static void nativeSetFileDescriptorEvents(long ptr, int fd, int events);



    MessageQueue(boolean quitAllowed) {