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

Commit f38d5996 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Rename nano prot classes to avoid conflict 

Bug: 324063814
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Merged-in: Icab04d2b290a8ea568887dcd837bdedecf64ab0d
Change-Id: Icab04d2b290a8ea568887dcd837bdedecf64ab0d
parent e5e97273

Ravenwood.bp

+8 −5
Original line number Diff line number Diff line
@@ -225,12 +225,15 @@ 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 {

// Also apply jarjar.

java_library {

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

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

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

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

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

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

    static_libs: [

        "framework-minus-apex.ravenwood",

    ],

    sdk_version: "core_platform",

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

}



java_genrule {

ravenwood/Android.bp

+6 −0
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"],

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/texts/ravenwood-framework-jarjar-rules.txt

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# To avoid VerifyError on nano proto files (b/324063814)

rule com.**.nano.**   devicenano.@0