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

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

Snap for 4453288 from 1e79b2e2 to pi-release 

Change-Id: I285f87544165a1c1c2aa7965e19029326129a3e5
parents 2c44e11d 1e79b2e2

cmds/dumpstate/Android.bp

+4 −18
Original line number Diff line number Diff line
@@ -24,20 +24,6 @@ cc_defaults { 
    ],

}



cc_library_headers {

    name: "dumpstate_headers",

    vendor_available: true,

    export_include_dirs: ["."],

    header_libs: [

        "libbase_headers",

        "libutils_headers",

    ],

    export_header_lib_headers: [

        "libbase_headers",

        "libutils_headers",

    ],

}



cc_library_shared {

    name: "libdumpstateutil",

    defaults: ["dumpstate_defaults"],
@@ -45,8 +31,6 @@ cc_library_shared { 
    vndk: {

        enabled: true,

    },

    header_libs: ["dumpstate_headers"],

    export_header_lib_headers: ["dumpstate_headers"],

    srcs: [

        "DumpstateInternal.cpp",

        "DumpstateUtil.cpp",
@@ -55,6 +39,10 @@ cc_library_shared { 
        "libbase",

        "liblog",

    ],

    export_include_dirs: ["."],

    export_shared_lib_headers: [

        "libbase",

    ],

}



cc_library_shared {
@@ -78,7 +66,6 @@ cc_library_shared { 
cc_binary {

    name: "dumpstate",

    defaults: ["dumpstate_defaults"],

    header_libs: ["dumpstate_headers"],

    shared_libs: [

        "android.hardware.dumpstate@1.0",

        "libziparchive",
@@ -106,7 +93,6 @@ cc_binary { 
cc_test {

    name: "dumpstate_test",

    defaults: ["dumpstate_defaults"],

    header_libs: ["dumpstate_headers"],

    shared_libs: [

        "libziparchive",

        "libbase",

libs/vr/libbufferhub/Android.bp

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

        "-DTRACE=0",

        "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",

        "-Wall",

        "-Werror",

    ],

    export_include_dirs: localIncludeFiles,

    static_libs: staticLibraries,

libs/vr/libbufferhubqueue/Android.bp

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

        "-DTRACE=0",

        "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",

        "-Wall",

        "-Werror",

        "-Wno-format",

        "-Wno-unused-parameter",

        "-Wno-unused-variable",

    ],

    srcs: sourceFiles,

    export_include_dirs: includeFiles,

libs/vr/libbufferhubqueue/tests/Android.bp

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

        "-O0",

        "-g",

        "-Wall",

        "-Werror",

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

    ],

    name: "buffer_hub_queue-test",

    tags: ["optional"],
@@ -49,6 +52,8 @@ cc_test { 
        "-DTRACE=0",

        "-O0",

        "-g",

        "-Wall",

        "-Werror",

    ],

    name: "buffer_hub_queue_producer-test",

    tags: ["optional"],

libs/vr/libdisplay/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ 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,