Commit graph

127 commits

Author SHA1 Message Date
Steven Moreland
dfd8287506 Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Merged-In: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
Change-Id: I170fa1c4fe39f8109b1670db58ef99bb11afc0be
2017-08-14 20:25:09 +00:00
Steven Moreland
6da35570df Updating all makefiles.
Bug: 64487114
Test: none
Change-Id: I8608c8f636c35f21e4246a805a9eff6d14124e0a
2017-08-10 23:43:46 +00:00
Tri Vo
2b2ba2fa83 Merge "VTS tests now static link to HAL def libs. #2" into oc-mr1-dev am: 2883486706
am: a6969cdd68

Change-Id: Iecd7cfd4e02aea837647e2f12446e7375744f004
2017-08-10 18:38:53 +00:00
Tri Vo
0c2ce357b1 VTS tests now static link to HAL def libs. #2
And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: crop out all non-affected tests from vts-hal-hidl.xml and run
vts-tradefed run commandAndExit vts-hal-hidl --skip-all-system-status-check 
--skip-preconditions
2 failures, same as without this change:
GatekeeperHidlTest.DeleteAllUsersTest
GatekeeperHidlTest.DeleteUserTest

Change-Id: I8f6995e9536a9aefe283ee3effec9f5a7f03b620
2017-08-10 17:44:57 +00:00
Justin Yun
723c2dbd43 Update make file for vndk enabled. am: 608d773ef8
am: d66371512c

Change-Id: I35b778c39c2349346278deb6dea56b8cd3701f7d
2017-08-05 02:17:38 +00:00
Justin Yun
608d773ef8 Update make file for vndk enabled.
Update the Android.bp generated with hidl-gen.

Test: build with and without BOARD_VNDK_VERSION=current
Bug: 63866913
Change-Id: I1a9db1df49e0f13c5790da2b118ae9ec63ba34a7
2017-08-04 14:12:23 +09:00
Steven Moreland
6ae7aad171 Update makefiles (frameworks.jar).
Test: links at runtime and buildtime
Bug: 35771640
Change-Id: Ic7a71653d659115205e5bdbb782f73b774af0b29
2017-08-03 23:02:46 +00:00
Tri Vo
f5d136c231 Update Android.bp HIDL makefiles
Allow HAL definition libs to be static.

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1483d572bea6799717d1614fb7d52fe225e31104
2017-08-03 00:30:01 +00:00
Steven Moreland
f203167814 Update makefiles. (2/2)
am: 76cfb84140

Change-Id: I24d21438a5b2f447d2160929c6ff6e17b2b66820
2017-05-22 17:15:20 +00:00
Steven Moreland
76cfb84140 Update makefiles. (2/2)
Adds default configuration for all hals.

Bug: 38415912
Test: pass
Change-Id: Idd1f3a2b7b16ad956d31784a513e93a066cdd02e
2017-05-19 15:54:03 -07:00
Steven Moreland
a32ebce372 Update makefiles for c++-sources and c++-headers. (2/2)
am: bc71124120

Change-Id: Icf36068a4d863a8520854c7a83e51f960c188e12
2017-05-11 00:48:55 +00:00
Steven Moreland
bc71124120 Update makefiles for c++-sources and c++-headers. (2/2)
Test: pass
Bug: 38174080
Change-Id: Icad451f9f9ad5f46412356a4171a8a1222f8e545
2017-05-09 19:58:43 -07:00
Steven Moreland
5c63b11f76 Remove redundant dependencies
android.hidl.base@1.0 and android.hidl.manager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Merged-In: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
Change-Id: I08aaad80f7e2fc262aa3a8b66fe932e8133a928d
2017-05-02 15:29:30 -07:00
Andreas Huber
6fa374ad30 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:23:46 -07:00
Steven Moreland
3b36a83a2e Update makefiles (2/2).
Test: pass
Change-Id: Ic7e6289c7b69785491708ce0acbb657f4c704229
2017-04-11 09:58:03 -07:00
Steven Moreland
4e7a307730 Fix transitive includes.
Files relying on transitive include of utils/Log.h (and things that it
includes) from MQDescriptor.h

