From feef4d390ff508a4154bc8ff39ebc5e32f77f054 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Wed, 11 Nov 2020 19:17:40 +0900 Subject: [PATCH] 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 --- libcutils/Android.bp | 21 ++++++++++++++----- .../cutils/android_filesystem_config.h | 0 .../cutils/android_get_control_file.h | 0 .../cutils/android_reboot.h | 0 .../cutils/ashmem.h | 0 .../cutils/atomic.h | 0 .../cutils/bitops.h | 0 .../cutils/compiler.h | 0 .../cutils/config_utils.h | 0 .../cutils/fs.h | 0 .../cutils/hashmap.h | 0 .../cutils/iosched_policy.h | 0 .../cutils/klog.h | 0 .../cutils/list.h | 0 .../cutils/log.h | 0 .../cutils/memory.h | 0 .../cutils/misc.h | 0 .../cutils/multiuser.h | 0 .../cutils/native_handle.h | 0 .../cutils/partition_utils.h | 0 .../cutils/properties.h | 0 .../cutils/qtaguid.h | 0 .../cutils/record_stream.h | 0 .../cutils/sched_policy.h | 0 .../cutils/sockets.h | 0 .../cutils/str_parms.h | 0 .../cutils/threads.h | 0 .../cutils/trace.h | 0 .../cutils/uevent.h | 0 libprocessgroup/Android.bp | 2 ++ libsystem/Android.bp | 1 + libutils/Android.bp | 2 ++ 32 files changed, 21 insertions(+), 5 deletions(-) rename libcutils/{include_vndk => include_outside_system}/cutils/android_filesystem_config.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/android_get_control_file.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/android_reboot.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/ashmem.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/atomic.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/bitops.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/compiler.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/config_utils.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/fs.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/hashmap.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/iosched_policy.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/klog.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/list.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/log.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/memory.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/misc.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/multiuser.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/native_handle.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/partition_utils.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/properties.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/qtaguid.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/record_stream.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/sched_policy.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/sockets.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/str_parms.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/threads.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/trace.h (100%) rename libcutils/{include_vndk => include_outside_system}/cutils/uevent.h (100%) diff --git a/libcutils/Android.bp b/libcutils/Android.bp index 284c0b94c..cf809f1b0 100644 --- a/libcutils/Android.bp +++ b/libcutils/Android.bp @@ -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"], diff --git a/libcutils/include_vndk/cutils/android_filesystem_config.h b/libcutils/include_outside_system/cutils/android_filesystem_config.h similarity index 100% rename from libcutils/include_vndk/cutils/android_filesystem_config.h rename to libcutils/include_outside_system/cutils/android_filesystem_config.h diff --git a/libcutils/include_vndk/cutils/android_get_control_file.h b/libcutils/include_outside_system/cutils/android_get_control_file.h similarity index 100% rename from libcutils/include_vndk/cutils/android_get_control_file.h rename to libcutils/include_outside_system/cutils/android_get_control_file.h diff --git a/libcutils/include_vndk/cutils/android_reboot.h b/libcutils/include_outside_system/cutils/android_reboot.h similarity index 100% rename from libcutils/include_vndk/cutils/android_reboot.h rename to libcutils/include_outside_system/cutils/android_reboot.h diff --git a/libcutils/include_vndk/cutils/ashmem.h b/libcutils/include_outside_system/cutils/ashmem.h similarity index 100% rename from libcutils/include_vndk/cutils/ashmem.h rename to libcutils/include_outside_system/cutils/ashmem.h diff --git a/libcutils/include_vndk/cutils/atomic.h b/libcutils/include_outside_system/cutils/atomic.h similarity index 100% rename from libcutils/include_vndk/cutils/atomic.h rename to libcutils/include_outside_system/cutils/atomic.h diff --git a/libcutils/include_vndk/cutils/bitops.h b/libcutils/include_outside_system/cutils/bitops.h similarity index 100% rename from libcutils/include_vndk/cutils/bitops.h rename to libcutils/include_outside_system/cutils/bitops.h diff --git a/libcutils/include_vndk/cutils/compiler.h b/libcutils/include_outside_system/cutils/compiler.h similarity index 100% rename from libcutils/include_vndk/cutils/compiler.h rename to libcutils/include_outside_system/cutils/compiler.h diff --git a/libcutils/include_vndk/cutils/config_utils.h b/libcutils/include_outside_system/cutils/config_utils.h similarity index 100% rename from libcutils/include_vndk/cutils/config_utils.h rename to libcutils/include_outside_system/cutils/config_utils.h diff --git a/libcutils/include_vndk/cutils/fs.h b/libcutils/include_outside_system/cutils/fs.h similarity index 100% rename from libcutils/include_vndk/cutils/fs.h rename to libcutils/include_outside_system/cutils/fs.h diff --git a/libcutils/include_vndk/cutils/hashmap.h b/libcutils/include_outside_system/cutils/hashmap.h similarity index 100% rename from libcutils/include_vndk/cutils/hashmap.h rename to libcutils/include_outside_system/cutils/hashmap.h diff --git a/libcutils/include_vndk/cutils/iosched_policy.h b/libcutils/include_outside_system/cutils/iosched_policy.h similarity index 100% rename from libcutils/include_vndk/cutils/iosched_policy.h rename to libcutils/include_outside_system/cutils/iosched_policy.h diff --git a/libcutils/include_vndk/cutils/klog.h b/libcutils/include_outside_system/cutils/klog.h similarity index 100% rename from libcutils/include_vndk/cutils/klog.h rename to libcutils/include_outside_system/cutils/klog.h diff --git a/libcutils/include_vndk/cutils/list.h b/libcutils/include_outside_system/cutils/list.h similarity index 100% rename from libcutils/include_vndk/cutils/list.h rename to libcutils/include_outside_system/cutils/list.h diff --git a/libcutils/include_vndk/cutils/log.h b/libcutils/include_outside_system/cutils/log.h similarity index 100% rename from libcutils/include_vndk/cutils/log.h rename to libcutils/include_outside_system/cutils/log.h diff --git a/libcutils/include_vndk/cutils/memory.h b/libcutils/include_outside_system/cutils/memory.h similarity index 100% rename from libcutils/include_vndk/cutils/memory.h rename to libcutils/include_outside_system/cutils/memory.h diff --git a/libcutils/include_vndk/cutils/misc.h b/libcutils/include_outside_system/cutils/misc.h similarity index 100% rename from libcutils/include_vndk/cutils/misc.h rename to libcutils/include_outside_system/cutils/misc.h diff --git a/libcutils/include_vndk/cutils/multiuser.h b/libcutils/include_outside_system/cutils/multiuser.h similarity index 100% rename from libcutils/include_vndk/cutils/multiuser.h rename to libcutils/include_outside_system/cutils/multiuser.h diff --git a/libcutils/include_vndk/cutils/native_handle.h b/libcutils/include_outside_system/cutils/native_handle.h similarity index 100% rename from libcutils/include_vndk/cutils/native_handle.h rename to libcutils/include_outside_system/cutils/native_handle.h diff --git a/libcutils/include_vndk/cutils/partition_utils.h b/libcutils/include_outside_system/cutils/partition_utils.h similarity index 100% rename from libcutils/include_vndk/cutils/partition_utils.h rename to libcutils/include_outside_system/cutils/partition_utils.h diff --git a/libcutils/include_vndk/cutils/properties.h b/libcutils/include_outside_system/cutils/properties.h similarity index 100% rename from libcutils/include_vndk/cutils/properties.h rename to libcutils/include_outside_system/cutils/properties.h diff --git a/libcutils/include_vndk/cutils/qtaguid.h b/libcutils/include_outside_system/cutils/qtaguid.h similarity index 100% rename from libcutils/include_vndk/cutils/qtaguid.h rename to libcutils/include_outside_system/cutils/qtaguid.h diff --git a/libcutils/include_vndk/cutils/record_stream.h b/libcutils/include_outside_system/cutils/record_stream.h similarity index 100% rename from libcutils/include_vndk/cutils/record_stream.h rename to libcutils/include_outside_system/cutils/record_stream.h diff --git a/libcutils/include_vndk/cutils/sched_policy.h b/libcutils/include_outside_system/cutils/sched_policy.h similarity index 100% rename from libcutils/include_vndk/cutils/sched_policy.h rename to libcutils/include_outside_system/cutils/sched_policy.h diff --git a/libcutils/include_vndk/cutils/sockets.h b/libcutils/include_outside_system/cutils/sockets.h similarity index 100% rename from libcutils/include_vndk/cutils/sockets.h rename to libcutils/include_outside_system/cutils/sockets.h diff --git a/libcutils/include_vndk/cutils/str_parms.h b/libcutils/include_outside_system/cutils/str_parms.h similarity index 100% rename from libcutils/include_vndk/cutils/str_parms.h rename to libcutils/include_outside_system/cutils/str_parms.h diff --git a/libcutils/include_vndk/cutils/threads.h b/libcutils/include_outside_system/cutils/threads.h similarity index 100% rename from libcutils/include_vndk/cutils/threads.h rename to libcutils/include_outside_system/cutils/threads.h diff --git a/libcutils/include_vndk/cutils/trace.h b/libcutils/include_outside_system/cutils/trace.h similarity index 100% rename from libcutils/include_vndk/cutils/trace.h rename to libcutils/include_outside_system/cutils/trace.h diff --git a/libcutils/include_vndk/cutils/uevent.h b/libcutils/include_outside_system/cutils/uevent.h similarity index 100% rename from libcutils/include_vndk/cutils/uevent.h rename to libcutils/include_outside_system/cutils/uevent.h diff --git a/libprocessgroup/Android.bp b/libprocessgroup/Android.bp index 71e2b911a..f1041000e 100644 --- a/libprocessgroup/Android.bp +++ b/libprocessgroup/Android.bp @@ -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, diff --git a/libsystem/Android.bp b/libsystem/Android.bp index 12c946c91..b37b8eccd 100644 --- a/libsystem/Android.bp +++ b/libsystem/Android.bp @@ -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, diff --git a/libutils/Android.bp b/libutils/Android.bp index 8ee16f386..1e7cbdb77 100644 --- a/libutils/Android.bp +++ b/libutils/Android.bp @@ -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,