Commit Graph

95 Commits

Author SHA1 Message Date
Steven Moreland
17f0c0dde7 Merge changes from topic 'hidl-vendor-available' into oc-dev
* changes:
  Update makefiles (2/2).
  Update makefiles.
2017-04-12 22:13:58 +00:00
Steven Moreland
00556e0a11 Mark hidl test libs as vendor.
They must be on the vendor partition for hidl_test to be able to link to
them when the VNDK is in place.

Test: hidl_test
Bug: 33241851
Change-Id: I23c9e0674aaf33602bc9fde0515eb2f87ce5c60c
2017-04-11 17:56:47 -07:00
Steven Moreland
b2799c370f Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 09:57:40 -07:00
Steven Moreland
53b21566bc Update makefiles. am: e90c31f125 am: f11981de68
am: 103bada0e1

Change-Id: Ibe6eeeacab5660a8cf70d59dd9a4864d6f70ab80
2017-03-27 17:51:28 +00:00
Steven Moreland
e90c31f125 Update makefiles.
Test: pass
Change-Id: I925baccbe51a32b7b7f3f66cf2918d017ee6b039
2017-03-24 21:50:45 -07:00
Steven Moreland
b28099785a Add hidl_default and make modules use hidl_default. am: 691a455b9f am: 7c9f5c35d8
am: a6de4ca892

Change-Id: Ie4a219330792a194bef4a983b706c5f3191761a7
2017-03-09 02:09:52 +00:00
Steven Moreland
691a455b9f Add hidl_default and make modules use hidl_default.
find hardware/interfaces -type f -not -path "*/.git/*" \
-exec sed -i -e '/cc_[A-Za-z_]\+/ { N; s/$/\n    defaults:
\["hidl_defaults"\],/ }' {} \;
./hardware/interfaces/update-makefiles.sh

Test: no warnings
Bug: 35840847
Change-Id: I468b76893bf3f4b62ad610d1d9603bcb8797a702
2017-03-08 16:22:00 -08:00
Yifan Hong
2c5e21c69c Merge "Add tests for .equals and toString" am: 7128746a9f am: cc51d3b2ae
am: 77c34e94c9

Change-Id: If4ba94ff09f9160727befc47f09eaed0d7a8af64
2017-02-27 18:56:13 +00:00
Treehugger Robot
7128746a9f Merge "Add tests for .equals and toString" 2017-02-27 18:43:28 +00:00
Steven Moreland
1daad90b81 Remove viral dependency on libhwbinder. am: d28a3dce40 am: 444d759920
am: 5c605c8add

Change-Id: I54d6e5a0b38ef9eb507748fd38a8c508e0eb1948
2017-02-25 02:55:43 +00:00
Steven Moreland
d28a3dce40 Remove viral dependency on libhwbinder.
find hardware/interfaces -name Android.mk -exec sed -i -e '/libhwbinder
\\/d' {} \;
find hardware/interfaces -name Android.bp -exec sed -i -e
'/"libhwbinder"/d' {} \;
./hardware/interfaces/update-makefiles.sh

Test: everything links
Test: (sanity) booted marlin on internal master with these changes
Bug: 35710429
Change-Id: I6b0b5ae318422b7a9be17a19a79e039ffc0f9272
2017-02-24 12:01:06 -08:00
Yifan Hong
4093a44585 Add tests for .equals and toString
Test: hidl_test
Test: hidl_test_java

Bug: 32834072
Bug: 33459772
Change-Id: Ic1a87529fe5f8c12f7bfbdc2fa668e66922e075f
2017-02-22 16:09:17 -08:00
Steven Moreland
46c0b94992 Move hidl shims to the vendor partition.
We need google shims on the vendor partition because they are providing
an implementation of a vendor defined interface. They were written by
google just as a courtesy/to make the transition easier. They're
basically a set for vendors to assemble their hal implementations
from.

Bug: 34135607
Test: marlin persist.hal.binderization on/off

Merged-In: I3f86c77c147514fe470f08088a66de312ae32d4e
Change-Id: I3f86c77c147514fe470f08088a66de312ae32d4e
2017-02-13 23:14:38 +00:00
Steven Moreland
ff4224809f Move hidl shims to the vendor partition.
We need google shims on the vendor partition because they are providing
an implementation of a vendor defined interface. They were written by
google just as a courtesy/to make the transition easier. They're
basically a set for vendors to assemble their hal implementations
from.

Bug: 34135607
Test: marlin persist.hal.binderization on/off
Change-Id: I3f86c77c147514fe470f08088a66de312ae32d4e
2017-02-13 15:03:33 -08:00
Tri Vo
4ce38bc27f Use filegroup as genrule srcs. am: 06da29ffae am: 5b43e2caa8 am: 831bfd746c
am: 6924f25a61