Test: pass
Merged-In: Iff316b21bef556bb026378b7f89e97ded3febef4
Change-Id: Iff316b21bef556bb026378b7f89e97ded3febef4
2017-04-06 22:04:05 +00:00
Andreas Huber
40d3a9bd8c Convert all comments into "doxygen-ready" comments.
Bug: 36453077
Test: mma
Change-Id: I0b1f77dfae5d2258969e33d85ecf45401ffbdfaa
2017-03-29 08:53:58 -07:00
Steven Moreland
561b602a99 Update makefiles for hwtypes.h
Test: pass
Change-Id: I8e17eb8fec5d2f04c526476a866c8dd54ccb556c
2017-03-28 15:18:20 +00:00
Connor O'Brien
a20c517278 Merge "memtrack: eliminate dependency on surfaceflinger in VTS test" 2017-03-11 00:24:46 +00:00
Yuexi Ma
ed2bb4e8f8 Change vts target base test class name
Test: make vts succeed, vts kernel tests and nfc hal tests passed
Change-Id: I95f10ad7a66f261c9030357edd411fe6d94150e8
2017-03-10 21:14:48 +00:00
Steven Moreland
48c52249e4 hidl_default to all targets.
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: pass
Bug: 35840847
Change-Id: If10c464d2f000b85c8d698fe11a4f3fc4cfad282
2017-03-08 19:31:53 -08:00
Connor O'Brien
7d39766157 memtrack: eliminate dependency on surfaceflinger in VTS test
VTS tests need to be able to run without the framework or native
servers. Call getMemory() on the test process instead of on
surfaceflinger to facilitate this.

Bug: 35945712
Test: Test passes on marlin and bullhead.
Change-Id: Ie847da708a95360ed5f2b444973e45b091e912a0
Signed-off-by: Connor O'Brien <connoro@google.com>
2017-03-07 12:16:00 -08:00
Yuexi Ma
50d7e27b3c change all vts hidl tests to use VtsHalHidlTargetBaseTest (internal master)
Bug: 33385836
Test: mma
Change-Id: Ide3ebc4a9db76257f33bcfb0c1f13d2ee33eeaa8
2017-02-28 22:27:28 +00:00
Steven Moreland
7e73d5b908 Remove viral dependency on libhwbinder. (2/2)
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

Note, automotive has some actual dependencies on libhwbinder, filed
b/35758626 for this.

Test: everything links
Test: (sanity) booted marlin on internal master with these changes
Bug: 35710429
Change-Id: I6d0726c8130d00684b978efbdd48e3ae396f12e5
2017-02-24 12:18:01 -08:00
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
a0da1a1c3d Move hidl shims to the vendor partition. (2/2)
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: I2e2af5af39264cf290259755bb9b2eb9827a21f5
2017-02-13 15:03:41 -08:00
Tri Vo
85120c9490 Update makefiles to use filgroup syntax.
Test: mmma hardware/interfaces
Change-Id: I9f4457c78b7820c242d46359f0debe05d1b3e482
2017-02-10 12:45:19 -08:00
Andreas Huber
d38f147c35 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 17:20:45 -08:00
Tri Vo
ce608bec74 Migrate driver/profiler to test/vts-testcase/hal.
Bug: 34893894
Test: mmma hardware/interfaces

Change-Id: Ic72716577a5f93700c5056986aff55a76b170b5d
2017-02-07 19:13:28 -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
e9b43bbe2d Update Andriod.bp for hals.
* Add driver/profiler build rule for all hals.

