From 958a03ff58211a2d18f5cfd980add8d98d95a42f Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Sat, 7 Mar 2020 17:23:16 +0900 Subject: 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. Bug: 150999716 Test: m Change-Id: I363c56ec44c6b41e05d35b3d30e7526db79ff7c7 --- Android.bp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 8d907b7..ed29f5b 100644 --- a/Android.bp +++ b/Android.bp @@ -75,6 +75,10 @@ cc_library { "//apex_available:platform", "com.android.neuralnetworks", "test_com.android.neuralnetworks", + "com.android.bluetooth.updatable", + "com.android.media", + "com.android.media.swcodec", + "com.android.tethering", ], vndk: { enabled: true, -- cgit v1.2.3 From dfe14f12b7432fc95bab2f6b0c8bcc609314c55f Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Thu, 16 Apr 2020 18:48:34 +0900 Subject: Set min_sdk_version to be part of mainline modules Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Change-Id: I87ce41ad18a7a39f2c6c41c5aec2d8338db3ec8d --- Android.bp | 1 + 1 file changed, 1 insertion(+) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index ed29f5b..731d87b 100644 --- a/Android.bp +++ b/Android.bp @@ -87,6 +87,7 @@ cc_library { whole_static_libs: [ "libhwbinder-impl-internal", ], + min_sdk_version: "29", } // Only libhwbinder_benchmark needs to have pgo enabled. When all places -- cgit v1.2.3 From f35a08738f787adb76b3e6897ee5de9a0ddf4f49 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 9 Jun 2020 15:09:11 -0700 Subject: Fix visibility rules now that Make supports visibility checks Previously, Soong visibility rules did not affect Make modules. Now these checks have been implemented in: https://android-review.googlesource.com/c/platform/build/+/1324454 So this fixes the visibility rules to include modules that were previously using libhidltransport and libhwminijail. Bug: 158599308 Test: treehugger Change-Id: Ia2f930002fb9024a039d9b1ba5fbbe27ff8f8608 --- Android.bp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 5635bd6..5fd988b 100644 --- a/Android.bp +++ b/Android.bp @@ -114,7 +114,12 @@ cc_library { name: "libhidltransport", vendor_available: true, - visibility: [":__subpackages__"], + visibility: [ + ":__subpackages__", + "//hardware:__subpackages__", + "//test/sts:__subpackages__", + "//vendor:__subpackages__", + ], } cc_defaults { -- cgit v1.2.3 From a29e20ff8d59aa125786823354a0c5b06a5e110f Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Tue, 7 Jul 2020 23:35:46 +0000 Subject: Document libhidltransport removal plan. Since this library is empty, once removing it can be automated in make world, simply documenting what can be done easily at the proper time. Bug: 135686713 Test: N/A Change-Id: Ic9e1f7aec1a405b96d09ea260d4cc4afa6bc894a --- Android.bp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 731d87b..35e8279 100644 --- a/Android.bp +++ b/Android.bp @@ -108,8 +108,8 @@ cc_library { } // WARNING: deprecated -// This library is no longer required, and dependencies should be taken -// on libhidlbase instead. +// This library is no longer required, and dependencies should be taken on libhidlbase instead. +// This is automatically removed by bpfix. Once there are no makefiles, fixes can be automatically applied, and this can be removed. cc_library { name: "libhidltransport", vendor_available: true, -- cgit v1.2.3 From 538af7d4cc54f0ccca52f8abce4a33f19155e0ce Mon Sep 17 00:00:00 2001 From: Victor Khimenko Date: Wed, 8 Jul 2020 23:24:21 +0200 Subject: Make android.hardware.renderscript@1.0 buildable for native_bridge Bug: http://b/153609531 Test: m android.hardware.renderscript@1.0.native_bridge Change-Id: Iaf5b1942a05617934e7f42d760c6aea5551d0b89 --- Android.bp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 35e8279..bc4e532 100644 --- a/Android.bp +++ b/Android.bp @@ -65,6 +65,8 @@ cc_library { name: "libhidlbase", defaults: ["libhidlbase-combined-impl"], host_supported: true, + // TODO(b/153609531): remove when no longer needed. + native_bridge_supported: true, recovery_available: true, vendor_available: true, apex_available: [ -- cgit v1.2.3 From f9893e8017114796e6e94756cfebee8270548ed0 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Wed, 8 Jul 2020 08:17:39 -0700 Subject: Move definition of MessageQueue flavor to libfmq-base Move the defintion of MQFlavor to libfmq to share it. Test: atest fmq_unit_tests && m -j128 Bug: 142326204 Change-Id: Ib8427ded3f1d70d7aed96070311248ac6cb571c9 --- Android.bp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index bc4e532..ff918ed 100644 --- a/Android.bp +++ b/Android.bp @@ -158,6 +158,13 @@ cc_defaults { "transport/include", ], + header_libs: [ + "libfmq-base", + ], + export_header_lib_headers: [ + "libfmq-base", + ], + generated_sources: [ "android.hidl.manager@1.0_genc++", "android.hidl.manager@1.1_genc++", -- cgit v1.2.3 From 8ee9713fd769bbce2da8d99855b0701a05a71b36 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Wed, 11 Nov 2020 19:23:49 +0900 Subject: 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. Bug: 150902910 Test: build Change-Id: I3fea06067f4b085af5fa981ac60958fc3bd4b045 --- Android.bp | 1 + 1 file changed, 1 insertion(+) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 2593715..034919e 100644 --- a/Android.bp +++ b/Android.bp @@ -69,6 +69,7 @@ cc_library { native_bridge_supported: true, recovery_available: true, vendor_available: true, + product_available: true, apex_available: [ // TODO(b/137948090): not fully supported in APEX for certain usecases // - large dependency sizes -- cgit v1.2.3 From ad2415c2612c69050358f5f4f446156391db7dcc Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 17:33:30 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to system/libhidl Added SPDX-license-identifier-Apache-2.0 to: Android.bp adapter/Android.bp libhidlmemory/Android.bp minijail/Android.bp transport/Android.bp transport/allocator/1.0/Android.bp transport/allocator/1.0/default/Android.bp transport/allocator/1.0/utils/Android.bp transport/allocator/1.0/vts/functional/Android.bp transport/base/1.0/Android.bp transport/base/1.0/vts/functional/Android.bp transport/manager/1.0/Android.bp transport/manager/1.1/Android.bp transport/manager/1.2/Android.bp transport/memory/1.0/Android.bp transport/memory/1.0/default/Android.bp transport/memory/block/1.0/Android.bp transport/memory/token/1.0/Android.bp transport/safe_union/1.0/Android.bp transport/token/1.0/Android.bp transport/token/1.0/utils/Android.bp vintfdata/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I2a7ef0ec44c7b087eb00ed2bdfc4940d07f7a148 --- Android.bp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 034919e..33ba0e9 100644 --- a/Android.bp +++ b/Android.bp @@ -12,6 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + default_applicable_licenses: ["system_libhidl_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "system_libhidl_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + cc_defaults { name: "libhidl-defaults", cflags: [ -- cgit v1.2.3