Change-Id: Iffa108b900ecbd2800090b5b1cdfc4fc65f63f3c
2017-02-10 02:36:00 +00:00
Tri Vo
06da29ffae Use filegroup as genrule srcs.
Test: mmma hardware/interfaces -j64
Change-Id: If282ed5f4a87045d169fcea7ad648b046a5f1cfb
2017-02-10 02:18:07 +00:00
Tri Vo
bd397ba5e1 Merge "Remove vts driver/profiler build rules." am: 0f7a0678af am: 3b5f6dad56 am: 468446f91b
am: e9cf6ba378

Change-Id: I7e2fba48c44cdbdb6d87e6d54446986889be26cf
2017-02-08 01:05:09 +00:00
Tri Vo
ac9f1c02f3 Remove vts driver/profiler build rules.
Generate filegroups for .hal files so that driver/profiler build rules
can migrate to another project.

Bug: 34893894
Test: mmma hardware/interfaces -j32
Change-Id: Iefc98a6df16706fbb798bc32405fe8ff0c3de450
2017-02-06 13:54:41 -08:00
Yifan Hong
cad2f77b0e Merge "Add test for type resolution." am: 5835d9ea59 am: 168bb896b7 am: 6cc9f50bd3
am: 63a36d7b62

Change-Id: I0477b4dc3e782752a556003ddaced227d2271b06
2017-01-17 21:12:01 +00:00
Steven Moreland
96232e327f Revert "Revert "move VTS HIDL HAL tests to the corresponding interface directories""
This reverts commit 070e8d2116.

Change-Id: I66dd4e6cf875e39e58b0d91724a603b37d32c0ac
2017-01-14 00:00:26 +00:00
Ruchi Kandoi
070e8d2116 Revert "move VTS HIDL HAL tests to the corresponding interface directories"
Test: No
This reverts commit ec7746fa80.

Change-Id: I9ec4493403d71419df99fe9761211eab057cdb0a
2017-01-13 15:17:32 -08:00
Yifan Hong
97973c69c8 Add test for type resolution.
Test: make hidl_test

Bug: 31971432

Change-Id: I5c058079d54e1b480f21550a76ccfd53f54bd0c4
2017-01-13 10:11:08 -08:00
Yifan Hong
4bc69c918f Bp/nFoo -> Bp/nHwFoo
Bug: 33554989
Test: hidl_test
Change-Id: I748181e9eaf5b78318054b9fd99ac1a43d00498a
2017-01-11 13:04:15 -08:00
Yifan Hong
10ac9b44f5 Bp/n/sFoo -> Bp/n/sHwFoo
Bug: 33554989
Test: hidl_test
Change-Id: I748181e9eaf5b78318054b9fd99ac1a43d00498a
2017-01-10 16:01:46 -08:00
Yifan Hong
309ccc1d26 Add test for putting different types in a struct / union. am: 04e53a1ca2 am: 049439eb1f am: ce1420670c
am: b76db3e2e7

Change-Id: I878b7f2a7ba449d3330dd14fdd9be3d55554a1a2
2017-01-10 03:22:30 +00:00
Yifan Hong
04e53a1ca2 Add test for putting different types in a struct / union.
Test: hidl_test
Change-Id: Icf1f40b1c92f76a45a3792e8c5d359031ad719bc
2017-01-06 11:06:14 -08:00
Yifan Hong
810b9b4838 Merge "move foocallback to hidl_test" am: 0270fefc48 am: 7f3dc0e7b3 am: 586e13de99
am: 82f0ce3e09

Change-Id: I5e3a1a1ac7018eb36401c17bf29b49d131289ae6
2017-01-05 19:37:58 +00:00
Yifan Hong
b500bc6189 move foocallback to hidl_test
Fix: 32778024

Test: hidl_test

Change-Id: Icec3bd23c30dea635c315ec3b98f3a72447e840a
2017-01-04 13:39:13 -08:00
Yifan Hong
7f6bfcc606 Merge "Test for echoed interfaces." am: f5f75be7b6 am: a175fa4b4a am: c63c36ceaf
am: abaee80220

Change-Id: I8c38c43e04e47aa834cb381fe41addc6751f4076
2016-12-19 22:47:21 +00:00
Yifan Hong
87cc71c9fa Test for echoed interfaces.
Test: hidl_test

Bug: 33173166

Change-Id: I0b8b8553b7d3f7b1800d0970a9fc17d01084dfcf
2016-12-16 15:49:39 -08:00
Yifan Hong
5d22a288cb Add test for bitset/mask type.
Test: hidl_test
Change-Id: I8bcd304184ff6b7794a9d0b5d3999f071604471d
2016-12-06 00:29:42 +00:00
Yifan Hong
e7ce822b96 Add test for bitset/mask type.
Test: hidl_test
Change-Id: I8bcd304184ff6b7794a9d0b5d3999f071604471d
2016-12-05 12:46:17 -08:00
Yifan Hong
ebcc3328e8 Use IBase instead of IBinder for interface keyword.
Test: hidl_test
Change-Id: Id51d1957f311d1025dac57d40d4dd5c24d328a6c
2016-12-03 01:09:23 -08:00
Yifan Hong
e19e582bd5 Update makefiles for hidlizing IBase.
A new dependency android.hidl.base@1.0 is added for
all projects.

