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

Commit 3aefe338 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Start adding build rules for ravenwood 

- Add "framework-minus-apex.ravenwood".
- Update the behavior of: --default-throw:
  - Now this will "keep" the subject classes and fields.
- When a 'throw' directive is specified on a static initializer,
  it's now handled as 'keep', because otherwise the class
  wouldn't be usable.

Test: ./scripts/run-all-tests.sh
Test: m framework-minus-apex.ravenwood
Bug: 292141694
Change-Id: If4d650dc175a5a78cf8844dfed2217c19f2d5790
parent 30d4a684

Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ filegroup { 
    srcs: [

        // Java/AIDL sources under frameworks/base

        ":framework-annotations",

        ":ravenwood-annotations",

        ":framework-blobstore-sources",

        ":framework-core-sources",

        ":framework-drm-sources",
@@ -284,6 +285,7 @@ java_defaults { 
        enforce_permissions_exceptions: [

            // Do not add entries to this list.

            ":framework-annotations",

            ":ravenwood-annotations",

            ":framework-blobstore-sources",

            ":framework-core-sources",

            ":framework-drm-sources",
@@ -409,7 +411,6 @@ java_defaults { 
        "audiopolicy-aidl-java",

        "sounddose-aidl-java",

        "modules-utils-expresslog",

        "hoststubgen-annotations",

    ],

}
@@ -838,4 +839,5 @@ build = [ 
    "AconfigFlags.bp",

    "ProtoLibraries.bp",

    "TestProtoLibraries.bp",

    "Ravenwood.bp",

]

OWNERS

+3 −0
Original line number Diff line number Diff line
@@ -34,3 +34,6 @@ per-file TestProtoLibraries.bp = file:platform/tools/tradefederation:/OWNERS 


per-file ZYGOTE_OWNERS = file:/ZYGOTE_OWNERS

per-file SQLITE_OWNERS = file:/SQLITE_OWNERS



per-file *ravenwood* = file:ravenwood/OWNERS

per-file *Ravenwood* = file:ravenwood/OWNERS

Ravenwood.bp

0 → 100644
+70 −0
Original line number Diff line number Diff line 
// Copyright (C) 2023 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.



// We need this "trampoline" rule to force soong to give a host-side jar to

// framework-minus-apex.ravenwood. Otherwise, soong would mix up the arch (?) and we'd get

// a dex jar.

java_library {

    name: "framework-minus-apex-for-hoststubgen",

    installable: false, // host only jar.

    static_libs: [

        "framework-minus-apex",

    ],

    sdk_version: "core_platform",

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

}



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

java_genrule_host {

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

    tools: ["hoststubgen"],

    cmd: "$(location hoststubgen) " +

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



        "--out-stub-jar $(location ravenwood_stub.jar) " +

        "--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 :framework-minus-apex-for-hoststubgen) " +

        "--policy-override-file $(location framework-minus-apex-ravenwood-policies.txt) ",

    srcs: [

        ":framework-minus-apex-for-hoststubgen",

        "framework-minus-apex-ravenwood-policies.txt",

        ":ravenwood-standard-options",

    ],

    out: [

        "ravenwood.jar",

        "ravenwood_stub.jar", // It's not used. TODO: Update hoststubgen to make it optional.



        // Following files are created just as FYI.

        "hoststubgen_keep_all.txt",

        "hoststubgen_dump.txt",

    ],

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

}



// Extract the impl jar from "framework-minus-apex.ravenwood-base" for subsequent build rules.

java_genrule_host {

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

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

    srcs: [

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

    ],

    out: [

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

    ],

    visibility: ["//visibility:public"],

}

core/java/android/util/Base64.java

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import java.io.UnsupportedEncodingException; 
 * href="http://www.ietf.org/rfc/rfc2045.txt">2045</a> and <a

 * href="http://www.ietf.org/rfc/rfc3548.txt">3548</a>.

 */

@android.ravenwood.annotations.RavenwoodWholeClassKeep

public class Base64 {

    /**

     * Default values for encoder/decoder flags.

framework-minus-apex-ravenwood-policies.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# Ravenwood "policy" file for framework-minus-apex.