diff options
| author | Steven Moreland <smoreland@google.com> | 2018-01-29 19:34:52 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-04-10 16:06:54 +0000 |
| commit | fcfbeaf01819c5d7d086d7e5d985820c28a40986 (patch) | |
| tree | d5b16df0c131b25fafbc00eb75f952baaa5d0e30 /build | |
| parent | 575ab5c7c689fc8896cdc5f3bd47fe74b1415627 (diff) | |
| download | hidl-fcfbeaf01819c5d7d086d7e5d985820c28a40986.tar.gz | |
Build HIDL Java targets with SystemApi.
They should all link only against SystemApi.
Bug: 72480743
Test: build java targets
Change-Id: I7fd0061a410b08a0e8370742d512aeb6807d2600
Merged-In: I7fd0061a410b08a0e8370742d512aeb6807d2600
(cherry picked from commit c861dcfec9afd75123889a7efa6fcfd4b431126a)
Diffstat (limited to 'build')
| -rw-r--r-- | build/hidl_interface.go | 3 | ||||
| -rw-r--r-- | build/properties.go | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build/hidl_interface.go b/build/hidl_interface.go index 396cf673..532a19a4 100644 --- a/build/hidl_interface.go +++ b/build/hidl_interface.go @@ -289,10 +289,11 @@ func hidlInterfaceMutator(mctx android.LoadHookContext, i *hidlInterface) { mctx.CreateModule(android.ModuleFactoryAdaptor(java.LibraryFactory(true)), &javaProperties{ Name: proptools.StringPtr(name.javaName()), Owner: i.properties.Owner, + Sdk_version: proptools.StringPtr("system_current"), Defaults: []string{"hidl-java-module-defaults"}, No_framework_libs: proptools.BoolPtr(true), Srcs: []string{":" + name.javaSourcesName()}, - Static_libs: append(javaDependencies, "hwbinder"), + Static_libs: javaDependencies, }) } diff --git a/build/properties.go b/build/properties.go index 50477be1..d2f8a357 100644 --- a/build/properties.go +++ b/build/properties.go @@ -54,6 +54,7 @@ type javaProperties struct { Owner *string Defaults []string No_framework_libs *bool + Sdk_version *string Srcs []string Libs []string Static_libs []string |