Also updated Android.mk for NFC hal (for java constants)

Test: mma

Change-Id: Ia70d0eb0d74de06475a339698386d383d491a43a
2016-12-03 01:08:59 -08:00
Yifan Hong
501839495f Update makefiles for hidlizing IBase.
A new dependency android.hidl.base@1.0 is added for
all projects.

Test: mma

Change-Id: Ia70d0eb0d74de06475a339698386d383d491a43a
2016-12-03 01:01:14 -08:00
Yifan Hong
76dd1951ae Use IBase instead of IBinder for interface keyword.
Test: hidl_test
Change-Id: Id51d1957f311d1025dac57d40d4dd5c24d328a6c
2016-12-03 00:59:01 -08:00
Steven Moreland
2a6e20aab6 Merge "Revert "Use get instead of implicit cast on Return<*>."" am: 5329acb61f am: e78c2b96e3 am: 9c3a926af2
am: 8ac8718670

Change-Id: Ia7ba183ea72890eb95fdb5306055242edf9f4960
2016-12-01 21:24:28 +00:00
Steven Moreland
fafbbd7026 Revert "Use get instead of implicit cast on Return<*>."
This reverts commit dc5f84f993.

Change-Id: Ib81f732d1e0b822a5f53cbc7ed8a13e146ad8b7a
2016-12-01 08:20:32 -08:00
Yifan Hong
15a9614dcd Merge "Update to use the correct library for logging." am: f5e1ac67ed am: 34d006ee9c am: fb89d1237d
am: 6cb0ee580a

Change-Id: I27419afa6ff8ebda825e474d9cee242a29a31f53
2016-11-30 20:59:57 +00:00
Yifan Hong
0c4c7a30c2 Update to use the correct library for logging.
Generates: b/33193497
Test: mma
Change-Id: Ib8bfc4d2f1d68947099e4756f661ed06689ffd62
2016-11-29 13:10:15 -08:00
Steven Moreland
bc51c2d330 Use get instead of implicit cast on Return<*>. am: dc5f84f993 am: 3c87575472 am: 90bd630187
am: da1c605bf8

Change-Id: I31eb131fbe2a59f4e47b5d3ea0558cd2a9c843d5
2016-11-28 21:50:28 +00:00
Steven Moreland
dc5f84f993 Use get instead of implicit cast on Return<*>.
Bug: 31348667
Test: hidl_test
Change-Id: Icc22f440077feeff1119ca7b2b44fab684b453db
2016-11-28 12:06:22 -08:00
Treehugger Robot
2fe5762cae Merge "Update makefiles for logging." 2016-11-24 16:41:20 +00:00
Steven Moreland
eccc0081c8 Remove HIDL_GENERATED from things written by hand. am: 33e87b8a76 am: 8b6a886d60 am: 35460073b3
am: 6817b001f1

Change-Id: Ied2a612dbeac019fa764eeb8375d6e68f0ff7e66
2016-11-23 01:51:19 +00:00
Steven Moreland
33e87b8a76 Remove HIDL_GENERATED from things written by hand.
find . -name "*.h" -exec sed -i 's/HIDL_GENERATED_\(.*\)_H_/\U\1_H/g' {}
+

They now match what would be generated by -Lc++-impl. This prevents
confusion over whether or not the files are autogenerated.

Test: pass
Change-Id: I2c9d7887f6d6bdaa19a5c4bfcf02ee3d1dbc81d1
2016-11-22 15:34:39 -08:00
Steven Moreland
bbff14d4bb Merge "Update makefiles for logging." 2016-11-22 17:25:36 +00:00
Keun Soo Yim
b74aac8107 Merge "move VTS HIDL HAL tests to the corresponding interface directories" 2016-11-22 16:41:27 +00:00
Martijn Coenen
403161ab73 Use newly introduced hidl_handle.
Bug: 32089785
Test: builds
Change-Id: I27c7d3945e1fe390661bf322987011a00fe9b3fe
2016-11-22 12:17:58 +01:00
Martijn Coenen
70b9a15df0 Use newly introduced hidl_handle.
Bug: 32089785
Test: builds
Change-Id: I27c7d3945e1fe390661bf322987011a00fe9b3fe
2016-11-22 09:03:11 +01:00
Keun Soo Yim
8a36c0b01c move VTS HIDL HAL tests to the corresponding interface directories
Bug: 32783461
Test: vts-tradefed; run vts-hal-hidl
Change-Id: Iead44eaf65dcd4de2286267467c4a4a322a88205
2016-11-21 19:16:12 -08:00