Commit Graph

40 Commits

Author SHA1 Message Date
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