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

Commit 9c50f3b8 authored by Jerome Gaillard's avatar Jerome Gaillard
Browse files

Graphics interface libraries only exist for linux/Android 

cc_defaults in graphics/Android.bp should only add libraries to linux
(which includes Android) targets, as those libraries do not exist on
other platforms (macOS/Windows).
This avoids issues when these defaults are added to libraries that build
for host as well as Android (such as libhwui).

Bug: 368328962
Test: N/A
Change-Id: If19aa1f6b66721b86678a036b7f1f185cb90635b
parent e18c738b

graphics/Android.bp

+44 −20
Original line number Diff line number Diff line
@@ -18,9 +18,13 @@ package { 


cc_defaults {

    name: "android.hardware.graphics.allocator-ndk_static",

    target: {

        linux: {

            static_libs: [

                "android.hardware.graphics.allocator-V2-ndk",

            ],

        },

    },

    defaults: [

        "android.hardware.graphics.common-ndk_static",

    ],
@@ -28,9 +32,13 @@ cc_defaults { 


cc_defaults {

    name: "android.hardware.graphics.allocator-ndk_shared",

    target: {

        linux: {

            shared_libs: [

                "android.hardware.graphics.allocator-V2-ndk",

            ],

        },

    },

    defaults: [

        "android.hardware.graphics.common-ndk_shared",

    ],
@@ -38,30 +46,46 @@ cc_defaults { 


cc_defaults {

    name: "android.hardware.graphics.common-ndk_static",

    target: {

        linux: {

            static_libs: [

                "android.hardware.graphics.common-V5-ndk",

            ],

        },

    },

}



cc_defaults {

    name: "android.hardware.graphics.common-ndk_shared",

    target: {

        linux: {

            shared_libs: [

                "android.hardware.graphics.common-V5-ndk",

            ],

        },

    },

}



cc_defaults {

    name: "android.hardware.graphics.composer3-ndk_static",

    target: {

        linux: {

            static_libs: [

                "android.hardware.drm.common-V1-ndk",

                "android.hardware.graphics.composer3-V4-ndk",

            ],

        },

    },

}



cc_defaults {

    name: "android.hardware.graphics.composer3-ndk_shared",

    target: {

        linux: {

            shared_libs: [

                "android.hardware.drm.common-V1-ndk",

                "android.hardware.graphics.composer3-V4-ndk",

            ],

        },

    },

}