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

Commit a206b8cb authored by Jiyong Park's avatar Jiyong Park
Browse files

Set apex_available property 

The marked library(ies) were available to the APEXes via the hand-written
whitelist in build/soong/apex/apex.go. Trying to remove the whitelist
by adding apex_available property to the Android.bp of the libraries.

In this change, following libs were made available to all apexes because
their usage is quite common and there is no reason to restrict them
to some APEXes.

* libbase_headers
* libcutils, libcutils_headers
* libutils_headers, libsystem_headers
* liblog_headers
* libbacktrace, libbacktrace_headers
* libcrypto_utils

Exempt-From-Owner-Approval: cherry-pick from aosp

Bug: 150999716
Test: m
Merged-In: If3d3652e6604ed4f6d7694fe7ac61ae496621026
(cherry picked from commit 8bf9b163)
Change-Id: If3d3652e6604ed4f6d7694fe7ac61ae496621026
parent 8ee349bd

base/Android.bp

+4 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,10 @@ cc_library_headers { 
            enabled: true,

            enabled: true,

        },

        },

    },

    },

    apex_available: [

        "//apex_available:anyapex",

        "//apex_available:platform",

    ],

}

}





cc_defaults {

cc_defaults {

libbacktrace/Android.bp

+8 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,10 @@ cc_library_headers { 
    recovery_available: true,

    recovery_available: true,

    native_bridge_supported: true,

    native_bridge_supported: true,

    export_include_dirs: ["include"],

    export_include_dirs: ["include"],

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

}

}





cc_defaults {

cc_defaults {
@@ -92,6 +96,10 @@ cc_library { 
    name: "libbacktrace",

    name: "libbacktrace",

    vendor_available: false,

    vendor_available: false,

    recovery_available: true,

    recovery_available: true,

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    vndk: {

    vndk: {

        enabled: true,

        enabled: true,

        support_system_process: true,

        support_system_process: true,

libcrypto_utils/Android.bp

+4 −0
Original line number Original line Diff line number Diff line
@@ -38,4 +38,8 @@ cc_library { 
            enabled: true,

            enabled: true,

        },

        },

    },

    },

    apex_available: [

        "//apex_available:platform",

        "com.android.adbd",

    ],

}
 
}

libcutils/Android.bp

+8 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,10 @@ cc_library_headers { 
    vendor_available: true,

    vendor_available: true,

    recovery_available: true,

    recovery_available: true,

    host_supported: true,

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    native_bridge_supported: true,

    native_bridge_supported: true,

    export_include_dirs: ["include"],

    export_include_dirs: ["include"],

    target: {

    target: {
@@ -134,6 +138,10 @@ cc_library { 
    },

    },

    recovery_available: true,

    recovery_available: true,

    host_supported: true,

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    native_bridge_supported: true,

    native_bridge_supported: true,

    srcs: [

    srcs: [

        "config_utils.cpp",

        "config_utils.cpp",

liblog/Android.bp

+4 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,10 @@ cc_library_headers { 
    vendor_available: true,

    vendor_available: true,

    ramdisk_available: true,

    ramdisk_available: true,

    recovery_available: true,

    recovery_available: true,

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

    native_bridge_supported: true,

    native_bridge_supported: true,

    export_include_dirs: ["include"],

    export_include_dirs: ["include"],

    system_shared_libs: [],

    system_shared_libs: [],