Test: mma
Change-Id: I98325f7af14fec7dd1bb64b1668de8c7c20ace92
2017-02-03 10:03:01 -08:00
TreeHugger Robot
0e9b1d9f1f Merge "Fix HalGatekeeperHidlTargetBasicProfilingTest." 2017-01-26 07:31:39 +00:00
Zhuoyao Zhang
42a4cdf70c Fix HalGatekeeperHidlTargetBasicProfilingTest.
* Similar fix for HalMemtrackHidlTargetProfilingTest

Test: make vts.
Change-Id: I999d18c53e321921f4bc1a4babe34520cc496321
2017-01-25 21:26:53 -08:00
Chris Phoenix
5985dedba2 memtrack 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: Ide36b5470a393b5ed0f60fd37661dd50d0db817b
2017-01-25 11:24:28 -08:00
Connor O'Brien
56dfb756b8 Fix failure to load memtrack HAL implementation
Since some implementations of the libhardware memtrack HAL do not
implement an open() method, the HIDL implementation should not rely
on that method being available.

Test: Memtrack VTS tests pass
Bug: 31180823
Bug: 34103653
Change-Id: Ia0dda5e027894009bdcf12cd5c2e9eb635aca87e
Signed-off-by: Connor O'Brien <connoro@google.com>
2017-01-24 11:32:56 -08:00
Stephen Hines
b45857ebc5 Fix some ordered comparisons with zero for pointers.
Bug: http://b/31532493

The latest clang will trigger an error diagnostic "ordered comparison
between pointer and zero ..." when you do something like "p > 0". This
change replaces the ordered comparisons with proper checks instead.

Test: Validated with latest toolchain.
Change-Id: I4a127fe2551688c8176bdd31210cf7f2f40baeba
2017-01-23 17:26:30 -08:00
Steven Moreland
66816de87f Remove useless Android.mk files.
Test: none
Change-Id: I99f4d3e5b943742009e366b13bee2c32e38a3fba
2017-01-18 11:49:08 -08: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
TreeHugger Robot
2cfe8fcb2b Merge "liblog: use log/log.h when utilizing ALOG macros" 2017-01-12 18:58:25 +00:00
Ryan Campbell
f276d1923e Remove coverage from test configurations.
Remove converage from test configs or entire config if not used
to define other test params. Tested each one individually to ensure
coverage still works.

Test: run vts -m (each test affected)
Change-Id: Ic1495a38ae9d1b32e851bc646f9c8e778eee2df1
2017-01-11 16:20:44 -08:00
Mark Salyzyn
3ff5260601 liblog: use log/log.h when utilizing ALOG macros
Test: compile
Bug: 30465923
Change-Id: I67046a75be057e7905570748a1ed6bfd03c0e1c8
2017-01-11 15:47:40 -08: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
a18049ad13 Bp/nFoo -> Bp/nHwFoo.
Test: mma
Bug: 33554989
Change-Id: I4b3f852d20fdfc49f2da671dd3c12d618ffb4140
2017-01-11 13:14:59 -08:00
Ryan Campbell
f4e11cc1bb Create memtrack profiling test.
Create HalMemtrackHidlTargetProfilingTest.

Test: make vts, run vts -m HalMemtrackHidlTargetProfilingTest
Bug: 34177207
Change-Id: I61a432d2fbb16e512b40db5bc629753b76897da8
2017-01-11 09:11:02 -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
cd0e5c6d22 Memtrack HAL Target-side test
Test: make vts; vts-tradefed run -m HalMemtrackHidlTargetTest
Bug: 32021949
Change-Id: Iee5656bf71c4c6283fbbb66cf02a7f14b33e9caf
Signed-off-by: Connor O'Brien <connoro@google.com>
2016-12-21 17:11:15 -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
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
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
f9d303435d Update to use the correct logging library.
Test: mma compiles
Change-Id: Idb33dea5faaf1a5e54719c2a5a683d2d47e9b8e8
2016-12-01 17:47:02 -08:00
Steven Moreland
d6e4f03acf 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.

