Commit graph

116 commits

Author SHA1 Message Date
Treehugger Robot
62769b7196 Merge "Remove redundant dependencies" 2017-05-01 23:19:25 +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
Steven Moreland
238dd8a83c nfc: Android.mk -> Android.bp
Test: links
Change-Id: Ia19dafb3ff6bf5772d72133bb2e1687226e0d44f
2017-04-29 01:21:24 +00:00
Hung-ying Tyan
b422f16e23 Remove dependency of libhardware_legacy
It is not used by bluetooth and nfc services.
Bug: 33241851
Bug: 37305530
Test: built and tested on sailfish

(cherry picked from commit 593eeb7a4b)

Change-Id: I599073296baa5eee72a1fce8caa4eb8352f66218
Merged-In: I599073296baa5eee72a1fce8caa4eb8352f66218
2017-04-19 22:45:32 +00: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
Ruchi Kandoi
9150025076 nfc: vts: Correct parameters going for CoreInitialized
Core Initialized with parameters 1-3 leads the device into recovery
mode. Which causes the test to fail.

Bug: 36751759
Test: Test passes
Change-Id: I1375546cc66c147f26c315a042ca0afb49f0ce06
2017-04-03 22:44:21 +00:00
Yuexi Ma
bfefc5ef10 NFC VTS test use VtsHalHidlCallbackBase for callback wait and notify
VtsHalNfcV1_0TargetTest uses VtsHalHidlCallbackBase.
Callback class extends VtsHalHidlCallbackBase and use waitForCallback and notifyFromCallback

The original NFC test contains the following use cases:
  * Callback notify happens before wait
  * Multiple waiting in serial
The modified version added the following use cases:
  * Wait for specific callback function
  * Passing callback arg data along wait and notify functions

Bug: 36036059
Test: make VtsHalNfcV1_0TargetTest, adb push & adb shell
Change-Id: Ic6668a18254661d07c4ff37309cd96ea5f786d29
2017-04-01 23:36:14 -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
e90c31f125 Update makefiles.
Test: pass
Change-Id: I925baccbe51a32b7b7f3f66cf2918d017ee6b039
2017-03-24 21:50:45 -07:00
Ruchi Kandoi
ee8314cd7a Nfc: Null ptr checks in HAL
Adds null pointer checks in the default implementation.

Test: compiles
Bug: 36149477
Change-Id: I6195ce92f5cefd4b82874866d08014830f400192
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-03-22 16:47:48 -07:00
Yuexi Ma
6b8720110b Change vts target base test class name
Test: make vts succeed, vts kernel tests and nfc hal tests passed
Change-Id: I38ae6cc940d0f17bb3352f360efdf9c70697c76b
2017-03-10 00:42:13 -08: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
Ruchi Kandoi
3d7c5f974c Add Test cases to Nfc VTS
- Call close() after close()
- Call open() after open()
- Call powerCycle() after close()
- Call preDiscover() after close()
- Call controlGranted() after close()
- Call coreInitialized() with different data

Test: VTS test passes
Bug: 32024301
Change-Id: I7cd986887ccbf2774d5eace9c975a9a55ee46364
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-03-06 17:03:08 -08:00
Yuexi Ma
93d2541aae Add columns to namespace for vts target base test invocation
Test: make vts
Change-Id: Ia0284fbc11eadef572dd510bb5847160852bd517
2017-02-28 20:49:00 +00:00
Yuexi Ma
178dfd5e29 change all vts hidl tests to use VtsHalHidlTargetBaseTest
Bug: 33385836
Test: mma
Change-Id: I660d6e0fce6422d87d4b227273a77c95d20ed3f2
2017-02-28 07:59:59 +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
Martijn Coenen
85ca130527 Nfc: deal with the framework going away.
By calling close() when the framework client dies.

