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

Commit 638d8256 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10934304 from 7e948df6 to 24Q1-release 

Change-Id: I4d951ea262e93e09ccc7b8c59722a71b6eaf645d
parents e3448569 7e948df6

AconfigFlags.bp

+7 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ aconfig_srcjars = [ 
    ":android.permission.flags-aconfig-java{.generated_srcjars}",

    ":hwui_flags_java_lib{.generated_srcjars}",

    ":display_flags_lib{.generated_srcjars}",

    ":com.android.internal.foldables.flags-aconfig-java{.generated_srcjars}",

    ":android.multiuser.flags-aconfig-java{.generated_srcjars}",

    ":android.app.flags-aconfig-java{.generated_srcjars}",

    ":android.credentials.flags-aconfig-java{.generated_srcjars}",
@@ -345,6 +346,12 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "com.android.internal.foldables.flags-aconfig-java",

    aconfig_declarations: "fold_lock_setting_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Multi user

aconfig_declarations {

    name: "android.multiuser.flags-aconfig",

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

}

config/preloaded-classes

+8 −6
Original line number Diff line number Diff line
@@ -6519,12 +6519,6 @@ android.security.Scrypt 
android.security.attestationverification.AttestationVerificationManager

android.security.keymaster.ExportResult$1

android.security.keymaster.ExportResult

android.security.keymaster.IKeyAttestationApplicationIdProvider$Stub

android.security.keymaster.IKeyAttestationApplicationIdProvider

android.security.keymaster.KeyAttestationApplicationId$1

android.security.keymaster.KeyAttestationApplicationId

android.security.keymaster.KeyAttestationPackageInfo$1

android.security.keymaster.KeyAttestationPackageInfo

android.security.keymaster.KeyCharacteristics$1

android.security.keymaster.KeyCharacteristics

android.security.keymaster.KeymasterArgument$1
@@ -6549,7 +6543,13 @@ android.security.keystore.AttestationUtils 
android.security.keystore.BackendBusyException

android.security.keystore.DelegatingX509Certificate

android.security.keystore.DeviceIdAttestationException

android.security.keystore.IKeyAttestationApplicationIdProvider$Stub

android.security.keystore.IKeyAttestationApplicationIdProvider

android.security.keystore.KeyAttestationApplicationId$Stub

android.security.keystore.KeyAttestationApplicationId

android.security.keystore.KeyAttestationException

android.security.keystore.KeyAttestationPackageInfo$Stub

android.security.keystore.KeyAttestationPackageInfo

android.security.keystore.KeyExpiredException

android.security.keystore.KeyGenParameterSpec$Builder

android.security.keystore.KeyGenParameterSpec
@@ -6572,6 +6572,8 @@ android.security.keystore.KeystoreResponse$1 
android.security.keystore.KeystoreResponse

android.security.keystore.ParcelableKeyGenParameterSpec$1

android.security.keystore.ParcelableKeyGenParameterSpec

android.security.keystore.Signature$Stub

android.security.keystore.Signature

android.security.keystore.SecureKeyImportUnavailableException

android.security.keystore.StrongBoxUnavailableException

android.security.keystore.UserAuthArgs