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

Commit 9871f1a6 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge changes from topic "udc_qpr2_merge" into aosp-main-future 

* changes:
  Fix fs-verity API for secondary users
  Fix build for ag/25776653
  Update @UsesReflection annotation
  Merge Android 24Q1 Release (ab/11220357)
parents 24babf1f bbc133a2

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ 
gen/

.vscode/

*.code-workspace

.gradle/

AconfigFlags.bp

+651 −17

File changed.

Preview size limit exceeded, changes collapsed.

Android.bp

+34 −20
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",
@@ -71,7 +72,6 @@ filegroup { 
        ":framework-jobscheduler-sources", // jobscheduler is not a module for R

        ":framework-keystore-sources",

        ":framework-identity-sources",

        ":framework-location-sources",

        ":framework-mca-effect-sources",

        ":framework-mca-filterfw-sources",

        ":framework-mca-filterpacks-sources",
@@ -95,14 +95,18 @@ filegroup { 
        ":platform-compat-native-aidl",



        // AIDL sources from external directories

        ":android.hardware.biometrics.common-V3-java-source",

        ":android.hardware.biometrics.common-V4-java-source",

        ":android.hardware.biometrics.fingerprint-V3-java-source",

        ":android.hardware.gnss-V2-java-source",

        ":android.hardware.graphics.common-V3-java-source",

        ":android.hardware.keymaster-V4-java-source",

        ":android.hardware.radio-V3-java-source",

        ":android.hardware.radio.data-V3-java-source",

        ":android.hardware.radio.network-V3-java-source",

        ":android.hardware.radio.voice-V3-java-source",

        ":android.hardware.security.keymint-V3-java-source",

        ":android.hardware.security.secureclock-V1-java-source",

        ":android.hardware.thermal-V1-java-source",

        ":android.hardware.thermal-V2-java-source",

        ":android.hardware.tv.tuner-V2-java-source",

        ":android.security.apc-java-source",

        ":android.security.authorization-java-source",
@@ -163,6 +167,12 @@ java_library { 
        //same purpose.

        "//external/robolectric:__subpackages__",

        "//frameworks/layoutlib:__subpackages__",



        // This is for the same purpose as robolectric -- to build "framework.jar" for host-side

        // testing.

        // TODO: Once Ravenwood is stable, move the host side jar targets to this directory,

        // and remove this line.

        "//frameworks/base/tools/hoststubgen:__subpackages__",

    ],

    lint: {

        baseline_filename: "lint-baseline.xml",
@@ -180,7 +190,6 @@ java_defaults { 
            "graphics/java",

            "identity/java",

            "keystore/java",

            "location/java",

            "media/java",

            "media/mca/effect/java",

            "media/mca/filterfw/java",
@@ -216,24 +225,18 @@ java_library { 
        "android.hardware.contexthub-V1.0-java",

        "android.hardware.contexthub-V1.1-java",

        "android.hardware.contexthub-V1.2-java",

        "android.hardware.contexthub-V2-java",

        "android.hardware.contexthub-V3-java",

        "android.hardware.gnss-V1.0-java",

        "android.hardware.gnss-V2.1-java",

        "android.hardware.health-V1.0-java-constants",

        "android.hardware.radio-V1.0-java",

        "android.hardware.radio-V1.1-java",

        "android.hardware.radio-V1.2-java",

        "android.hardware.radio-V1.3-java",

        "android.hardware.radio-V1.4-java",

        "android.hardware.radio-V1.5-java",

        "android.hardware.radio-V1.6-java",

        "android.hardware.radio.data-V2-java",

        "android.hardware.radio.ims-V1-java",

        "android.hardware.radio.messaging-V2-java",

        "android.hardware.radio.modem-V2-java",

        "android.hardware.radio.network-V2-java",

        "android.hardware.radio.sim-V2-java",

        "android.hardware.radio.voice-V2-java",

        "android.hardware.radio.data-V3-java",

        "android.hardware.radio.ims-V2-java",

        "android.hardware.radio.messaging-V3-java",

        "android.hardware.radio.modem-V3-java",

        "android.hardware.radio.network-V3-java",

        "android.hardware.radio.sim-V3-java",

        "android.hardware.radio.voice-V3-java",

        "android.hardware.thermal-V1.0-java-constants",

        "android.hardware.thermal-V1.0-java",

        "android.hardware.thermal-V1.1-java",
@@ -254,8 +257,8 @@ java_library { 
        "android.se.omapi-V1-java",

        "android.system.suspend.control.internal-java",

        "devicepolicyprotosnano",

        "ImmutabilityAnnotation",



        "com.android.sysprop.apex",

        "com.android.sysprop.init",

        "com.android.sysprop.localization",

        "PlatformProperties",
@@ -293,6 +296,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",
@@ -300,7 +304,6 @@ java_defaults { 
            ":framework-jobscheduler-sources",

            ":framework-keystore-sources",

            ":framework-identity-sources",

            ":framework-location-sources",

            ":framework-mca-effect-sources",

            ":framework-mca-filterfw-sources",

            ":framework-mca-filterpacks-sources",
@@ -384,6 +387,7 @@ java_defaults { 
        // system propagates "required" properly.

        "gps_debug.conf",

        "protolog.conf.json.gz",

        "framework-res",

        // any install dependencies should go into framework-minus-apex-install-dependencies

        // rather than here to avoid bloating incremental build time

    ],
@@ -398,6 +402,7 @@ java_defaults { 
    static_libs: [

        "android.hardware.common.fmq-V1-java",

        "bouncycastle-repackaged-unbundled",

        "com.android.sysprop.foldlockbehavior",

        "framework-internal-utils",

        // If MimeMap ever becomes its own APEX, then this dependency would need to be removed

        // in favor of an API stubs dependency in java_library "framework" below.
@@ -559,6 +564,7 @@ java_library { 
    required: [

        "framework-minus-apex",

        "framework-platform-compat-config",

        "framework-location-compat-config",

        "services-platform-compat-config",

        "icu4j-platform-compat-config",

        "TeleService-platform-compat-config",
@@ -587,6 +593,13 @@ filegroup { 
    ],

}



filegroup {

    name: "framework-android-os-unit-testable-src",

    srcs: [

        "core/java/android/os/DdmSyncState.java",

    ],

}



filegroup {

    name: "framework-networkstack-shared-srcs",

    srcs: [
@@ -668,4 +681,5 @@ build = [ 
    "AconfigFlags.bp",

    "ProtoLibraries.bp",

    "TestProtoLibraries.bp",

    "Ravenwood.bp",

]

PREUPLOAD.cfg

+4 −1
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/c 


hidden_api_txt_exclude_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/exclude.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}



ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/base/packages/SystemUI/ktfmt_includes.txt ${PREUPLOAD_FILES}

ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/base/ktfmt_includes.txt ${PREUPLOAD_FILES}



ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}



# This flag check hook runs only for "packages/SystemUI" subdirectory. If you want to include this check for other subdirectories, please modify flag_check.py.

flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PATH}

Ravenwood.bp

0 → 100644
+98 −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-base. 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 {

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

    tools: ["hoststubgen"],

    cmd: "$(location hoststubgen) " +

        "@$(location ravenwood/ravenwood-standard-options.txt) " +



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



        "--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 ravenwood/framework-minus-apex-ravenwood-policies.txt) " +

        "--annotation-allowed-classes-file $(location ravenwood/ravenwood-annotation-allowed-classes.txt) ",

    srcs: [

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

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

        "ravenwood/ravenwood-standard-options.txt",

        "ravenwood/ravenwood-annotation-allowed-classes.txt",

    ],

    out: [

        "ravenwood.jar",



        // Following files are created just as FYI.

        "hoststubgen_keep_all.txt",

        "hoststubgen_dump.txt",



        "hoststubgen_framework-minus-apex.log",

    ],

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

}



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

// Note this emits a "device side" output, so that ravenwood tests can (implicitly)

// depend on it.

java_genrule {

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

    defaults: ["hoststubgen-for-prototype-only-genrule"],

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

    srcs: [

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

    ],

    out: [

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

    ],

}



android_ravenwood_libgroup {

    name: "ravenwood-runtime",

    libs: [

        "framework-minus-apex.ravenwood",

        "hoststubgen-helper-runtime.ravenwood",

        "hoststubgen-helper-framework-runtime.ravenwood",

        "junit",

        "truth",

        "ravenwood-junit-impl",

        "android.test.mock.ravenwood",

    ],

}



android_ravenwood_libgroup {

    name: "ravenwood-utils",

    libs: [

        "junit",

        "truth",

        "ravenwood-junit",

    ],

}