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

Commit a6fd7fed authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge changes from topic 'vendor_available_libgui' into oc-dr1-dev

am: 8c72947a

Change-Id: Ie7315f7aea25663576402d04a58bbeaa9662e3c4
parents f0eff80a 8c72947a
Loading
Loading
Loading
Loading

include/gui

0 → 120000
+1 −0
Original line number Original line Diff line number Diff line
../libs/gui/include/gui
 No newline at end of file

include/private/gui

0 → 120000
+1 −0
Original line number Original line Diff line number Diff line
../../libs/gui/include/private/gui
 No newline at end of file
+8 −2
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@
cc_library_headers {
cc_library_headers {
    name: "libbinder_headers",
    name: "libbinder_headers",
    export_include_dirs: ["include"],
    export_include_dirs: ["include"],
    vendor_available: true,
}
}


cc_library {
cc_library {
@@ -74,13 +75,18 @@ cc_library {
        "libcutils",
        "libcutils",
        "libutils",
        "libutils",
    ],
    ],

    header_libs: [
        "libbinder_headers",
    ],

    export_shared_lib_headers: [
    export_shared_lib_headers: [
        "libbase",
        "libbase",
        "libutils",
        "libutils",
    ],
    ],


    export_include_dirs: [
    export_header_lib_headers: [
        "include",
        "libbinder_headers",
    ],
    ],


    clang: true,
    clang: true,
+11 −0
Original line number Original line Diff line number Diff line
@@ -11,9 +11,15 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// See the License for the specific language governing permissions and
// limitations under the License.
// limitations under the License.
cc_library_headers {
    name: "libgui_headers",
    vendor_available: true,
    export_include_dirs: ["include"],
}


cc_library_shared {
cc_library_shared {
    name: "libgui",
    name: "libgui",
    vendor_available: true,


    clang: true,
    clang: true,
    cppflags: [
    cppflags: [
@@ -119,6 +125,7 @@ cc_library_shared {


    header_libs: [
    header_libs: [
        "libnativebase_headers",
        "libnativebase_headers",
        "libgui_headers",
    ],
    ],


    export_shared_lib_headers: [
    export_shared_lib_headers: [
@@ -129,6 +136,10 @@ cc_library_shared {
        "android.hardware.graphics.bufferqueue@1.0",
        "android.hardware.graphics.bufferqueue@1.0",
    ],
    ],


    export_header_lib_headers: [
        "libgui_headers",
    ],

    export_include_dirs: [
    export_include_dirs: [
        "include",
        "include",
    ],
    ],
Loading