Commit graph

184 commits

Author SHA1 Message Date
Jaekyun Seok
81104ae5ef Add 'vendor.' prefix to a vendor HAL service name
To prevent property name collisions between properties of system and
vendor, 'vendor.' prefix must be added to a vendor HAL service name.
You can see the details in http://go/treble-sysprop-compatibility.

Test: succeeded building and tested on a walleye device
Bug: 36796459
Change-Id: I4e8fbee791ec917a8f627a1366f4d44ec7e6febc
2017-09-12 08:01:42 +09:00
Steven Moreland
6da35570df Updating all makefiles.
Bug: 64487114
Test: none
Change-Id: I8608c8f636c35f21e4246a805a9eff6d14124e0a
2017-08-10 23:43:46 +00:00
Myles Watson
9e8b857bfd NFC: Add OWNERS file for default/ am: 31439b1d24 am: 3a43fa5115
am: e32a2e3f9a

Change-Id: Icc832424e38bb1e00f9fc821dde81f2c73d6be62
2017-08-09 20:38:31 +00:00
Steven Moreland
65de66a67e Update makefiles for vndk enabled. am: 5e59402492 am: 271d53d836
am: 148ca84740

Change-Id: I5ef3611026b9c770bf713c14b9e01899a796e61c
2017-08-09 20:36:43 +00:00
Myles Watson
31439b1d24 NFC: Add OWNERS file for default/
Test: build
Change-Id: I6e854923fdd66991bcc7ed3446106d148abea982
2017-08-09 18:33:57 +00:00
Steven Moreland
5e59402492 Update makefiles for vndk enabled.
Test: none
Bug: 63866913
Merged-In: I29174fdadca2828455ef49f14e53bc95c5238dbb
Change-Id: I29174fdadca2828455ef49f14e53bc95c5238dbb
(cherry picked from commit c716b8c307)
2017-08-08 17:09:10 +09:00
Steven Moreland
f4c58cd48c Merge changes from topic 'go-away-static-hidl-java'
* changes:
  Update makefiles.
  Add an empty 1.1 ISap interface.
  [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
2017-08-04 19:14:48 +00:00
Steven Moreland
b5da32c177 Update makefiles.
Removes redundant "java-static" target.

Note, targets aren't removed here which have internal
targets that depend on them.

Bug: 36376126
Test: pass
Change-Id: I830f02e5f219d2d58721132c358d2783c3942eac
2017-08-03 15:25:21 -07:00
Treehugger Robot
7d149a564f Merge changes from topic 'vts_deps'
* changes:
  VTS tests now static link to HAL def libs.
  Add cc_defaults VtsHalTargetTestDefaults
2017-08-03 20:06:15 +00:00
Tri Vo
6c2bd86f70 VTS tests now static link to HAL def libs.
And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: compiles
Change-Id: I3cfb1a64f6abcf3145337a736800b72d92a0b152
2017-08-03 18:04:00 +00:00
Ruchi Kandoi
c901276e60 nfc: NCI 2.0: Add CORE_INIT_CMD for NCI 2.0
Bug: 64245250
Test: run vts test
Change-Id: I4ca434fb1fb44a6278942f020ddd02b162d7f605
2017-08-03 00:23:29 +00:00
Sundong Ahn
94293086f8 Change dependency library
hwbinder.jar will be used instead of framework.jar on build-time, but
on runtime framework.jar will be used.

This is to cut the circular dependency when using configstore from
Android framework.

Bug: 35771640
Test: no test.
Change-Id: I04cab676c91d2ea423f5e2c1b2b9efa15e522f37
2017-08-01 11:24:01 +09:00
Steven Moreland
7206708528 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
Change-Id: I1b2401fb273ab80819e3870aa71fe742269674ba
2017-07-26 10:14:57 -07:00
Ruchi Kandoi
a915c5a240 Nfc: Vts: modify WriteInvalidAndThenValidCommand
Invalid Data packets are ignored by the NFC controller in case there
isn't an active RF Interface. The test expects response for the invalid
data packet without any active RF Interface. This patch modifies the
test to send an invalid command instead which will guarantee a response.

Test: run vts test
Bug: 62400568
Change-Id: I7db1d5209b6ef2240ac248f3aba0e27e0a285018
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-06-16 19:58:18 +00:00
Ruchi Kandoi
ff8068d160 Support NCI 2.0 for NFC VTS
Bug: 62322170
Test: Run vts test
Change-Id: I7ed331dac9d5918675c091620f099b6250e20700
2017-06-12 16:21:44 -07: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
Ruchi Kandoi
209a274c31 NFC: vts: Add commands to reset the NFC controller before other commands
Bandwidth and WriteInvalidAndThenValidCommand test assumes that the NFC
controller will be initialized before the test. This is not necessarily
true for all devices. Send CORE_RESET_CMD and CORE_INIT_CMD before
creating a loop-back connection.

CORE_RESET_RSP doesn't necessary return the configuration that was sent
in CORE_RESET_CMD. For instance, if CORE_RESET_CMD requested keeping
the configuration, and if the controller doesn't support that, the
configuration will be resetted and CORE_RESET_RSP will reflect that.

Bug: 38267593
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
      --primary-abi-only --skip-preconditions
      --module VtsHalNfcV1_0Target -l INFO
Change-Id: I65ae9746054ca767b928bdd461faa02f03719aea
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-05-15 17:12:49 +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
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
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
Treehugger Robot
818ffb15a6 Merge "liblog: use log/log.h when utilizing ALOG macros" 2017-01-11 15:22:55 +00: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
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
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
65cbd60e1f Update to use the correct logging library.
Test: compiles
Change-Id: Ia5030c4d7ef95c5878c6b320d5bc30041023728f
2016-12-01 15:58:37 -08:00
Ruchi Kandoi
99535bc942 NFC: Add @exports to generate nfc-base.h headers.
Test: Generates headers using hidl-gen
Bug: 32748647
Change-Id: I20bf4329a7fbad1096798db060a2ea5be695c62e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-11-28 17:34:15 -08:00
Ruchi Kandoi
51068e0bd3 Nfc: Change return types for Nfc hal to specified type.
Test: Compiles and test passes
Bug: 32998929
Change-Id: I6787b90e5e745b32c7a5a951203496cc614fdc10
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-11-29 01:14:26 +00:00
Treehugger Robot
2fe5762cae Merge "Update makefiles for logging." 2016-11-24 16:41:20 +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
3e3a0998e0 Update makefiles for logging.
Bug: 32943424
Test: hidl_test
Change-Id: I86dc81935912861073497c07696378895a25f9ee
2016-11-21 16:19:57 -08:00
Ruchi Kandoi
3bca1eef75 Merge "NFC: Add Annotations to the HAL file" 2016-11-21 22:53:01 +00:00
Yifan Hong
63544eacb6 Split libhidl into base and transport.
Bug: 32756130

Test: mma
Change-Id: Id21cf23abe2910f26bb7895511862443b93dc112
2016-11-18 09:52:57 -08:00
Ruchi Kandoi
846d9ab9fa NFC: Add Annotations to the HAL file
Test: Compiles
Bug: 32124874
Change-Id: Id31199a0dc55afc32835868c3e9ee1e2075648cc
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-11-08 13:00:11 -08:00
Colin Cross
8f084e00d6 Support genrules with multiple tools
To allow genrules with more than one tool, rename the tool property to
tools and make it an array, replace $tool with $(location <label>),
and use $() for other variables for consistency.

Bug: 31948427
Test: compare build.ninja
Change-Id: I3d714f70a2af0dc60faeee10e09b6ed166601f1d
(cherry picked from commit b785f5b82e)
2016-11-07 10:54:59 -08:00
Steven Moreland
7982058699 Running update-makefiles for fixed spacing.
Test: pass
Change-Id: I4dcaf70b1c014f3ecf685d4884601be6f17ee51d
2016-11-01 20:06:29 +00:00
Martijn Coenen
42eba0a071 NFC HAL doesn't need readproc.
Bug: 31928447
Test: NFC still works
Change-Id: I9f43192c33f3fdf91e4aa97d4c5e5fa49a01a85e
2016-10-28 17:09:22 +02:00
Steven Moreland
7a4f118c48 Stop all these merge conflicts.
Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
2016-10-26 12:05:29 +02:00
Steven Moreland
ce9779412a Update headers (for export shared lib headers)
Test: mma -j64
Bug: 32337293
Change-Id: I93e7cab90efac407525a1a5f2ad30f816a530e17
2016-10-22 00:28:00 +00:00
Steven Moreland
cc7d42bded Use defaultPassthroughServiceImplementation for nfc.
Bug: 32282345
Test: nfc
Change-Id: I4f45a3d4b91ccee2fcd0ca8fe599e090129a02e3
2016-10-19 14:51:59 -07:00