diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-08 23:48:23 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-08 23:48:23 +0000 |
| commit | 7145fceed07dcf5cc370be35f6c59939a9a578ff (patch) | |
| tree | 0d6bfd703e0be3051e7ee6ee3dc4aa3ef588ae97 | |
| parent | 436d7c130f7b76a0b384077bc76879f169505bc9 (diff) | |
| parent | 180592b84388ed395d2f4aea99214775697df06a (diff) | |
| download | hidl-android11-mainline-os-statsd-release.tar.gz | |
Snap for 7132927 from 180592b84388ed395d2f4aea99214775697df06a to mainline-os-statsd-releaseandroid-mainline-11.0.0_r44android11-mainline-os-statsd-release
Change-Id: Id945855daf04a22859e39758b26cbd93408a7ccf
| -rw-r--r-- | build/hidl_interface.go | 33 | ||||
| -rw-r--r-- | build/properties.go | 19 |
2 files changed, 35 insertions, 17 deletions
diff --git a/build/hidl_interface.go b/build/hidl_interface.go index c4a84a6e..c4f0256f 100644 --- a/build/hidl_interface.go +++ b/build/hidl_interface.go @@ -683,9 +683,10 @@ This corresponds to the "-r%s:<some path>" option that would be passed into hidl // to build framework, which is used to build system_current. Use core_current // plus hwbinder.stubs, which together form a subset of system_current that does // not depend on framework. - Sdk_version: proptools.StringPtr("core_current"), - Libs: []string{"hwbinder.stubs"}, - Apex_available: i.properties.Apex_available, + Sdk_version: proptools.StringPtr("core_current"), + Libs: []string{"hwbinder.stubs"}, + Apex_available: i.properties.Apex_available, + Min_sdk_version: getMinSdkVersion(name.string()), } mctx.CreateModule(java.LibraryFactory, &javaProperties{ @@ -710,11 +711,12 @@ This corresponds to the "-r%s:<some path>" option that would be passed into hidl Outputs: []string{name.sanitizedDir() + "Constants.java"}, }) mctx.CreateModule(java.LibraryFactory, &javaProperties{ - Name: proptools.StringPtr(name.javaConstantsName()), - Defaults: []string{"hidl-java-module-defaults"}, - Sdk_version: proptools.StringPtr("core_current"), - Srcs: []string{":" + name.javaConstantsSourcesName()}, - Apex_available: i.properties.Apex_available, + Name: proptools.StringPtr(name.javaConstantsName()), + Defaults: []string{"hidl-java-module-defaults"}, + Sdk_version: proptools.StringPtr("core_current"), + Srcs: []string{":" + name.javaConstantsSourcesName()}, + Apex_available: i.properties.Apex_available, + Min_sdk_version: getMinSdkVersion(name.string()), }) } @@ -966,7 +968,22 @@ var minSdkVersion = map[string]string{ "android.hardware.neuralnetworks@1.1": "30", "android.hardware.neuralnetworks@1.2": "30", "android.hardware.neuralnetworks@1.3": "30", + "android.hardware.wifi@1.0": "30", + "android.hardware.wifi@1.1": "30", + "android.hardware.wifi@1.2": "30", + "android.hardware.wifi@1.3": "30", + "android.hardware.wifi@1.4": "30", + "android.hardware.wifi.hostapd@1.0": "30", + "android.hardware.wifi.hostapd@1.1": "30", + "android.hardware.wifi.hostapd@1.2": "30", + "android.hardware.wifi.supplicant@1.0": "30", + "android.hardware.wifi.supplicant@1.1": "30", + "android.hardware.wifi.supplicant@1.2": "30", + "android.hardware.wifi.supplicant@1.3": "30", "android.hidl.allocator@1.0": "29", + "android.hidl.manager@1.0": "30", + "android.hidl.manager@1.1": "30", + "android.hidl.manager@1.2": "30", "android.hidl.memory.token@1.0": "29", "android.hidl.memory@1.0": "29", "android.hidl.safe_union@1.0": "29", diff --git a/build/properties.go b/build/properties.go index b0b4b853..d746beca 100644 --- a/build/properties.go +++ b/build/properties.go @@ -46,15 +46,16 @@ type ccProperties struct { } type javaProperties struct { - Name *string - Owner *string - Defaults []string - Installable *bool - Sdk_version *string - Srcs []string - Libs []string - Static_libs []string - Apex_available []string + Name *string + Owner *string + Defaults []string + Installable *bool + Sdk_version *string + Srcs []string + Libs []string + Static_libs []string + Apex_available []string + Min_sdk_version *string } type fuzzConfig struct { |