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

Commit 0a8c338b authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge changes from topic "2024-06-19-aosp-future-cp" into aosp-main-future 

* changes:
  [Ravenwood] Make Os.stat() family available
  [Ravenwood] Relax the test method name validator
  Remove redundant genrules
  Rename nano prot classes to avoid conflict
  Move ravenwood-runtime ravenwood-utils to f/b/r
parents d55c4749 7692bcb3

Ravenwood.bp

+21 −166
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ java_genrule { 


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



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

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

        "--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) " +
@@ -54,14 +54,14 @@ java_genrule { 
        "ravenwood.jar",



        // Following files are created just as FYI.

        "hoststubgen_keep_all.txt",

        "hoststubgen_dump.txt",

        "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"],

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

}



// Extract the impl jar from "framework-minus-apex.ravenwood-base" for subsequent build rules.
@@ -79,43 +79,6 @@ java_genrule { 
    ],

}



// Extract the stats file.

genrule {

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

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

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

    srcs: [

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

    ],

    out: [

        "hoststubgen_framework-minus-apex_stats.csv",

    ],

}



genrule {

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

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

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

    srcs: [

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

    ],

    out: [

        "hoststubgen_framework-minus-apex_apis.csv",

    ],

}



genrule {

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

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

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

    srcs: [

        ":framework-minus-apex.ravenwood-base{hoststubgen_keep_all.txt}",

    ],

    out: [

        "hoststubgen_framework-minus-apex_keep_all.txt",

    ],

}



java_library {

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

    installable: false, // host only jar.
@@ -138,8 +101,8 @@ java_genrule { 


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



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

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

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

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



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

        "--policy-override-file $(location :ravenwood-services-policies) " +
@@ -154,14 +117,14 @@ java_genrule { 
        "ravenwood.jar",



        // Following files are created just as FYI.

        "hoststubgen_keep_all.txt",

        "hoststubgen_dump.txt",

        "hoststubgen_services.core_keep_all.txt",

        "hoststubgen_services.core_dump.txt",



        "hoststubgen_services.core.log",

        "hoststubgen_services.core_stats.csv",

        "hoststubgen_services.core_apis.csv",

    ],

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

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

}



java_genrule {
@@ -176,150 +139,42 @@ java_genrule { 
    ],

}



// Extract the stats file.

genrule {

    name: "services.core.ravenwood.stats",

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

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

    srcs: [

        ":services.core.ravenwood-base{hoststubgen_services.core_stats.csv}",

    ],

    out: [

        "hoststubgen_services.core_stats.csv",

    ],

}



genrule {

    name: "services.core.ravenwood.apis",

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

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

    srcs: [

        ":services.core.ravenwood-base{hoststubgen_services.core_apis.csv}",

    ],

    out: [

        "hoststubgen_services.core_apis.csv",

    ],

}



genrule {

    name: "services.core.ravenwood.keep_all",

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

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

    srcs: [

        ":services.core.ravenwood-base{hoststubgen_keep_all.txt}",

    ],

    out: [

        "hoststubgen_services.core_keep_all.txt",

    ],

}



java_library {

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

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

    installable: false,

    static_libs: [

        "services.core.ravenwood",

    ],

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

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

}



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",

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

}



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 {

// Also apply jarjar.

java_library {

    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"],

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

    static_libs: [

        "framework-minus-apex.ravenwood",

    ],

    sdk_version: "core_platform",

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

}



java_genrule {

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

    name: "200-kxml2-android",

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

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

    srcs: [":kxml2-android"],

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

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

}



java_genrule {

    name: "z00-all-updatable-modules-system-stubs",

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

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

    srcs: [":all-updatable-modules-system-stubs"],

    out: ["z00-all-updatable-modules-system-stubs.jar"],

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

}



android_ravenwood_libgroup {

    name: "ravenwood-runtime",

    libs: [

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

        "200-kxml2-android",



        "ravenwood-runtime-common-ravenwood",



        "android.test.mock.ravenwood",

        "ravenwood-helper-runtime",

        "hoststubgen-helper-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",

        "ravenwood-junit-impl-flag",

        "mockito-ravenwood-prebuilt",

        "inline-mockito-ravenwood-prebuilt",



        // It's a stub, so it should be towards the end.

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

    ],

    jni_libs: [

        "libandroid_runtime",

        "libravenwood_runtime",

    ],

}



android_ravenwood_libgroup {

    name: "ravenwood-utils",

    libs: [

        "junit",

        "truth",

        "flag-junit",

        "ravenwood-framework",

        "ravenwood-junit",

        "mockito-ravenwood-prebuilt",

        "inline-mockito-ravenwood-prebuilt",

    ],

}

ravenwood/Android.bp

+88 −6
Original line number Diff line number Diff line
@@ -230,6 +230,12 @@ java_device_for_host { 
    ],

}



