tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
66476 commits 1 branch 0 tags 121 MiB
Commit graph

217 commits

Author SHA1 Message Date
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
Treehugger Robot
e397b73792 Merge changes from topic 'nfc-style' 
* changes:
  nfc: update default implementation to match style.
  nfc: reflect style guide.
 2016-10-17 15:57:16 +00:00
Steven Moreland
a74426d691 nfc: update default implementation to match style. 
Test: make android.hardware.nfc@1.0-impl
Change-Id: I00357d40df1a6b2289f86b33d7a5833e358884d6
 2016-10-14 08:24:17 -07:00
Steven Moreland
cffe8d5df4 nfc: reflect style guide. 
Test: make android.hardware.nfc@1.0
Change-Id: I19b5c5a8b7e6345152441be149349933774b3de0
 2016-10-14 08:23:59 -07:00
Steven Moreland
7573963148 Cleanup nfc service code. 
Test: mma
Change-Id: Ie65c5bfde292107bec567a297e86eebf5cd7fa41
 2016-10-13 09:33:18 -07:00
Steven Moreland
13e19421b3 Merge "Revert "Revert "Revert "nfc: reflect style guide."""" 2016-10-06 02:51:18 +00:00
Steven Moreland
6d4d412617 Revert "Revert "Revert "nfc: update default implementation to match style.""" 
This reverts commit 22be21e864.

Change-Id: I0534b0eb87623091685fa0e2d94d744d2aeaa4ca
 2016-10-06 02:50:58 +00:00
Steven Moreland
20ea4ea288 Revert "Revert "Revert "nfc: reflect style guide.""" 
This reverts commit 106bc9d27a.

Change-Id: Ie2e0ad4aeaa58c45bab05234615bd7fa02b84c1a
 2016-10-06 02:50:48 +00:00
Treehugger Robot
67f700350a Merge "Revert "Revert "nfc: update default implementation to match style.""" 2016-10-05 17:22:30 +00:00
Steven Moreland
22be21e864 Revert "Revert "nfc: update default implementation to match style."" 
This reverts commit 3768be324b.

Change-Id: Ifecd3ac227af14b49eba83c1126d51996ce3b8f5
 2016-10-05 15:46:37 +00:00
Steven Moreland
106bc9d27a Revert "Revert "nfc: reflect style guide."" 
This reverts commit 69bb15e06e.

Change-Id: Icd6ac819606c83e1518c4b6252f6416f55e618fd
 2016-10-05 15:46:21 +00:00
Martijn Coenen
ea4b569fee Merge "Revert "nfc: reflect style guide."" 2016-10-04 16:44:14 +00:00
Steven Moreland
3768be324b Revert "nfc: update default implementation to match style." 
This reverts commit 6b6381cb58.

Change-Id: I2891a4ea774ad0047d9f99074fe773808dae0f7c
 2016-10-04 16:37:11 +00:00
Steven Moreland
69bb15e06e Revert "nfc: reflect style guide." 
This reverts commit e0c416a6f2.

Change-Id: I3fec772343d88a29225aef61bb549fef8ac9b797
 2016-10-04 16:36:21 +00:00
Steven Moreland
6b6381cb58 nfc: update default implementation to match style. 
Test: make android.hardware.nfc@1.0-impl
Change-Id: Ib76d663fcf28816bd2ba57f5fbd5ae0033b620f5
 2016-10-03 08:54:46 -07:00
Steven Moreland
e0c416a6f2 nfc: reflect style guide. 
Test: make android.hardware.nfc@1.0
Change-Id: I60c1589492752753c362dc9766ebc7776b5e6e6e
 2016-10-03 08:54:29 -07:00
Dan Willemsen
242b34edd5 Convert to Android.bp 
See build/soong/README.md for more information.

Bug: 31742855
Test: mma -j
Change-Id: Icb93f3b1b2caeb5e9c00f88ca35841b927ad075d
 2016-09-30 10:31:54 -07:00
Iliyan Malchev
3db0f605e4 Default binderized implementation of android.hardware.nfc@1.0 
Provide a default binderized HAL implementation.  The implementation
uses android.hardware.nfc@1.0-impl.so, which in turn loads the
conventional HAL (nfc_nci.default.so).  If a device includes package
android.hardware.nfc@1.0-service, the device will automatically use the
binderized implementation of the NFC HAL.  If a device includes package
android.hardware.nfc@1.0-impl instead, it will use the default
implementation in hardware/interfaces/nfc/1.0/default.

b/31688271
Test: pass

