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

Commit eed53a02 authored by Ray Essick's avatar Ray Essick
Browse files

Explicit apex_available clauses 

Declare explicit apex availability/usage here instead of in
a list hidden within the apex build tools.

Bug: 215589022
Test: build
Change-Id: Id4708473d2528ffdab6c91c71d31c7373749858c
parent 74e2112e

libs/gui/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ cc_library_headers { 
        "android.hardware.graphics.bufferqueue@2.0",

    ],

    min_sdk_version: "29",

    // TODO(b/218719284) can media use be constrained to libgui_bufferqueue_static?

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

        "test_com.android.media.swcodec",

    ],

}



cc_library_headers {

libs/gui/sysprop/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -16,4 +16,9 @@ sysprop_library { 
    cpp: {

        min_sdk_version: "29",

    },

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

        "test_com.android.media.swcodec",

    ],

}

libs/nativebase/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -45,5 +45,9 @@ cc_library_headers { 
            enabled: true,

        },

    },

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

    ],

    min_sdk_version: "29",

}

libs/nativewindow/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ cc_library_headers { 
    // TODO(b/153609531): remove when no longer needed.

    native_bridge_supported: true,

    min_sdk_version: "29",

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

        "test_com.android.media.swcodec",

    ],

    host_supported: true,

}
@@ -64,7 +69,7 @@ cc_library { 
        symbol_file: "libnativewindow.map.txt",

        unversioned: true,

        override_export_include_dirs: [

            "include"

            "include",

        ],

    },

    export_include_dirs: [

libs/ui/Android.bp

+11 −0
Original line number Diff line number Diff line
@@ -235,6 +235,12 @@ cc_library_shared { 
        "libui_headers",

    ],

    min_sdk_version: "29",

    // TODO(b/214400477) to remove use of GraphicBuffer

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

        "test_com.android.media.swcodec",

    ],



    afdo: true,

}
@@ -258,6 +264,11 @@ cc_library_headers { 
        "libmath_headers",

    ],

    min_sdk_version: "29",

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

        "test_com.android.media.swcodec",

    ],

}



// defaults to enable VALIDATE_REGIONS traces