Commit graph

168 commits

Author SHA1 Message Date
Tri Vo
d94a7d2df9 Remove .vts spec files
Test: mmma hardware/interfaces
Change-Id: Idae97ce60a6368cfa685ae6b2d71b9ad163e8605
2017-02-22 12:53:52 -08:00
Zhuoyao Zhang
8422f6aa04 Update the test binary and source file name on master.
* To confirm with Vts naming convention.

Bug: 35273456
Test: mma
Change-Id: I845da64085253cd02480465479618308045a52ed
2017-02-21 20:47:18 -08:00
Ryan Campbell
2caf0a60f3 Remove coverage flags from tests.
Remove unnecessary coverage flags from HAL tests.

Bug: 32749731
Test: none
Change-Id: I7e4e3bce2d9d444bfa8475c140bce2ee7e3b0c0d
2017-02-14 16:50:34 -08:00
Zhuoyao Zhang
f008f8fdc4 Merge "Update .vts files on master based on the latest .hal file and hidl-gen" 2017-02-14 18:51:27 +00:00
Zhuoyao Zhang
3bef939f94 Update .vts files on master based on the latest .hal file and hidl-gen
Test: mma
Change-Id: I9558f300505db83e26f7c241c5cf729cd005a07b
2017-02-13 18:03: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
Andreas Huber
c409e30da7 Updated makefiles am: 0574bacb2a am: f9c87639bf am: bf7b779b40
am: 238660c10a

Change-Id: I1600e1a693462fb99b684381860fa788867f45cf
2017-02-10 01:14:57 +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
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
Keun Soo Yim
7b9b6ca18f move VTS stub files and non-functional tests
Test: mma
Bug: 34976004
Change-Id: I20273bdc3a05e2986fcf921f65d2afd6d72781e4
2017-02-04 02:45:25 +00:00
Zhuoyao Zhang
3590cc105e Merge "Support driver/profiler for all hals." am: a0ff9aca7a am: 2b741f188b am: fa531574ab
am: 3d5c20def5

Change-Id: Iccc715c11e0d380706d4bbb30ba2514dcf16b2ba
2017-02-03 02:23:34 +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
Chris Phoenix
68df3d04da Merge "bootctrl HAL uses "default" service name" 2017-01-23 20:27:50 +00:00
Chris Phoenix
eb1cdbb622 bootctrl 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

Bug: 33844934

Change-Id: Idadbd59b3194a6b54e91a4beb9e295e1d00bc237
2017-01-21 02:34:13 +00:00
Chris Phoenix
a79b3b6d95 bootctrl 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

Bug: 33844934

Change-Id: I43f282ffedf18e4b0817b49fc4860ac39b127d04
2017-01-21 02:34:12 +00:00
Chris Phoenix
5f5782276f bootctrl 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: I2c0aa199b5649f720710bfd564c077b6ce3acc9c
Merged-In: I43f282ffedf18e4b0817b49fc4860ac39b127d04
2017-01-20 14:21:04 -08:00
TreeHugger Robot
9968f30f01 Merge "Remove useless Android.mk files." 2017-01-19 21:37:37 +00:00
Ryan Campbell
bfe09b9da6 Add boot profiling tests.
Create boot profiling tests.

Bug: 34177792
Test: make vts, run vts -m HalBootHidlTargetProfilingTest
Change-Id: I65f85e9f4681323187fc263cbf93bd8cc2f29b9b
2017-01-19 01:00:12 +00:00
Steven Moreland
66816de87f Remove useless Android.mk files.
Test: none
Change-Id: I99f4d3e5b943742009e366b13bee2c32e38a3fba
2017-01-18 11:49:08 -08:00
Connor O'Brien
86a7ec303c Fix bugs in boot HAL VTS test
Remove copied code and ensure that changes to boot slots are rolled
back to prevent problems on reboot.

Bug: 34220303
Test: Tests pass; device reboots successfully afterward.
Change-Id: I40f8ec283beae3feb09ab6f416fd4e178b173b87
Signed-off-by: Connor O'Brien <connoro@google.com>
2017-01-12 15:40:53 -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
Treehugger Robot
818ffb15a6 Merge "liblog: use log/log.h when utilizing ALOG macros" 2017-01-11 15:22:55 +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
Yifan Hong
fead19a979 Ran update-makefiles.sh.
Add vtsc section.

Test: mma
Change-Id: I37c2c4acd1c3b193f1f978dae09a5389d61b9380
2017-01-10 11:18:00 -08:00
Steven Moreland
b643842192 Return<*> getStatus().isOk() -> isOk()
Bug: 31348667
Test: compiles
Change-Id: If8d5a23f80dbc04127635b49f1ef77398fc9f8a1
2017-01-04 10:40:05 -08:00
Zhuoyao Zhang
c57e359d1a Update Android.bp and vts/Android.mk for Hidl HALs
* Using update-makefiles.sh to add make rule for profiler in Android.bp
* Remove make rule for profiler in vts/Android.mk.

Bug:31930023
Test: mma
Change-Id: Iea834d8610501c2fce63f65742db31bafb85c0b8
2016-12-22 17:09:12 -08:00
Connor O'Brien
7422ab7e23 Add code coverage for boot VTS tests
Test: built and ran tests.
Bug: 32022514
Change-Id: Icec5738317ec3758f432fe0d4f80dd4b19be30ed
Signed-off-by: Connor O'Brien <connoro@google.com>
2016-12-20 12:32:14 -08:00
Keun Soo Yim
b62dc3e6ee use the new oneshot vts driver generation build rule
Test: mma
Change-Id: Ib15399d6e7d5049b7a1912623ac2d95de9dfba73
2016-12-16 13:40:33 -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
f35ee3b192 Revert "Revert "Update makefiles for Java package path.""
This reverts commit a8789f27cb.

