Commit graph

152 commits

Author SHA1 Message Date
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
Martijn Coenen
a6c17a6875 Merge "Load legacy NFC libhardware HAL by correct name." am: 9e172b30c7 am: b2222e2132 am: f27d2d49a1
am: ef6457f4f7

Change-Id: I38a366d252d61e02e2093cfded29df78633d4448
2017-01-13 08:50:39 +00:00
Martijn Coenen
9e172b30c7 Merge "Load legacy NFC libhardware HAL by correct name." 2017-01-13 08:35:40 +00:00
Ruchi Kandoi
31af9d38bb NFC: Update vts files to include the Annotations. am: 6360a884b8 am: 85e762c853 am: 853198e4da
am: b8c22885aa

Change-Id: Ia914ae154ae5707042112fd5f81d2c7d3f72b3fd
2017-01-13 00:38:38 +00:00
Ruchi Kandoi
85e762c853 NFC: Update vts files to include the Annotations.
am: 6360a884b8

Change-Id: Id8469ef63c89ae397babe9eba8ca96da1d87fef0
2017-01-12 23:19:08 +00:00
Keun Soo Yim
4473bbadde NFC HAL target-side test (template)
am: 105bcaa066

Change-Id: I4756b8abc677004f0a2a7e407c65cbbd559c8c06
2017-01-12 23:19:06 +00:00
Zhuoyao Zhang
26657745de Update vts files for nfc hidl file style change.
am: 540a1ca37a

Change-Id: I618c13d47adc0fc3e12ae0f5c358647ee5b4d1b6
2017-01-12 23:19:05 +00:00
Keun Soo Yim
908d724f6f VTS driver build target for NFC 1.0
am: 3e78819754

Change-Id: I342ce64cef2a0b702293df320df7efe2d4ddd46f
2017-01-12 23:19:03 +00:00
Keun Soo Yim
2dbff5dcf2 add nfc vts files and vts profiler build rule
am: 6473c64657

Change-Id: If537d5a57f2cafe4f6801938e3e8bef21b79c96e
2017-01-12 23:19:01 +00: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
Hsin-Yi Chen
dd716c36f2 Fix VTS paths on 32-bit target
Decide target_basepaths by device's bitness.
On 32-bit target, do not include */lib64.

Bug: 33930594
Test: vts-tradefed run commandAndExit vts -m VibratorHidlTest -l INFO
Change-Id: I340ded1d763dc194da461ecf183c6a2ff5f5ee6f
(cherry picked from commit 23bd70d552)
2017-01-12 11:02:23 -08:00
Martijn Coenen
b4b3c93eaa Remove obsolete references to IPCThreadState/ProcessState.
Threadpool can now be configured/joined if needed with
configureRpcThreadpool() / joinRpcThreadpool().

Bug: 31226656
Test: mma
Change-Id: I0d7d9924cc8c8851cc2b61ebdae906204909890e
(cherry picked from commit 028223775b)
2017-01-12 11:02:23 -08:00
Zhuoyao Zhang
dcfe5d667e Update Android.bp of Nfc with make rule for profiler.
Bug:31930023
Test: mma
Change-Id: I4e159d4f0b37fdd4738cdee354c4fe05406baa02
(cherry picked from commit 42a6dddd4a)
2017-01-12 11:02:23 -08:00
Ryan Campbell
63ff734724 Use lowercase booleans in VTS test configs.
Use lowercase booleans so that they can be parsed in Java
and Python.

Test: run vts -m HalNfcHidlTargetBasicTest
Change-Id: I16e2f417047219a88d49ed5b0651639a0cc2bf61
(cherry picked from commit 9fc3c47bc7)
2017-01-12 11:02:23 -08:00
Ruchi Kandoi
6b6003620b Update to use the correct logging library.
Test: Compiles
Merged-Id: Idb33dea5faaf1a5e54719c2a5a683d2d47e9b8e8
Change-Id: Ib770cbc75bc10a04d93d9370ec341054e3d8dd57
Cherry-picked from f9d303435d
2017-01-12 11:02:22 -08:00
Ryan Campbell
ae87d5a100 Update coverage configs with new format.
Update config files to specify coverage modules and git projects
in the new format.

Test: pass
Change-Id: If58fce01d6e0fbc458653709e373e59ad976f4ae
(cherry picked from commit 54604102b5)
2017-01-12 11:02:22 -08:00
Ryan Campbell
99f201ac11 Update NFC VTS configs to reflect new source paths
Specify the new locations of NFC source code for use when
displaying coverage results.

