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

Commit 6f53f8ef authored by Alix Espino's avatar Alix Espino Committed by Automerger Merge Worker
Browse files

Merge "Moved contents of clang_cflags into cflags" am: d3918d8d am: acb8def0 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2070647



Change-Id: I54a9190af6cfa30ea64969d296a93238b1de158b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1bcadb82 acb8def0

fastboot/Android.bp

+3 −5
Original line number Diff line number Diff line
@@ -130,12 +130,10 @@ cc_defaults { 
        "-Werror",

        "-Wvla",

        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",

        "-Wthread-safety",

    ],

    rtti: true,



    clang_cflags: [

        "-Wthread-safety",

    ],

}



cc_binary {
@@ -215,7 +213,7 @@ cc_defaults { 
        "-Werror",

        "-Wunreachable-code",

        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",

        "-D_FILE_OFFSET_BITS=64"

        "-D_FILE_OFFSET_BITS=64",

    ],



    target: {
@@ -411,7 +409,7 @@ cc_test_host { 
        ":fastboot_test_vendor_ramdisk_replace",

        ":fastboot_test_vendor_boot_v3",

        ":fastboot_test_vendor_boot_v4_without_frag",

        ":fastboot_test_vendor_boot_v4_with_frag"

        ":fastboot_test_vendor_boot_v4_with_frag",

    ],

}