Bug: 35624326
Test: NFC HAL stays alive and works after com.android.nfc is killed
Change-Id: I91fcf6685783cd630a44d19b4cb99127a2c0e89b
2017-02-23 17:54:46 +00:00
Tri Vo
81f9968c71 Remove .vts spec files.
Test: mmma hardware/interfaces
Change-Id: Iabbcd336d37ceb58ea4cc649ee5c104424494513
2017-02-21 15:55:00 -08:00
Zhuoyao Zhang
f7693eed97 Update the test binary and source file name.
* To confirm with Vts naming convention.

Bug: 35273456
Test: mma
Change-Id: Ide6d9d15618e65d8cb74363f3a8acd52609cd0dd
2017-02-17 10:34:33 -08:00
Treehugger Robot
8cd0125d2e Merge "Remove --coverage in Android.bp" 2017-02-15 05:08:19 +00: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
Zhuoyao Zhang
65c99d7f08 Update vts files on aosp.
* Based on the latest hidl-gen and .hal files.

Test: mma
      make vts.

Change-Id: I4765450d985afd552fe720d91b9ab3422f5b7a47
2017-02-12 13:51:06 -08:00
Dan Willemsen
84107a0630 Remove --coverage in Android.bp
It's no longer allowed now that Soong supports code coverage.

Bug: 32749731
Test: None
Change-Id: I09ef27983e0744543c3a6e1c0c73d69217dd582c
2017-02-10 09:29:36 -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
Keun Soo Yim
5d6712c7e1 move VTS stub files and non-functional tests (aosp)
Test: mma
Bug: 34976004
Merged-In: Id9c88a9778fba49f0841a474aa067d271f14e207
Change-Id: Id9c88a9778fba49f0841a474aa067d271f14e207
2017-02-04 02:52:31 +00:00
Zhuoyao Zhang
bd752892b3 Support driver/profiler for all hals.
* Update the make file to generate driver/profiler for hals.

Test: mma
Change-Id: I2a91d913b05beb8e1ecf28a205852f848ef1f5ee
2017-02-01 20:53:21 -08:00
Zhuoyao Zhang
6d88fc9a6a Merge "Increase the timeout for NfcHidlTargetProfilingTest." 2017-01-26 03:52:07 +00:00
Zhuoyao Zhang
54abf5632a Increase the timeout for NfcHidlTargetProfilingTest.
* Given there's still test failue due to timeout:
  https://android-vts-internal.googleplex.com/show_table?testName=NfcHidlTargetProfilingTest,
  increased the limit to 25m.

Test: run vts -m NfcHidlTargetProfilingTest
Change-Id: Ie5fee6a399281ec538e6724207916908bb8da4d0
2017-01-25 15:57:06 -08:00
Ruchi Kandoi
185b5a7492 NFC: Update VTS test
- Order of data and CORE_CONN_CREDITS_NTF is not defined, check for the
order in which they were received before checking for contents
- Configuration status is added to WriteCoreReset test
- Add WriteCoreResetConfigReset test

Test: VTS test passes
Change-Id: Ifb730bbb51c366807028fe7e6757c0f8eae943c3
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-01-24 18:59:06 +00:00
Keun Soo Yim
522baddaf1 use the default binder/passthrough mode in NFC VTS test.
Test: mma
Bug: 34179753
Change-Id: Id9ac440a53b6256e33d1bfdedcf14caa38670467
2017-01-19 12:33:52 -08:00
Chris Phoenix
3b06b22ed4 Nfc HAL uses "default" service name
The getService() and registerAsService() methods of interface objects
now have default parameters of "default" for the service name. HALs
will not have to use any service name unless they want to register
more than one service.

Test: builds; verify HAL still works

In support of b/33844934

Change-Id: Id7b76e1df98e1ecacb530a1b5fec76bf14ba6eb7
2017-01-18 15:51:05 -08:00
Steven Moreland
70f34a6330 Adding all nfc vts related things back.
Test: none
Merged-In: I84a42ae27d36a5479f2ca859849bb1b4536bdbad
Change-Id: I84a42ae27d36a5479f2ca859849bb1b4536bdbad
2017-01-18 11:15:11 -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
Martijn Coenen
9e172b30c7 Merge "Load legacy NFC libhardware HAL by correct name." 2017-01-13 08:35:40 +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