Change-Id: I69980b580a556188ba868bb096ae1590b01759f5
2016-12-13 22:20:16 +00:00
Yifan Hong
a8789f27cb Revert "Update makefiles for Java package path."
This reverts commit ab0792ccdc.

Change-Id: I47fc272d9fa8875e3d7ccb10cb748c738fbf8135
2016-12-13 22:18:34 +00:00
Yifan Hong
ab0792ccdc 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 11:32:56 -08:00
Connor O'Brien
100b491d2d Boot HAL target-side test
Test: make vts; vts-tradefed run -m HalBootHidlTargetTest
Bug: 32022514
Change-Id: I65606790cc3b2f93d6706b70fad21c172635e0c7
Signed-off-by: Connor O'Brien <connoro@google.com>
2016-12-07 19:04:58 -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
1080c8d129 Merge "Update to use the correct logging library." am: 48f6298fa3 am: 82c7db6e9f am: 42792cd5e4
am: c1a60f1fd3

Change-Id: I2893788bbc1c0b50bc62c9094985ccf095161a3d
2016-12-02 08:14:04 +00:00
Yifan Hong
65cbd60e1f Update to use the correct logging library.
Test: compiles
Change-Id: Ia5030c4d7ef95c5878c6b320d5bc30041023728f
2016-12-01 15:58:37 -08:00
Steven Moreland
9f8b5c7b16 Added AOSP license headers.
This is only for hals which are currently only in master. Separate
commit for hals currently in AOSP.

Test: pass
Change-Id: I0b1a09798c49f4f0141f36a322c4749e47eded03
2016-11-29 23:07:09 +00:00
Treehugger Robot
2fe5762cae Merge "Update makefiles for logging." 2016-11-24 16:41:20 +00:00
Steven Moreland
eccc0081c8 Remove HIDL_GENERATED from things written by hand. am: 33e87b8a76 am: 8b6a886d60 am: 35460073b3
am: 6817b001f1

Change-Id: Ied2a612dbeac019fa764eeb8375d6e68f0ff7e66
2016-11-23 01:51:19 +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
f8d68ec855 Update makefiles for logging.
Bug: 32943424
Test: pass
Change-Id: Ic88ce6adf04e0e36db53e4cc06ac2ec5a90c011c
2016-11-21 16:28:54 -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
Yifan Hong
63544eacb6 Split libhidl into base and transport.
Bug: 32756130

Test: mma
Change-Id: Id21cf23abe2910f26bb7895511862443b93dc112
2016-11-18 09:52:57 -08:00
TreeHugger Robot
17452436fb Merge "Remove -DENABLE_TREBLE from vts test LOCAL_CFLAGS." 2016-11-18 16:24:29 +00:00
Yifan Hong
6b920e43d3 Split libhidl into base and transport.
Bug: 32756130

Test: mma
Change-Id: Id21cf23abe2910f26bb7895511862443b93dc112
2016-11-18 00:00:54 -08:00
Steven Moreland
2b2cef2864 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
2016-11-17 14:57:37 -08:00
Ryan Campbell
3b3b9251fa Merge "VTS driver files for boot control HAL." 2016-11-11 16:03:15 +00:00
Ryan Campbell
548f2a000a VTS driver files for boot control HAL.
Test: manual
Change-Id: Ib9b459321002d249c487628028ac8e90e91bffbf
2016-11-10 17:19:43 +00:00
Connor O'Brien
50e32b752e Run boot HAL service as root
The service must run as root to access block devices required by
the existing implementation.

Test: bootctl is-slot-bootable 1
Change-Id: I882cba8ad24943781d5c447b67518acc03efc9a8
Signed-off-by: Connor O'Brien <connoro@google.com>
2016-11-08 16:26:43 -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
Colin Cross
b785f5b82e 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
2016-11-04 22:49:15 -07:00
Steven Moreland
7982058699 Running update-makefiles for fixed spacing.
Test: pass
Change-Id: I4dcaf70b1c014f3ecf685d4884601be6f17ee51d
2016-11-01 20:06:29 +00:00
Steven Moreland
7a4f118c48 Stop all these merge conflicts.
Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
2016-10-26 12:05:29 +02:00
Treehugger Robot
da32114e26 Merge "boot: use defaultPassthroughServiceImplementation" 2016-10-24 18:00:16 +00: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
5ac42e7a88 boot: use defaultPassthroughServiceImplementation
Bug: 32282345
Test: make
Change-Id: Ifb479c665aa4e37881c86152d43f4f1f88983133
2016-10-21 12:40:38 -07:00
Connor O'Brien
cd0d29d4af Add android.hardware.boot_control@1.0 service.
Bug: 31864052
Change-Id: I982077d71a81c0bc8d081f0cc7e83180b97f2b87
Signed-off-by: Connor O'Brien <connoro@google.com>
2016-10-19 14:43:36 -07:00
Connor O'Brien
fe25fd88c8 Add boot_control HIDL default implementation
Create basic implementation that passes commands
through to the old HAL implementation.

Bug: 31864052
Test: Ran and compared output to old implementation
Change-Id: I01f4450dc3a1893e13b8fb325ea40cf9c98297be
Signed-off-by: Connor O'Brien <connoro@google.com>
2016-10-19 14:43:36 -07:00
Alex Deymo
6e0c0102ae boot_control: Define the boot_control HIDL interface.
Bug: 31864052
Merged-In: I9222b140ff51c4d3846b86b03719e2c8e9b7fe47
Change-Id: I9222b140ff51c4d3846b86b03719e2c8e9b7fe47
2016-10-19 14:43:14 -07:00