Test: pass
Change-Id: I32d9b2e58ded1be3739e3cc24cf17c519a6a1d94
(cherry picked from commit ea4f71faba)
2017-01-12 11:02:22 -08:00
Keun Soo Yim
4fbf78481e increase the timeouts to 10mins for nfc target-side tests
Test: local direct binary runs (1.5mins on average)
Change-Id: Id85633a6a4a55a9d6876142447521146cd6e57f3
(cherry picked from commit c029996117)
2017-01-12 11:02:22 -08:00
Yuexi Ma
12b532c8f3 enable profiling directly from AndroidTest.xml
Test: local
Change-Id: If13be820766f54ff154f350cbbacbab9dffe07d2
(cherry picked from commit aa61067c14)
2017-01-12 11:02:22 -08:00
Ruchi Kandoi
891d843b8c NFC: vts: Update VTS driver files as per HAL changes
The return types for the NFC HAL have changed, this patches updates the
VTS driver files.

Test: Test Passes
Bug: 32748647
Change-Id: Ic31d25c3d6b4a1db05e2e481a948a7547b30f2d7
Singed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
(cherry picked from commit d9b830ff9b)
2017-01-12 11:02:22 -08:00
Ruchi Kandoi
ea37e1ab66 NFC: Add target-side VTS tests for NFC
Test: Test Passes
Change-Id: I393ca24e86447571a92e3742716fdc6f1ddc0519
Signed-off-by: Ruchi Kandoi<kandoiruchi@google.com>
(cherry picked from commit 1488dd7ff0)
2017-01-12 11:02:22 -08:00
Keun Soo Yim
a0bf597885 use svc nfc enable/disable which is always the same.
Test: run vts-hal-hidl
Change-Id: I347ff0ad92dfc39c9b97fefb8afb4d05aa883aa5
(cherry picked from commit e977d80bb0)
2017-01-12 11:02:22 -08: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
Ryan Campbell
7da37f4320 Build target-side NFC test with coverage.
Instrument NFC test with coverage so that coverage can be collected
on NFC implementation.

Test: make vts
Change-Id: I30c082198a027bc02ecaaf3232ce5935010b398d
(cherry picked from commit 89aeb505fe)
2017-01-12 11:02:22 -08:00
Steven Moreland
be1badc30a Remove -DENABLE_TREBLE from vts test LOCAL_CFLAGS.
I went ahead and removed some no-ops from the mk's.

Bug: 32978887
Test: mma -j64
Change-Id: I6f8341332aa9f249912f6a8b3a3664b76d362e99
(cherry picked from commit 2b2cef2864)
2017-01-12 11:02:22 -08:00
Yifan Hong
1ee9859640 Nfc: Split libhidl into base and transport.
Bug: 32756130

Test: mma
Merged-In: Id21cf23abe2910f26bb7895511862443b93dc112
Change-Id: I8379d8af9c373b489f803c3ae9129227a78537a6
(cherry picked from commit 6b920e43d3)
2017-01-12 11:02:14 -08:00
Martijn Coenen
ce2e6569dc Load legacy NFC libhardware HAL by correct name.
Use NFC_NCI_HARDWARE_MODULE_ID, which maps to "nfc_nci",
and is correct for the PN54x HAL (which is the only
remaining HAL implementation in use).

Test: NFC works
Change-Id: Ida810ec990ddb4f71756225fffb3fc2757e76374
2017-01-12 10:42:16 +00:00
Treehugger Robot
cb5989d239 Merge "Bp/n/sFoo -> Bp/n/sHwFoo" 2017-01-12 01:50:58 +00:00
Ryan Campbell
f276d1923e Remove coverage from test configurations.
Remove converage from test configs or entire config if not used
to define other test params. Tested each one individually to ensure
coverage still works.

Test: run vts -m (each test affected)
Change-Id: Ic1495a38ae9d1b32e851bc646f9c8e778eee2df1
2017-01-11 16:20:44 -08:00
TreeHugger Robot
a8d358fb63 Merge changes from topic 'bphwfoo'
* changes:
  Bp/nFoo -> Bp/nHwFoo.
  Bp/nFoo -> Bp/nHwFoo
2017-01-11 23:43:16 +00:00
Yifan Hong
4bc69c918f Bp/nFoo -> Bp/nHwFoo
Bug: 33554989
Test: hidl_test
Change-Id: I748181e9eaf5b78318054b9fd99ac1a43d00498a
2017-01-11 13:04:15 -08:00
Mark Salyzyn
5ec14ad8dd Merge "liblog: use log/log.h when utilizing ALOG macros" am: 818ffb15a6 am: ca5117d1f3 am: 7c3240795a
am: d4acfd7503

Change-Id: I477c45fec225f4712051b2ff42b6f55614403531
2017-01-11 15:57:46 +00:00
Treehugger Robot
818ffb15a6 Merge "liblog: use log/log.h when utilizing ALOG macros" 2017-01-11 15:22:55 +00:00
Zhuoyao Zhang
73b595f53f Increase the timeout for NfcHidlTargetProfilingTest to 20mins
* The test takes ~15m to finish. Most time spent on parsing the trace
  file by python. Prefer to increase the timeout for now and fix the
  python part later.

