Commit graph

89 commits

Author SHA1 Message Date
TreeHugger Robot
d9b12c13e5 Merge "Update makefiles for vndk enabled." into oc-mr1-dev 2017-08-04 00:52:06 +00:00
Steven Moreland
c716b8c307 Update makefiles for vndk enabled.
Test: none
Bug: 63866913
Change-Id: I29174fdadca2828455ef49f14e53bc95c5238dbb
2017-08-02 18:00:14 -07:00
Steven Moreland
208a586cf8 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
Merged-In: I1b2401fb273ab80819e3870aa71fe742269674ba
Change-Id: I1b2401fb273ab80819e3870aa71fe742269674ba
(cherry picked from commit 7206708528)
2017-08-02 12:52:41 -07:00
Steven Moreland
49abbfdd68 Merge "Move all hidl_test dependencies to the system.img"
am: 46bb27e614

Change-Id: Id46ab1835638aec6c98f0b2775774cb4cc0c34dd
2017-07-18 08:50:32 +00:00
Steven Moreland
2f2aabe212 Move all hidl_test dependencies to the system.img
Test: hidl_test passes
Test: build with BOARD_VNDK_VERSION=current
Bug: 63704014
Change-Id: Ia97be8b4d61236adfd964bf8e4fa632d99010b98
2017-07-17 18:36:02 -07:00
Steven Moreland
67b9ae7d9c Merge "Update makefiles." am: 9119d4ccd1 am: 242b2288d7
am: c6da54569f

Change-Id: Ib7f7a9cdb64985d545443edac5bb8e9c169fc592
2017-05-20 00:19:40 +00: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
Steven Moreland
8e89a43590 Update makefiles for c++-sources and c++-headers. am: cb360c60d8 am: 4bd4e7fb3b
am: 127b116fe5

Change-Id: I3a2aa76acef0f0d1455bfad775e87e8089d357e8
2017-05-10 02:58:00 +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
Steven Moreland
f90189a79f Merge "Remove redundant dependencies" am: 62769b7196 am: 170e2e85a2
am: 5fba1db1d2

Change-Id: I661fff75d140b4359af055a0f08f08ef33c889c3
2017-05-01 23:37:04 +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
8cc75b051e Merge "Update makefiles." am: bbf39eb0b9 am: 3334081377
am: 5306d88cad

Change-Id: Ie1ed999a4a11ea9767d09fca591c80db91102daf
2017-04-12 17:26:03 +00:00
Steven Moreland
0dd5ba23fb Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 16:41:07 -07:00
Steven Moreland
53b21566bc Update makefiles. am: e90c31f125 am: f11981de68
am: 103bada0e1

Change-Id: Ibe6eeeacab5660a8cf70d59dd9a4864d6f70ab80
2017-03-27 17:51:28 +00:00
Steven Moreland
e90c31f125 Update makefiles.
Test: pass
Change-Id: I925baccbe51a32b7b7f3f66cf2918d017ee6b039
2017-03-24 21:50:45 -07:00
Steven Moreland
b28099785a Add hidl_default and make modules use hidl_default. am: 691a455b9f am: 7c9f5c35d8
am: a6de4ca892

Change-Id: Ie4a219330792a194bef4a983b706c5f3191761a7
2017-03-09 02:09:52 +00: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
Steven Moreland
1daad90b81 Remove viral dependency on libhwbinder. am: d28a3dce40 am: 444d759920
am: 5c605c8add

Change-Id: I54d6e5a0b38ef9eb507748fd38a8c508e0eb1948
2017-02-25 02:55:43 +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
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
Steven Moreland
ff4224809f 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
Change-Id: I3f86c77c147514fe470f08088a66de312ae32d4e
2017-02-13 15:03:33 -08:00
Tri Vo
4ce38bc27f Use filegroup as genrule srcs. am: 06da29ffae am: 5b43e2caa8 am: 831bfd746c
am: 6924f25a61

Change-Id: Iffa108b900ecbd2800090b5b1cdfc4fc65f63f3c
2017-02-10 02:36:00 +00: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
Tri Vo
bd397ba5e1 Merge "Remove vts driver/profiler build rules." am: 0f7a0678af am: 3b5f6dad56 am: 468446f91b
am: e9cf6ba378

Change-Id: I7e2fba48c44cdbdb6d87e6d54446986889be26cf
2017-02-08 01:05:09 +00: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
Yifan Hong
cad2f77b0e Merge "Add test for type resolution." am: 5835d9ea59 am: 168bb896b7 am: 6cc9f50bd3
am: 63a36d7b62

Change-Id: I0477b4dc3e782752a556003ddaced227d2271b06
2017-01-17 21:12:01 +00:00
Steven Moreland
96232e327f Revert "Revert "move VTS HIDL HAL tests to the corresponding interface directories""
This reverts commit 070e8d2116.