Change-Id: I4aa89a39907024aa9525df71ff3715979f431357
Similar commit: https://android-review.googlesource.com/#/c/305996/
Test: pass
2016-11-29 15:05:31 -08:00
Steven Moreland
bbff14d4bb Merge "Update makefiles for logging." 2016-11-22 17:25:36 +00:00
Keun Soo Yim
8a36c0b01c move VTS HIDL HAL tests to the corresponding interface directories
Bug: 32783461
Test: vts-tradefed; run vts-hal-hidl
Change-Id: Iead44eaf65dcd4de2286267467c4a4a322a88205
2016-11-21 19:16:12 -08:00
Steven Moreland
f8d68ec855 Update makefiles for logging.
Bug: 32943424
Test: pass
Change-Id: Ic88ce6adf04e0e36db53e4cc06ac2ec5a90c011c
2016-11-21 16:28:54 -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
eb8a796edd VTS driver files for memtrack HAL.
Test: manual
Change-Id: If2e7c5a60248b345b499c7d32ae68b23be7f0923
2016-11-11 08:09:20 -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
Ruchi Kandoi
67d5cc47c9 memtrack: Add init_rc file for the android.hardware.memtrack@1.0-service
Test: boots and starts service
Bug: 31180823
Change-Id: Ibbf34025b6acbd91fd52c84f784dd9a5bd4cb966
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-11-03 13:21:06 -07:00
Steven Moreland
fcd74ebcdc Running update makefiles.
https://android-review.googlesource.com/#/c/298160/

Test: pass
Change-Id: I14fcde2d3aacc8f8cd9221f2d69e2feae9ae1226
2016-11-02 10:24:33 -07:00
Steven Moreland
69727778a7 Stop all these merge conflicts.
Test: mma -j64
Change-Id: I319198af32adf1fef180c5c2c22ba4b360fa7609
2016-10-26 12:04:37 +02:00
Steven Moreland
22566b8913 Use defaultPassthroughServiceImplementation.
Bug: 32279541
Bug: 32282345

Test: mma
Change-Id: Ic0222963c99bea41de7637e5f20c19d7c541cb97
2016-10-21 19:33:06 +00:00
TreeHugger Robot
00dfbca81f Merge "memtrack: fix typo" 2016-10-20 22:13:51 +00:00
Ruchi Kandoi
d3b608b52d memtrack: fix typo
Test: compiles
Bug: 32238758
Change-Id: I5040c1e24812b88e73377d02ce7d923de6bc7e3c
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-10-20 12:38:03 -07:00
Ruchi Kandoi
923c293ae0 Revert "memtrack: Add init_rc file for the android.hardware.memtrack@1.0-service"
This reverts commit 982fec747d.

Change-Id: If9f1a1820dd28950dd06f77f07e3e7364c714fc0
2016-10-14 17:54:30 +00:00
Ruchi Kandoi
982fec747d memtrack: Add init_rc file for the android.hardware.memtrack@1.0-service
Test: boots and starts service
Bug: 31180823
Change-Id: Ibc94a2eb1be1d7071c2c481f6abc13a0f8c6401e
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-10-13 00:55:07 +00:00
Ruchi Kandoi
9d8551ab6d memtrack: Add androis.hardware.memtrack@1.0-service
Bug: 31180823
Change-Id: I712d5b041fd13e85f57dc400cc0c48c9d9ee2f36
Signed-off-by: Ruchi Kandoi<kandoiruchi@google.com>
2016-10-10 19:16:54 -07:00
Ruchi Kandoi
97b2f25088 memtrack: Add android.hardware.memtrack@1.0-impl
Bug: 31180823
Change-Id: I5afa790a94eebf8f1755eb51ff8cfeb28b836543
Signed-off-by: Ruchi Kandoi<kandoiruchi@google.com>
2016-10-10 19:16:54 -07:00
Ruchi Kandoi
02cfc4e420 memtrack: Add memtrack interface 1.0
Bug: 31180823
Change-Id: I703a3ac8746179421e70e301ba7549f05c81f9e3
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-10-10 19:16:40 -07:00