Test: run vts -m NfcHidlTargetProfilingTest
Change-Id: I7e5c466985381e909044a193060cd12ed2ef3b51
2017-01-10 19:37:24 -08:00
Ruchi Kandoi
6360a884b8 NFC: Update vts files to include the Annotations.
Bug: 32124874
Test: Compiles
Change-Id: I9b323350d2ab9e9acedd4ef85a27daeb5f671bd4
Singed-off-by: Ruchi Kandoi<kandoiruchi@google.com>
(cherry picked from commit 140ccbc48c6bd05018fe79f5cc02dac7f3343a6f)
2017-01-10 19:00:32 -08:00
Keun Soo Yim
105bcaa066 NFC HAL target-side test (template)
Test: make vts; vts-tradefed; run -m HalNfcHidlTargetBasicTest
Change-Id: I021cfd916efc68fc9a4191f4aaa736f05c81c962
(cherry picked from commit 1d18b23e622fb6436a9f703eeb53c01a9ef732f6)
2017-01-10 18:59:38 -08:00
Zhuoyao Zhang
540a1ca37a Update vts files for nfc hidl file style change.
Test: make vts.
Change-Id: I2a86e9555f5e3ca0893d1e7b34f75ea68859af7e
(cherry picked from commit 0a38e46ef4692e459050b51339fb061662713fea)
2017-01-10 18:59:17 -08:00
Keun Soo Yim
3e78819754 VTS driver build target for NFC 1.0
Test: mma
Change-Id: Icc88b2bf79f2d2f23e908389c1e9d4994b439602
(cherry picked from commit dceef4931685e8556aa8f1127c45d745099b7d96)
2017-01-10 18:58:53 -08:00
Keun Soo Yim
6473c64657 add nfc vts files and vts profiler build rule
Test: mma
Change-Id: Iafe6369c99e11b3bd5b0946f142fcbbc921f915a
(cherry picked from commit a4e505ccc81b2475f241e2d252ba3b4303af84d6)
2017-01-10 18:58:37 -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
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
fead19a979 Ran update-makefiles.sh.
Add vtsc section.

Test: mma
Change-Id: I37c2c4acd1c3b193f1f978dae09a5389d61b9380
2017-01-10 11:18:00 -08:00
Hsin-Yi Chen
23bd70d552 Fix VTS paths on 32-bit target
Decide target_basepaths by device's bitness.
On 32-bit target, do not include */lib64.

Bug: 33930594
Test: vts-tradefed run commandAndExit vts -m VibratorHidlTest -l INFO
Change-Id: I340ded1d763dc194da461ecf183c6a2ff5f5ee6f
2017-01-05 11:37:31 +08:00
Martijn Coenen
028223775b Remove obsolete references to IPCThreadState/ProcessState.
Threadpool can now be configured/joined if needed with
configureRpcThreadpool() / joinRpcThreadpool().

Bug: 31226656
Test: mma
Change-Id: I0d7d9924cc8c8851cc2b61ebdae906204909890e
2016-12-30 14:00:31 +01:00
Zhuoyao Zhang
42a6dddd4a Update Android.bp of Nfc with make rule for profiler.
Bug:31930023
Test: mma
Change-Id: I4e159d4f0b37fdd4738cdee354c4fe05406baa02
2016-12-22 02:41:51 +00:00
Keun Soo Yim
a489e2b637 specify the hw binder service name from a host-side test
Bug: 33544423
Test: run vts -m VibratorHidlTest
Change-Id: I8c3cb4c4cfb3bddf98d079679a6190e394cf1563
2016-12-16 18:34:41 -08:00
Keun Soo Yim
b62dc3e6ee use the new oneshot vts driver generation build rule
Test: mma
Change-Id: Ib15399d6e7d5049b7a1912623ac2d95de9dfba73
2016-12-16 13:40:33 -08:00
Yifan Hong
b85d8763c7 Update makefiles for Java package path.
use V1_0 instead of 1.0.

Bug: 33554192

Test: hidl_test_java
Change-Id: Ic2d95265df10914a60a5bb743d75e839948838c3
2016-12-13 18:06:24 -08:00
Keun Soo Yim
b7b2ff4032 Generate VTS driver lib directly from .hal files (for NFC)
Test: mma
Bug: 31930023
Change-Id: Ic8c74c5bf1ef6fb8b18926f7d19f83c7d879de9b
2016-12-14 01:52:43 +00:00
Yifan Hong
f35ee3b192 Revert "Revert "Update makefiles for Java package path.""
This reverts commit a8789f27cb.

Change-Id: I69980b580a556188ba868bb096ae1590b01759f5
2016-12-13 22:20:16 +00:00