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

Commit 7ada14a4 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Revert "Use -Werror in frameworks/native/libs/vr"" am: a6d2f557 am:... 

Merge "Revert "Use -Werror in frameworks/native/libs/vr"" am: a6d2f557 am: 4276e8a1 am: 39757003
am: d14ee8e1

Change-Id: Iace2973a9efccb9e821284b701ee745a5727892d
parents 7c7a10fd d14ee8e1

libs/vr/libbufferhub/Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ cc_library { 
        "-DLOG_TAG=\"libbufferhub\"",

        "-DTRACE=0",

        "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",

        "-Wall",

        "-Werror",

        "-Wno-error=sign-compare", // to fix later

    ],

    export_include_dirs: localIncludeFiles,

    static_libs: staticLibraries,
@@ -69,10 +66,5 @@ cc_test { 
    shared_libs: sharedLibraries,

    header_libs: headerLibraries,

    name: "bufferhub_tests",

    cflags: [

        "-Wall",

        "-Werror",

        "-Wno-error=sign-compare", // to fix later

    ],

}

libs/vr/libbufferhubqueue/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -49,11 +49,6 @@ cc_library { 
        "-DLOG_TAG=\"libbufferhubqueue\"",

        "-DTRACE=0",

        "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",

        "-Wall",

        "-Werror",

        "-Wno-error=sign-compare", // to fix later

        "-Wno-unused-parameter",

        "-Wno-unused-variable",

    ],

    srcs: sourceFiles,

    export_include_dirs: includeFiles,

libs/vr/libbufferhubqueue/tests/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ cc_test { 
        "-DTRACE=0",

        "-O0",

        "-g",

        "-Wall",

        "-Werror",

        "-Wno-error=sign-compare", // to fix later

    ],

    name: "buffer_hub_queue-test",

    tags: ["optional"],
@@ -50,9 +47,6 @@ cc_test { 
        "-DTRACE=0",

        "-O0",

        "-g",

        "-Wall",

        "-Werror",

        "-Wno-error=sign-compare", // to fix later

    ],

    name: "buffer_hub_queue_producer-test",

    tags: ["optional"],

libs/vr/libdisplay/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ cc_library { 
        "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",

        "-DGL_GLEXT_PROTOTYPES",

        "-DEGL_EGLEXT_PROTOTYPES",

        "-Wall",

        "-Werror",

    ],  // + [ "-UNDEBUG", "-DDEBUG", "-O0", "-g" ],

    export_include_dirs: localIncludeFiles,

    shared_libs: sharedLibraries,

libs/vr/libdvr/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ cc_library_headers { 
cflags = [

    "-DLOG_TAG=\"libdvr\"",

    "-DTRACE=0",

    "-Wall",

    "-Werror",

]



srcs = [