Commit graph

166 commits

Author SHA1 Message Date
Steven Moreland
e90c31f125 Update makefiles.
Test: pass
Change-Id: I925baccbe51a32b7b7f3f66cf2918d017ee6b039
2017-03-24 21:50:45 -07:00
Treehugger Robot
6a73f61b96 Merge "use toString instead of to_string" 2017-03-22 22:49:38 +00:00
Hridya Valsaraju
1b019d5a6c use toString instead of to_string
Bug: 35703683
Test: hidl_test_java passes

Change-Id: Ib7d6807f6b9ddcd7b0271b17a0a52be0ee07ec6c
2017-03-22 13:19:54 -07:00
Steven Moreland
a233c182be Versioning, add additional package import.
Added versioning@2.4. This tests the same as 2.2->2.3, but also repros
an issue in hidl-gen where triple inheritance isn't allowed.

Test: minor version inheritance doesn't fail, triple inheritance works
Bug: 36162559
Change-Id: Id5518621cd068b1b623f30f6f6762a1bf8ae6a80
2017-03-20 14:15:46 +00:00
Hridya Valsaraju
171603eaa9 Move FMQ benchmark/test services to hardware/interfaces
Bug: 32284445
Test: Built and ran FMQ benchmarks

Change-Id: Ia6bacf21d276b55e4e590dc96f348464f2098992
2017-03-13 23:31:04 +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
Steven Moreland
dc611e5df9 IBaz: remove unused function
Test: pass
Change-Id: I5bc806b4780cfadd9f0c35df60c43203c90d7244
2017-03-08 16:22:00 -08:00
Hridya Valsaraju
8a7086296c Move FMQ tests to hardware/interfaces
Test: FMQ unit tests pass
Bug: 32284445

Change-Id: I1daf563560d12fc7a4433ae98876331c37509980
2017-03-07 09:02:23 -08:00
Hridya Valsaraju
0047809804 Revert "Revert "Move android.hardware.benchmarks into android.hardware.tests""
Test: built and ran FMQ benchmarks

This reverts commit 8b34b1a547.

Change-Id: I7d8884b9de97980b5bdb7a4355a61b00bbd396b4
2017-03-03 14:10:29 -08:00
Greg Hartman
b59f873ab9 Merge "Revert "Move android.hardware.benchmarks into android.hardware.tests"" 2017-03-02 23:40:02 +00:00
Michael Rosenfeld
8b34b1a547 Revert "Move android.hardware.benchmarks into android.hardware.tests"
This reverts commit c8f7d73720.

Change-Id: I957cd686468aa618014a95c0510b162956df9bf7
2017-03-02 22:28:23 +00:00
Treehugger Robot
533ab025d0 Merge "Move android.hardware.benchmarks into android.hardware.tests" 2017-03-02 22:11:06 +00:00
Treehugger Robot
b541affafb Merge "Move baz default implementation to hardware/interfaces" 2017-02-28 21:10:32 +00:00
Hridya Valsaraju
c8f7d73720 Move android.hardware.benchmarks into android.hardware.tests
Test: Ran FMQ benchmarks.

Bug: 35015612
Change-Id: Ic25e51051779b296ada5f02bc0c3258bff507ca3
2017-02-28 12:41:25 -08:00
Treehugger Robot
7128746a9f Merge "Add tests for .equals and toString" 2017-02-27 18:43:28 +00:00
Hridya Valsaraju
6cf95f3710 Move baz default implementation to hardware/interfaces
Test: hidl_test and hidl_java_test passes

Change-Id: Iaacfc3f203368ca674cbaddc6cdf06ddb8e34500
2017-02-24 16:10:25 -08: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
Tri Vo
69fa1faddd Update makefiles.
Test: mmma hardware/interfaces
Change-Id: I501524fa3fbbaed9b71e5b9c3bbc8aa3c8c25896
2017-02-22 10:46:47 -08:00
Yifan Hong
6283d249f9 Update tests for enforcing minor version upgrade.
Test: ./hardware/interfaces/update-makefiles.sh
Test: mma

Bug: 28825532

Change-Id: I1ae86f597f184d75ad5476b248e03248346b0c33
2017-02-16 06:11:39 +00:00
Steven Moreland
dcec84e96c Merge "update-makefiles.sh" 2017-02-16 05:48:02 +00:00
Treehugger Robot
02f3f834fc Merge "Modify method to get MQDescriptor for unsynchronized FMQ." 2017-02-16 01:48:07 +00:00
Steven Moreland
821b01c9fe update-makefiles.sh
There have been some changes to the way hidl-gen generates these and
some CLs got out of sync with hidl-gen.

Test: pass
Change-Id: I33c573499d5dd37de447902fd93929b80a5df371
2017-02-15 10:59:23 -08:00
Hridya Valsaraju
c3db9c8142 Modify method to get MQDescriptor for unsynchronized FMQ.
The modified method adds a new parameter specifying
if a new unsynchronized FMQ needs to be set up by the server
or if it is to return an MQDescriptor to
an unsynchronized FMQ that has already been configured
by the server(if one exists)

Bug: 35319190
Test: FMQ unit tests
Change-Id: I64a5b356a2761faaeeea6fdd2c3a7da9b60f0016
2017-02-13 15:50:40 -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
Yifan Hong
ea8ff054fa Merge "Add tests for minor version upgrade enforcement." 2017-02-10 23:38:02 +00:00
Yifan Hong
4650ce9d25 Add tests for minor version upgrade enforcement.
Test: compiles
Test: add folder test/versioning/2.0 will make update-makefiles.sh to
fail.
Test: removing @2.3::IBar will let update-makefiles.sh to pass.
Test: Change @2.3::IBar to extend from @2.2::IFoo will let
update-makefiles.sh to fail.