Change-Id: I66dd4e6cf875e39e58b0d91724a603b37d32c0ac
2017-01-14 00:00:26 +00:00
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
Yifan Hong
97973c69c8 Add test for type resolution.
Test: make hidl_test

Bug: 31971432

Change-Id: I5c058079d54e1b480f21550a76ccfd53f54bd0c4
2017-01-13 10:11:08 -08:00
Treehugger Robot
cb5989d239 Merge "Bp/n/sFoo -> Bp/n/sHwFoo" 2017-01-12 01:50:58 +00: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
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
Martijn Coenen
ddfd2b832d Callback elision for HIDL interfaces. am: e8b0161713 am: 04bd96f989 am: c8a4f398c2
am: a5cb4f042f

Change-Id: I32cb28fb4acc7d69059b8dd3e80946e2e2963b9c
2017-01-05 10:04:23 +00:00
Martijn Coenen
e8b0161713 Callback elision for HIDL interfaces.
Test: mma, hidl_test
Bug: 31380743
Change-Id: Ic5390d49a9493d1180bdd8a15bc47e891637890e
2017-01-05 08:48:23 +01:00
Yifan Hong
7f6bfcc606 Merge "Test for echoed interfaces." am: f5f75be7b6 am: a175fa4b4a am: c63c36ceaf
am: abaee80220

Change-Id: I8c38c43e04e47aa834cb381fe41addc6751f4076
2016-12-19 22:47:21 +00:00
Yifan Hong
87cc71c9fa Test for echoed interfaces.
Test: hidl_test

Bug: 33173166

Change-Id: I0b8b8553b7d3f7b1800d0970a9fc17d01084dfcf
2016-12-16 15:49:39 -08:00
Martijn Coenen
a86dab68ad Revert "Fix tests for using IBase instead of IBinder." am: 0dbb9903cd am: 666a5dcafe am: 8723856c45
am: d1fd31018f

Change-Id: Ifad04fe3804826f97f1c228e666bb6760aa19f5f
2016-12-16 01:46:03 +00:00
Martijn Coenen
0dbb9903cd Revert "Fix tests for using IBase instead of IBinder."
This reverts commit 1d747311b3.
Bug: 33173166
Test: builds, hidl_test
2016-12-15 21:34:38 +01:00
Yifan Hong
5d22a288cb Add test for bitset/mask type.
Test: hidl_test
Change-Id: I8bcd304184ff6b7794a9d0b5d3999f071604471d
2016-12-06 00:29:42 +00:00
Yifan Hong
e7ce822b96 Add test for bitset/mask type.
Test: hidl_test
Change-Id: I8bcd304184ff6b7794a9d0b5d3999f071604471d
2016-12-05 12:46:17 -08:00
Yifan Hong
1d747311b3 Fix tests for using IBase instead of IBinder.
Echoed interfaces cannot be casted properly, because
interfaceChain cannot be called. So the given vector
of interfaces is re-wrapped. This is temporary; when
b/33173166 is fixed, this change should be reverted.

Test: hidl_test

Generates: b/33173166

Change-Id: I12166f69cf04abf7485dc2455ad731b87c80b3d1
2016-12-03 01:09:23 -08:00
Yifan Hong
ebcc3328e8 Use IBase instead of IBinder for interface keyword.
Test: hidl_test
Change-Id: Id51d1957f311d1025dac57d40d4dd5c24d328a6c
2016-12-03 01:09:23 -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
501839495f Update makefiles for hidlizing IBase.
A new dependency android.hidl.base@1.0 is added for
all projects.

Test: mma

Change-Id: Ia70d0eb0d74de06475a339698386d383d491a43a
2016-12-03 01:01:14 -08:00
Yifan Hong
0bd75e02b0 Fix tests for using IBase instead of IBinder.
Echoed interfaces cannot be casted properly, because
interfaceChain cannot be called. So the given vector
of interfaces is re-wrapped. This is temporary; when
b/33173166 is fixed, this change should be reverted.

Test: hidl_test

Generates: b/33173166

Change-Id: I12166f69cf04abf7485dc2455ad731b87c80b3d1
2016-12-03 00:59:01 -08:00
Yifan Hong
76dd1951ae Use IBase instead of IBinder for interface keyword.
Test: hidl_test
Change-Id: Id51d1957f311d1025dac57d40d4dd5c24d328a6c
2016-12-03 00:59:01 -08:00
Yifan Hong
15a9614dcd Merge "Update to use the correct library for logging." am: f5e1ac67ed am: 34d006ee9c am: fb89d1237d
am: 6cb0ee580a

Change-Id: I27419afa6ff8ebda825e474d9cee242a29a31f53
2016-11-30 20:59:57 +00:00