Commit graph

102 commits

Author SHA1 Message Date
Jiyong Park
9a4b17e3e1 HAL interface libs for testing are now built as test lib
The HAL interfaces for testing were copied to /system/lib[64]/vndk
directory since they are built as cc_library and thus falsely recognized
as members of VNDK, which isn't true.

Build them as cc_test_library so that they are filtered out. To do so,
.hidl_for_test files are added for the test HALs and update-makefiles.sh
were ran.

Bug: 64776708
Test: no android.hardware.tests.*.so file in /system/lib[64]/vndk on
2017 pixel devices

Change-Id: I5314db6cc08a43bccfc4521d4b80b614a91e7e48
2017-09-01 09:54:16 +09:00
TreeHugger Robot
d9b12c13e5 Merge "Update makefiles for vndk enabled." into oc-mr1-dev 2017-08-04 00:52:06 +00:00
Steven Moreland
c716b8c307 Update makefiles for vndk enabled.
Test: none
Bug: 63866913
Change-Id: I29174fdadca2828455ef49f14e53bc95c5238dbb
2017-08-02 18:00:14 -07:00
Steven Moreland
208a586cf8 Update HIDL makefiles.
Allow them to be static.

This is required for a couple of reasons:
- enabling HIDL passthrough in recovery
- enabling VTS tests to be static blobs

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Merged-In: I1b2401fb273ab80819e3870aa71fe742269674ba
Change-Id: I1b2401fb273ab80819e3870aa71fe742269674ba
(cherry picked from commit 7206708528)
2017-08-02 12:52:41 -07:00
Steven Moreland
49abbfdd68 Merge "Move all hidl_test dependencies to the system.img"
am: 46bb27e614

Change-Id: Id46ab1835638aec6c98f0b2775774cb4cc0c34dd
2017-07-18 08:50:32 +00:00
Steven Moreland
2f2aabe212 Move all hidl_test dependencies to the system.img
Test: hidl_test passes
Test: build with BOARD_VNDK_VERSION=current
Bug: 63704014
Change-Id: Ia97be8b4d61236adfd964bf8e4fa632d99010b98
2017-07-17 18:36:02 -07:00
Steven Moreland
67b9ae7d9c Merge "Update makefiles." am: 9119d4ccd1 am: 242b2288d7
am: c6da54569f

Change-Id: Ib7f7a9cdb64985d545443edac5bb8e9c169fc592
2017-05-20 00:19:40 +00:00
Steven Moreland
06c85d986a Update makefiles.
Adds default configuration to all hals.

Test: pass
Change-Id: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
2017-05-18 16:14:16 -07:00
Steven Moreland
8e89a43590 Update makefiles for c++-sources and c++-headers. am: cb360c60d8 am: 4bd4e7fb3b
am: 127b116fe5

Change-Id: I3a2aa76acef0f0d1455bfad775e87e8089d357e8
2017-05-10 02:58:00 +00:00
Steven Moreland
cb360c60d8 Update makefiles for c++-sources and c++-headers.
Test: pass
Bug: 38174080
Change-Id: I683455736eed35e6ced24e2763c2bdb5fb6c9601
2017-05-09 14:34:19 -07:00
Steven Moreland
f90189a79f Merge "Remove redundant dependencies" am: 62769b7196 am: 170e2e85a2
am: 5fba1db1d2