Bug: 28825532
Change-Id: Iad1138b784505c903ab1049f08f6c07c38b777e1
2017-02-09 18:24:18 -08: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
Andreas Huber
0574bacb2a Updated makefiles
Java intermediates are now created in the common rather than the device-
specific generated sources subdirectory.

Bug: 33842609
Test: make
Change-Id: I16af4cd19bf0b24baa0ad9ebfdb86b4d959c8672
2017-02-09 16:56:56 -08: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
5835d9ea59 Merge "Add test for type resolution." 2017-01-17 21:03:05 +00:00
Martijn Coenen
0bb0ba5f79 Merge "Testing struct that has vector of other struct" 2017-01-16 14:48:11 +00:00
Treehugger Robot
31265c5312 Merge "Add a new method to trigger a blocking read." 2017-01-14 08:07:25 +00:00
Hridya Valsaraju
586bed1c17 Add a new method to trigger a blocking read.
The new method will request the service to trigger a blocking
read with the default Event Flag notification bitmask defined
by the MessageQueue class.

Test: FMQ unit tests
Change-Id: I5a61e2b4527ba31cd5ea6521c553a87904af8056
2017-01-13 20:58:17 -08:00
Steven Moreland
7c8d9bbaf1 Revert "move VTS HIDL HAL tests to the corresponding interface directories"
This reverts commit ec7746fa80.

Test: no test
Merged-In: I9ec4493403d71419df99fe9761211eab057cdb0a
Change-Id: I39f2acaa5ee376b90bcddd0891ac6f309cb40a2b
2017-01-14 00:20:11 +00: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
Pavel Maltsev
af9aec427d Testing struct that has vector of other struct
Test: hidl_java_test

Bug: b/34255213
Change-Id: I6a861f0fec32d5f7d541860bfe7bc3a45d37f1be
2017-01-13 11:35:36 +01:00
Ruchi Kandoi
aeb3de7b3f Merge changes from topic 'port-nfc-vts-AOSP'
* changes:
  Fix VTS paths on 32-bit target
  Remove obsolete references to IPCThreadState/ProcessState.
  Update Android.bp of Nfc with make rule for profiler.
  Use lowercase booleans in VTS test configs.
  Update to use the correct logging library.
  Update coverage configs with new format.
  Update NFC VTS configs to reflect new source paths
  increase the timeouts to 10mins for nfc target-side tests
  enable profiling directly from AndroidTest.xml
  NFC: vts: Update VTS driver files as per HAL changes
  NFC: Add target-side VTS tests for NFC
  use svc nfc enable/disable which is always the same.
  move VTS HIDL HAL tests to the corresponding interface directories
  Build target-side NFC test with coverage.
  Remove -DENABLE_TREBLE from vts test LOCAL_CFLAGS.
  Nfc: Split libhidl into base and transport.
  NFC: Update vts files to include the Annotations.
  NFC HAL target-side test (template)
  Update vts files for nfc hidl file style change.
  VTS driver build target for NFC 1.0
  add nfc vts files and vts profiler build rule
2017-01-12 23:13:44 +00:00
Keun Soo Yim
ec7746fa80 move VTS HIDL HAL tests to the corresponding interface directories
Bug: 32783461
Test: vts-tradefed; run vts-hal-hidl
Change-Id: Iead44eaf65dcd4de2286267467c4a4a322a88205
(cherry picked from commit 8a36c0b01c)
2017-01-12 11:02:22 -08:00
Steven Moreland
6de0aa81a3 MemoryTest: add method for testing
Bug: 34134129
Test: compiles
Change-Id: If0d2a9c00f93f548da5e9261a93d4715412620c3
2017-01-12 16:27:43 +01:00
Treehugger Robot
cb5989d239 Merge "Bp/n/sFoo -> Bp/n/sHwFoo" 2017-01-12 01:50:58 +00: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
Mark Salyzyn
a4842ace39 liblog: use log/log.h when utilizing ALOG macros
Test: compile
Bug: 30465923
Change-Id: I67046a75be057e7905570748a1ed6bfd03c0e1c8
2017-01-10 15:02:14 -08: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
0270fefc48 Merge "move foocallback to hidl_test" 2017-01-05 19:24:25 +00:00
Martijn Coenen
e8b0161713 Callback elision for HIDL interfaces.
Test: mma, hidl_test
Bug: 31380743
Change-Id: Ic5390d49a9493d1180bdd8a15bc47e891637890e
2017-01-05 08:48:23 +01:00
Hridya Valsaraju
9ba9244e5f Add a method to trigger multiple FMQ blocking reads.
Test: FMQ unit tests
Bug: 33815422
Change-Id: Idcd1fd79232a1b0caa5784e8dd4f3a929f52fded
2017-01-04 16:19:36 -08: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
Hridya Valsaraju
f70884cf4b Templatize MQDescriptor
Bug: 33948735
Test: FMQ unit tests and benchmarks

Merged-In: I5c3beff2c6a69e151e0cb11af299956638cc441b
Change-Id: I5c3beff2c6a69e151e0cb11af299956638cc441b
2016-12-29 22:33:40 -08:00
Martijn Coenen
73f99f6e1f Add test method to IBaz.
For testing death recipients.

Test: mma, hidl_test_java
Bug: 31632518
Change-Id: Ib359c790f68132484fbcd1a5522f45b99d1131f8
2016-12-28 17:44:15 +00:00