filegroup {

    name: "ravenwood-framework-jarjar-rules",

    srcs: ["texts/ravenwood-framework-jarjar-rules.txt"],

    visibility: ["//frameworks/base"],

}



filegroup {

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

    srcs: ["texts/ravenwood-services-jarjar-rules.txt"],
@@ -268,11 +274,87 @@ sh_test_host { 
    src: "scripts/ravenwood-stats-checker.sh",

    test_suites: ["general-tests"],

    data: [

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

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

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

        ":services.core.ravenwood.stats",

        ":services.core.ravenwood.apis",

        ":services.core.ravenwood.keep_all",

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

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

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

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

        ":services.core.ravenwood-base{hoststubgen_services.core_stats.csv}",

        ":services.core.ravenwood-base{hoststubgen_services.core_apis.csv}",

        ":services.core.ravenwood-base{hoststubgen_services.core_keep_all.txt}",

        ":services.core.ravenwood-base{hoststubgen_services.core_dump.txt}",

    ],

}



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",

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

}



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",

    ],

}



android_ravenwood_libgroup {

    name: "ravenwood-runtime",

    libs: [

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

        "200-kxml2-android",



        "ravenwood-runtime-common-ravenwood",



        "android.test.mock.ravenwood",

        "ravenwood-helper-runtime",

        "hoststubgen-helper-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",

        "ravenwood-junit-impl-flag",

        "mockito-ravenwood-prebuilt",

        "inline-mockito-ravenwood-prebuilt",



        // It's a stub, so it should be towards the end.

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

    ],

    jni_libs: [

        "libandroid_runtime",

        "libravenwood_runtime",

    ],

}



android_ravenwood_libgroup {

    name: "ravenwood-utils",

    libs: [

        "junit",

        "truth",

        "flag-junit",

        "ravenwood-framework",

        "ravenwood-junit",

        "mockito-ravenwood-prebuilt",

        "inline-mockito-ravenwood-prebuilt",

    ],

}

ravenwood/bivalenttest/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ android_ravenwood_test { 
        "androidx.annotation_annotation",

        "androidx.test.ext.junit",

        "androidx.test.rules",



        // To make sure it won't cause VerifyError (b/324063814)

        "platformprotosnano",

    ],

    srcs: [

        "test/**/*.java",

ravenwood/coretest/test/com/android/ravenwoodtest/coretest/methodvalidation/RavenwoodTestMethodValidation_Fail01_Test.java

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.ravenwoodtest.coretest.methodvalidation;



import android.platform.test.ravenwood.RavenwoodRule;



import androidx.test.runner.AndroidJUnit4;



import org.junit.Rule;

import org.junit.Test;

import org.junit.rules.ExpectedException;

import org.junit.rules.RuleChain;

import org.junit.runner.RunWith;



/**

 * RavenwoodRule has a validator to ensure "test-looking" methods have valid JUnit annotations.

 * This class contains tests for this validator.

 */

@RunWith(AndroidJUnit4.class)

public class RavenwoodTestMethodValidation_Fail01_Test {

    private ExpectedException mThrown = ExpectedException.none();

    private final RavenwoodRule mRavenwood = new RavenwoodRule();



    @Rule

    public final RuleChain chain = RuleChain.outerRule(mThrown).around(mRavenwood);



    public RavenwoodTestMethodValidation_Fail01_Test() {

        mThrown.expectMessage("Method setUp() doesn't have @Before");

    }



    @SuppressWarnings("JUnit4SetUpNotRun")

    public void setUp() {

    }



    @Test

    public void testEmpty() {

    }

}

ravenwood/coretest/test/com/android/ravenwoodtest/coretest/methodvalidation/RavenwoodTestMethodValidation_Fail02_Test.java

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.ravenwoodtest.coretest.methodvalidation;



import android.platform.test.ravenwood.RavenwoodRule;



import androidx.test.runner.AndroidJUnit4;



import org.junit.Rule;

import org.junit.Test;

import org.junit.rules.ExpectedException;

import org.junit.rules.RuleChain;

import org.junit.runner.RunWith;



/**

 * RavenwoodRule has a validator to ensure "test-looking" methods have valid JUnit annotations.

 * This class contains tests for this validator.

 */

@RunWith(AndroidJUnit4.class)

public class RavenwoodTestMethodValidation_Fail02_Test {

    private ExpectedException mThrown = ExpectedException.none();

    private final RavenwoodRule mRavenwood = new RavenwoodRule();



    @Rule

    public final RuleChain chain = RuleChain.outerRule(mThrown).around(mRavenwood);



    public RavenwoodTestMethodValidation_Fail02_Test() {

        mThrown.expectMessage("Method tearDown() doesn't have @After");

    }



    @SuppressWarnings("JUnit4TearDownNotRun")

    public void tearDown() {

    }



    @Test

    public void testEmpty() {

    }

}