Add product_available to product available modules

vendor_available modules were available to product modules.
However, not all vendor_available modules are required to be
available to product modules. Some modules want to be available only
to product modules but not vendor modules.

To cover the requirement, we separate product_available from
vendor_available.
vendor_available will not provide product available module.

Rename libcutils/include_vndk to libcutils/include_outside_system as
it provides the headers to the modules outside the system partition
including /product.

Bug: 150902910
Test: build
Change-Id: I791b5a6a1dc99442065debfce6fa0f54a335fcea
This commit is contained in:
Justin Yun 2020-11-11 19:17:40 +09:00
parent 382d70e770
commit feef4d390f
32 changed files with 21 additions and 5 deletions

View file

@ -32,6 +32,7 @@ libcutils_nonwindows_sources = [
cc_library_headers {
name: "libcutils_headers",
vendor_available: true,
product_available: true,
recovery_available: true,
ramdisk_available: true,
vendor_ramdisk_available: true,
@ -45,7 +46,10 @@ cc_library_headers {
export_include_dirs: ["include"],
target: {
vendor: {
override_export_include_dirs: ["include_vndk"],
override_export_include_dirs: ["include_outside_system"],
},
product: {
override_export_include_dirs: ["include_outside_system"],
},
linux_bionic: {
enabled: true,
@ -60,6 +64,7 @@ cc_library_headers {
cc_library {
name: "libcutils_sockets",
vendor_available: true,
product_available: true,
recovery_available: true,
ramdisk_available: true,
vendor_ramdisk_available: true,
@ -143,6 +148,7 @@ cc_test {
cc_library {
name: "libcutils",
vendor_available: true,
product_available: true,
vndk: {
enabled: true,
support_system_process: true,
@ -234,14 +240,19 @@ cc_library {
},
},
// qtaguid.cpp loads libnetd_client.so with dlopen(). Since
// the interface of libnetd_client.so may vary between AOSP
// releases, exclude qtaguid.cpp from the VNDK-SP variant.
vendor: {
exclude_srcs: [
// qtaguid.cpp loads libnetd_client.so with dlopen(). Since
// the interface of libnetd_client.so may vary between AOSP
// releases, exclude qtaguid.cpp from the VNDK-SP variant.
"qtaguid.cpp",
],
}
},
product: {
exclude_srcs: [
"qtaguid.cpp",
],
},
},
whole_static_libs: ["libcutils_sockets"],

View file

@ -1,6 +1,7 @@
cc_library_headers {
name: "libprocessgroup_headers",
vendor_available: true,
product_available: true,
ramdisk_available: true,
vendor_ramdisk_available: true,
recovery_available: true,
@ -36,6 +37,7 @@ cc_library {
vendor_ramdisk_available: true,
recovery_available: true,
vendor_available: true,
product_available: true,
vndk: {
enabled: true,
support_system_process: true,

View file

@ -1,6 +1,7 @@
cc_library_headers {
name: "libsystem_headers",
vendor_available: true,
product_available: true,
recovery_available: true,
vendor_ramdisk_available: true,
host_supported: true,

View file

@ -15,6 +15,7 @@
cc_library_headers {
name: "libutils_headers",
vendor_available: true,
product_available: true,
recovery_available: true,
vendor_ramdisk_available: true,
host_supported: true,
@ -62,6 +63,7 @@ cc_library_headers {
cc_defaults {
name: "libutils_defaults",
vendor_available: true,
product_available: true,
recovery_available: true,
vndk: {
enabled: true,