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

Commit 20ee65ed authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "hwui-libui" 

* changes:
  [libui] Create a libui-types static library.
  Allow libmath to be built on windows
parents 058601c1 e55ce8fa

libs/math/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ cc_library_static { 
    host_supported: true,

    vendor_available: true,

    export_include_dirs: ["include"],

    target:  {

        windows: {

            enabled: true,

        }

    }

}



subdirs = ["tests"]

libs/ui/Android.bp

+67 −3
Original line number Diff line number Diff line
@@ -12,6 +12,64 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



cc_defaults {

    name: "libui-defaults",

    clang: true,

    cflags: [

        "-Wall",

        "-Werror",

    ],

    cppflags: [

        "-Wextra",

    ],



    sanitize: {

        integer_overflow: true,

        misc_undefined: ["bounds"],

    },



}



cc_library_static {

    name: "libui-types",

    vendor_available: true,

    host_supported: true,

    target: {

        windows: {

            enabled: true,

        }

    },



    defaults: [

        "libui-defaults",

    ],



    apex_available: [

        "//apex_available:anyapex",

	"//apex_available:platform",

    ],

    shared_libs: [

        "libutils",

    ],



    static_libs: [

        "libmath",

    ],



    srcs: [

        "ColorSpace.cpp",

    ],



    export_include_dirs: [

        "include_types",

    ],



    export_static_lib_headers: [

        "libmath",

    ],



}



cc_library_shared {

    name: "libui",

    vendor_available: true,
@@ -35,7 +93,6 @@ cc_library_shared { 
    },



    srcs: [

        "ColorSpace.cpp",

        "BufferHubBuffer.cpp",

        "BufferHubEventFd.cpp",

        "BufferHubMetadata.cpp",
@@ -68,8 +125,11 @@ cc_library_shared { 
        "include_private",

    ],



    defaults: [

        "libui-defaults",

        // Uncomment the following line to enable VALIDATE_REGIONS traces

        //defaults: ["libui-validate-regions-defaults"],

    ],



    shared_libs: [

        "android.frameworks.bufferhub@1.0",
@@ -104,6 +164,10 @@ cc_library_shared { 
        "libmath",

    ],



    whole_static_libs: [

        "libui-types",

    ],



    // bufferhub is not used when building libgui for vendors

    target: {

        vendor: {

libs/ui/include_vndk/ui/ColorSpace.h

+1 −1
Original line number Diff line number Diff line 
../../include/ui/ColorSpace.h
 
 No newline at end of file
 
../../include_types/ui/ColorSpace.h
 
 No newline at end of file