Change-Id: I31cd93d28705d287975b485092cffd7661599d7c
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2016-09-28 20:46:27 +00:00
Yifan Hong
b0b5322e7d Updated indentation to 4 spaces for Android.mk. 
Test: `cd system/tools/hidl && mma`
Change-Id: I088893c3c8b080239f0f32e3434faf3da3fefc7a
 2016-09-26 16:02:39 -07:00
Andreas Huber
495391aad8 Updated makefiles that also add static java library targets. 
Bug: 31684178
Test: hidl_test and hidl_test_java
Change-Id: Ib53d1be2b1535837ca97cb61796e335141fc7611
 2016-09-23 09:21:15 -07:00
Iliyan Malchev
678fa1f456 android.hardware.nfc@1.0: provide a default implementation 
b/31524912
Test: pass

Change-Id: Id9d34f62f4a2b92bdc3beb3e62c89c82743c0ca0
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2016-09-22 23:31:52 +00:00
Iliyan Malchev
998892cce7 update auto-generated makefiles 
b/31524912
Test: pass

Change-Id: Iafea8f87e93181041f42820df39ec43b3c785410
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2016-09-22 23:31:33 +00:00
Zhuoyao Zhang
adc313d43d Add dependency on libcutils. 
* Used for get system properies.

Test: pass test hidl_test.
Change-Id: I3b6d2deb442cd627a6f30312f0c204177d410ecb
 2016-09-19 12:52:09 -07:00
Yifan Hong
252c1c58a4 Remove @hal_type from .hal files. 
Test: ran make android.hardware.nfc@1.0 successfully
      compiles.

Bug: 31527823

Change-Id: Ib2c2f40ef6a8939a8344ade6138a7b0f32f14ba9
 2016-09-19 10:19:24 -07:00
Iliyan Malchev
b350caf9dc interfaces: update makefiles 
b/31015466
b/31045569

Change-Id: I07d54fd956fedc4b94622ace1c8f2be3f2f93b2b
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2016-09-07 14:37:35 -07:00
Andreas Huber
7ab75a7325 Updated makefiles (includes java-library rules for applicable packages). 
Change-Id: I178faf37dddb5149c1bdc217fa1395b2566194d7
Bug: 31221188
 2016-08-31 13:56:05 -07:00
Martijn Coenen
cbe590cb9f Apache2 module license. 
Bug: 31110244
Change-Id: I7ce63f940199e8cd7d193bdde39fc6cd448db802
 2016-08-30 11:28:36 -07:00
Keun Soo Yim
3cdfe14922 build 32- and 64-bit libs (auto-generated) 
Change-Id: Iccb63cafc5db17abd423d589416d50ff21c89efa
 2016-08-26 18:55:21 -07:00
Keun Soo Yim
6b4d639626 regenerate Android.mk files 
Change-Id: I6a8b48943df469c9f345c05fb00c671f6f8dd393
 2016-08-22 17:25:48 -07:00
Martijn Coenen
384150191f Updated makefiles linking against libhidl. 
Bug: 30839546
Change-Id: I8c68d0b8db0816f9bfe58fc3898114fb9e151ddc
 2016-08-19 14:06:56 +02:00
Zhuoyao Zhang
80b6a1263a Add annotation of hal_type for Nfc/NfcCallback interface. 
Change-Id: I5bb53c396ea11a94fa556cf561b584b6f12f476c
 2016-08-11 15:51:28 -07:00
Iliyan Malchev
81add9c495 android.hardware.nfc@1.0: regenerate Android.mk 
hidl-gen \
	-Lmakefile \
	-randroid.hardware:hardware/interfaces \
	android.hardware.nfc@1.0

Change-Id: Ib2d965db93fb248f74ce44efea02b3c4bb2dbe08
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2016-08-10 07:39:22 -07:00
Iliyan Malchev
31e16a7e63 fix the fix 
Change-Id: Ib371beb0c9f3792fbe3149d5dc4f50ae017b56c2
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2016-08-08 14:31:09 -07:00
Iliyan Malchev
6cf9db2362 fix build 
Add hidl-gen as a dependency on HAL modules, and set the -r path
properly in the absence of $TOP being defined.

Proper fix will include auto-generating the makefile correctly form
hidl-gen.

Change-Id: I9dbe27b80c6c9ab4be9f88bf50496bdfd7cee423
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2016-08-08 09:56:20 -07:00
Andreas Huber
a48313947e nfc interfaces in the new style. 
Change-Id: I989828d51a2ac1c79906d865b5bdab227457d2e6
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2016-08-07 21:27:58 -07:00