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

Commit a902b38f authored by Yiwei Zhang's avatar Yiwei Zhang Committed by android-build-merger
Browse files

Move vkjson into framework/native/vulkan am: f9a57e6a 

am: 92b85521

Change-Id: I61443516f0cad99649c6457965832bcbf48e475c
parents 67325de4 92b85521

vulkan/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -55,4 +55,5 @@ subdirs = [ 
    "nulldrv",

    "libvulkan",

    "tools",

    "vkjson",

]

vulkan/vkjson/.clang-format

0 → 100644
+1 −0
Original line number Diff line number Diff line 
BasedOnStyle: Chromium

vulkan/vkjson/Android.bp

0 → 100644
+52 −0
Original line number Diff line number Diff line 
cc_library_static {

    name: "libvkjson",

    srcs: [

        "vkjson.cc",

        "vkjson_instance.cc",

    ],

    cflags: [

        "-Wall",

        "-Werror",

    ],

    cppflags: [

        "-std=c++11",

        "-Wno-sign-compare",

    ],

    export_include_dirs: [

        ".",

    ],

    whole_static_libs: [

        "cjson",

    ],

    header_libs: [

        "vulkan_headers",

    ],

}



cc_library_static {

    name: "libvkjson_ndk",

    clang: true,

    srcs: [

        "vkjson.cc",

        "vkjson_instance.cc",

    ],

    cflags: [

        "-Wall",

        "-Werror",

    ],

    cppflags: [

        "-std=c++11",

        "-Wno-sign-compare",

    ],

    export_include_dirs: [

        ".",

    ],

    whole_static_libs: [

        "cjson_ndk",

    ],

    header_libs: [

        "vulkan_headers_ndk",

    ],

    sdk_version: "24",

    stl: "libc++_static",

}