Change-Id: I661fff75d140b4359af055a0f08f08ef33c889c3
2017-05-01 23:37:04 +00:00
Steven Moreland
ee1d248ae2 Remove redundant dependencies
android.hidl.base@1.0 and android.hidlmanager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I424371932af129bba9d58dcf8652c64297f35f05
2017-05-01 09:47:58 -07:00
Andreas Huber
6fa374ad30 Changed the naming scheme for Treble java libraries (both static and dynamic)
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: I177f4cfd42f635aaf096107af8309d1a82ed41c0
Merged-In: I8b91881dfaf507c0d852d56ebbb53ff0987e5a34
2017-04-13 15:23:46 -07:00
Andreas Huber
6733baff6c Changed the naming scheme for Treble java libraries (both static and dynamic)
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: I177f4cfd42f635aaf096107af8309d1a82ed41c0
Merged-In: I8b91881dfaf507c0d852d56ebbb53ff0987e5a34
2017-04-13 15:16:27 -07:00
Steven Moreland
0dd5ba23fb Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 16:41:07 -07:00
Steven Moreland
b2799c370f Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 09:57:40 -07:00
Andreas Huber
8410871493 Empty interface IQuux which is completely unrelated to IBase and IBaz.
Used to verify that it's not possible to obtain an IQuux interface from an
IBase/IBaz binder, i.e. IHwBinder.asInterface(...) properly respects the
interfaceChain.

Bug: 36749201
Test: hidl_test_java
Change-Id: I84419e78db22acdfcc7d9972d22d139641469bde
2017-04-05 12:46:13 -07:00
Andreas Huber
9fff7b862b Empty interface IQuux which is completely unrelated to IBase and IBaz.
Used to verify that it's not possible to obtain an IQuux interface from an
IBase/IBaz binder, i.e. IHwBinder.asInterface(...) properly respects the
interfaceChain.

Bug: 36749201
Test: hidl_test_java
Change-Id: I84419e78db22acdfcc7d9972d22d139641469bde
2017-04-04 14:43:13 -07:00
Andreas Huber
675ae49ab1 Convert all comments into "doxygen-ready" comments.
Bug: 36453077
Test: make
Change-Id: Ic77394d4d2e1ccedba3a28230d870c5d6108bd40
2017-03-28 16:14:43 -07:00
Andreas Huber
3e4acb8b3a Convert all comments into "doxygen-ready" comments.
Bug: 36453077
Test: make
Change-Id: Ic77394d4d2e1ccedba3a28230d870c5d6108bd40
2017-03-28 16:10:42 -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
Hridya Valsaraju
3eebe248e5 Merge "use toString instead of to_string" am: 6a73f61b96 am: a1b886fd90
am: 35937ab9fa

Change-Id: I0cb0cbff94b206655061c078848c0ff95147fcfc
2017-03-22 23:04:42 +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
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
f53a334871 IBaz: remove unused function am: dc611e5df9 am: 1035d17739
am: 43fa10b2e6

Change-Id: I0033c817c77fb8012019ff75aa2a3140f9ec48a9
2017-03-09 02:09:49 +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
48c9837a55 Merge "Move baz default implementation to hardware/interfaces" am: b541affafb am: c990e2e15f
am: 7e7d3758d1

Change-Id: I6b8c250747d938d7ca56cd87bf89291c3a61f87f
2017-02-28 21:51:39 +00:00
Treehugger Robot
b541affafb Merge "Move baz default implementation to hardware/interfaces" 2017-02-28 21:10:32 +00: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
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
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
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
Andreas Huber
c409e30da7 Updated makefiles am: 0574bacb2a am: f9c87639bf am: bf7b779b40
am: 238660c10a

Change-Id: I1600e1a693462fb99b684381860fa788867f45cf
2017-02-10 01:14:57 +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
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
Martijn Coenen
4226670424 Merge "Testing struct that has vector of other struct" am: 0bb0ba5f79 am: a69c3034fa am: dabf160073
am: 98d537ec95

Change-Id: Ia384675237edd335e117991607e1a39f6f46dd74
2017-01-17 06:50:54 +00:00
Martijn Coenen
0bb0ba5f79 Merge "Testing struct that has vector of other struct" 2017-01-16 14:48:11 +00: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
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
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
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
Martijn Coenen
4ea3c731a9 Add test method to IBaz. am: 73f99f6e1f am: a0cf52d74b am: 66ec896c3b
am: e411341409

Change-Id: I5242b0ed727b672bc658d1c792a1a3d6beb55a09
2016-12-29 09:27:27 +00:00