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

Commit 1ee8972c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7298338 from 8514c8e0 to sc-release 

Change-Id: I682a345066b65f90f48260335105cd9d6121ddee
parents 180c38dd 8514c8e0

.clang-format

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ ContinuationIndentWidth: 8 
IndentWidth: 4

PenaltyBreakBeforeFirstCallParameter: 100000

SpacesBeforeTrailingComments: 1

IncludeBlocks: Preserve

cmds/dumpstate/dumpstate.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2178,13 +2178,13 @@ void Dumpstate::DumpstateBoard(int out_fd) { 
    }



    /*

     * mount debugfs for non-user builds with ro.product.enforce_debugfs_restrictions

     * mount debugfs for non-user builds with ro.product.debugfs_restrictions.enabled

     * set to true and unmount it after invoking dumpstateBoard_* methods.

     * This is to enable debug builds to not have debugfs mounted during runtime.

     * It will also ensure that debugfs is only accessed by the dumpstate HAL.

     */

    auto mount_debugfs =

        android::base::GetBoolProperty("ro.product.enforce_debugfs_restrictions", false);

        android::base::GetBoolProperty("ro.product.debugfs_restrictions.enabled", false);

    if (mount_debugfs) {

        RunCommand("mount debugfs", {"mount", "-t", "debugfs", "debugfs", "/sys/kernel/debug"},

                   AS_ROOT_20);

libs/binder/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -60,10 +60,6 @@ cc_library_headers { 
// Currently, these are only on system android (not vendor, not host)

// TODO(b/183654927) - move these into separate libraries

libbinder_device_interface_sources = [

    "AppOpsManager.cpp",

    "IAppOpsCallback.cpp",

    "IAppOpsService.cpp",



    "IPermissionController.cpp",

    "PermissionCache.cpp",

    "PermissionController.cpp",

libs/binder/rust/Android.bp

+9 −9
Original line number Diff line number Diff line
@@ -65,15 +65,15 @@ rust_bindgen { 
        // rustified

        "--constified-enum", "android::c_interface::consts::.*",



        "--whitelist-type", "android::c_interface::.*",

        "--whitelist-type", "AStatus",

        "--whitelist-type", "AIBinder_Class",

        "--whitelist-type", "AIBinder",

        "--whitelist-type", "AIBinder_Weak",

        "--whitelist-type", "AIBinder_DeathRecipient",

        "--whitelist-type", "AParcel",

        "--whitelist-type", "binder_status_t",

        "--whitelist-function", ".*",

        "--allowlist-type", "android::c_interface::.*",

        "--allowlist-type", "AStatus",

        "--allowlist-type", "AIBinder_Class",

        "--allowlist-type", "AIBinder",

        "--allowlist-type", "AIBinder_Weak",

        "--allowlist-type", "AIBinder_DeathRecipient",

        "--allowlist-type", "AParcel",

        "--allowlist-type", "binder_status_t",

        "--allowlist-function", ".*",

    ],

    shared_libs: [

        "libbinder_ndk",

libs/binder/rust/tests/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ rust_bindgen { 
    source_stem: "bindings",

    cpp_std: "gnu++17",

    bindgen_flags: [

        "--whitelist-type", "Transaction",

        "--whitelist-var", "TESTDATA_.*",

        "--allowlist-type", "Transaction",

        "--allowlist-var", "TESTDATA_.*",

    ],



    shared_libs: [