Commit graph

87 commits

Author SHA1 Message Date
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
e4d318948a Update makefiles.
Adds default configuration to all hals.

Test: pass
Merged-In: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
Change-Id: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
2017-05-19 15:53:53 -07: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
Miao Wang
fdd834565c [RenderScript] Use OVERRIDE_RS_DRIVER string in the default
implementation.

Bug: 37035983
Test: mm
Test: manually push to sailfish & angler, verify GPU driver successfully
load, and tests are passing.

Change-Id: Ic55c74228e7eae599702365c513009aa3454656b
2017-05-16 16:45:57 -07:00
Steven Moreland
01329bc539 Update makefiles for c++-sources and c++-headers. am: cb360c60d8 am: 4bd4e7fb3b am: 127b116fe5
am: 8e89a43590

Change-Id: I35950a57e220cdbe7672d5e814230fb73c154fac
2017-05-10 03:13:43 +00:00
Steven Moreland
8716f3063e Update makefiles for c++-sources and c++-headers.
Test: pass
Bug: 38174080
Merged-In: I683455736eed35e6ced24e2763c2bdb5fb6c9601
Change-Id: I683455736eed35e6ced24e2763c2bdb5fb6c9601
2017-05-09 19:58:45 -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
Mathias Agopian
d8931ac871 fix circular dependency libnativewindow <-> libui
Bug: 37647680, 37648355
Test: compile, manual
Change-Id: I2fdec8e86f6729aadd572a250b9d55d77f0d4eef
2017-05-09 16:40:51 -07: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
TreeHugger Robot
be31e7c571 Merge "Added missing RenderScript HIDL API call to VTS test." into oc-dev 2017-04-14 15:45:43 +00:00
Michael Butler
3f986a00cd Added missing RenderScript HIDL API call to VTS test.
ScriptGroupSetInput was never called, so it was added to the
ScriptGroupTest. After this CL gets merged, all RenderScript HIDL API
calls will be tested.

Bug: 35915961

Test: mm on oc-dev, runs and passes on oc-dev
Change-Id: I9153895ac55be757eef59e81837a9518fa9e85ab
2017-04-13 17:47:58 -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
Andreas Huber
6733baff6c 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:16:27 -07:00
Michael Butler
06a7d395b8 Connecting to BufferQueue before setting surface.
Bug: 37172220

Test: mma, runs on sailfish
Change-Id: I2ed8e55ed9e6149245ca0d605441eff74eac45e2
2017-04-12 19:05:20 -07:00
Steven Moreland
17f0c0dde7 Merge changes from topic 'hidl-vendor-available' into oc-dev
* changes:
  Update makefiles (2/2).
  Update makefiles.
2017-04-12 22:13:58 +00:00
Steven Moreland
0dd5ba23fb Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 16:41:07 -07:00
Steven Moreland
b2799c370f Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 09:57:40 -07:00
Michael Butler
7c1ef5b741 Added protections for RenderScript VTS tests.
Changed many EXPECT_NE to ASSERT_NE for objects that are required later
in the test which would potentially cause a segfault. Additionally updated
a few descriptions.

Bug: 35915961

Test: mm and run on angler
Change-Id: I17c85b2c774688d82b59be2f0b383447e03349e0
(cherry picked from commit b2039ad764)
2017-04-05 16:07:33 -07:00
Michael Butler
b2039ad764 Added protections for RenderScript VTS tests.
Changed many EXPECT_NE to ASSERT_NE for objects that are required later
in the test which would potentially cause a segfault. Additionally updated
a few descriptions.

Bug: 35915961

Test: mm and run on angler
Change-Id: I17c85b2c774688d82b59be2f0b383447e03349e0
2017-03-30 17:20:12 -07:00
Michael Butler
da8c2c1e2a RenderScript VTS cleanup and fixes
This CL fixes the remaining VTS test cases for the RenderScript
vts-hidl-hal test and cleans up and improves the working test cases.
The goal is to have at least one passing test case per HIDL HAL entry.

Bug: 35915961

Test: mm and run on angler
Change-Id: I4b6e25831ce7d2abb3148c39eb48bde10ed04646
(cherry picked from commit 54fa8d4285)
2017-03-29 17:42:43 -07:00
Michael Butler
1791d9bfab Fix RS HIDL server, pass data by bytes instead of by elements.
Our current stack:
  API->API_TO_HAL_translator->HAL
          ->HAL_TO_Implementation_translator->Implementation

  For most APIs:
  - API passes objectCount.
  - HAL expects objectCount.
  - Implementation expects objectCount.

  For APIs like ScriptGroupCreate:
  - API passes byteCount. And unfortunately, these APIs are part of
    NDK, we could not make them also passing objectCount like others.
  - HAL expects objectCount.
  - Implementation expects byteCount.

  So that both API_TO_HAL_translator and
  HAL_TO_Implementation_translator should correctly convert input
  objectCount/byteCount to byteCount/objectCount.

  This CL only fixes the HAL_TO_Implementation_translator part,
  whereas aosp/356395 fixes the API_TO_HAL_translator part. Both
  parts were mistakenly using byteCount as objectCount, causing
  potential out-of-bound access.

Bug: 36404879
Test: mm on angler
Change-Id: I28541a8926aeafece40e2a3f664bda67e26a34a2
(cherry picked from commit fd14e27b89)
2017-03-29 17:42:33 -07:00
Michael Butler
7b36175068 Merge "RenderScript VTS cleanup and fixes" 2017-03-30 00:40:00 +00:00
Michael Butler
f2b214dc8d Merge "Fix RS HIDL server, pass data by bytes instead of by elements." 2017-03-30 00:39:22 +00:00
Michael Butler
fd14e27b89 Fix RS HIDL server, pass data by bytes instead of by elements.
Our current stack:
  API->API_TO_HAL_translator->HAL
          ->HAL_TO_Implementation_translator->Implementation

  For most APIs:
  - API passes objectCount.
  - HAL expects objectCount.
  - Implementation expects objectCount.

  For APIs like ScriptGroupCreate:
  - API passes byteCount. And unfortunately, these APIs are part of
    NDK, we could not make them also passing objectCount like others.
  - HAL expects objectCount.
  - Implementation expects byteCount.

  So that both API_TO_HAL_translator and
  HAL_TO_Implementation_translator should correctly convert input
  objectCount/byteCount to byteCount/objectCount.

  This CL only fixes the HAL_TO_Implementation_translator part,
  whereas aosp/356395 fixes the API_TO_HAL_translator part. Both
  parts were mistakenly using byteCount as objectCount, causing
  potential out-of-bound access.

Bug: 36404879
Test: mm on angler
Change-Id: I28541a8926aeafece40e2a3f664bda67e26a34a2
2017-03-29 17:09:57 -07:00
Andreas Huber
675ae49ab1 Convert all comments into "doxygen-ready" comments.
Bug: 36453077
Test: make
Change-Id: Ic77394d4d2e1ccedba3a28230d870c5d6108bd40
2017-03-28 16:14:43 -07:00
Andreas Huber
3e4acb8b3a Convert all comments into "doxygen-ready" comments.
Bug: 36453077
Test: make
Change-Id: Ic77394d4d2e1ccedba3a28230d870c5d6108bd40
2017-03-28 16:10:42 -07:00
Michael Butler
54fa8d4285 RenderScript VTS cleanup and fixes
This CL fixes the remaining VTS test cases for the RenderScript
vts-hidl-hal test and cleans up and improves the working test cases.
The goal is to have at least one passing test case per HIDL HAL entry.

Bug: 35915961

Test: mm and run on angler
Change-Id: I4b6e25831ce7d2abb3148c39eb48bde10ed04646
2017-03-27 14:42:19 -07:00
Steven Moreland
e90c31f125 Update makefiles.
Test: pass
Change-Id: I925baccbe51a32b7b7f3f66cf2918d017ee6b039
2017-03-24 21:50:45 -07:00
Michael Butler
2d4d6d97c1 RenderScript VTS implementation
Contains the gtest for the vts-hidl-hal test. The goal is to have
1 test case for each HIDL HAL entry by 3/15/17. There are still a few
tests with bugs, so they have been commented out and will be fixed by
3/17/17.

Bug: 34396220
Bug: 35915961

Test: mm and run on angler
Change-Id: I20462432a42e3aa307b98e728f30f20f5aa1e921
2017-03-16 14:24:14 -07: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
96d2e3e9df renderscript: fix unused variable warning
Test: pass
Change-Id: I1f87c4430a908a41f7fd117de0d669420d508a69
2017-03-08 16:22:00 -08: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
Tri Vo
69fa1faddd Update makefiles.
Test: mmma hardware/interfaces
Change-Id: I501524fa3fbbaed9b71e5b9c3bbc8aa3c8c25896
2017-02-22 10:46:47 -08:00
Stephen Hines
746f3cd894 Fix mips-related build breakage.
Bug: http://b/34396220
Test: Builds successfully.

MIPS targets predefine _mips to 1, which will conflict with the _mips
variable name that was being used in the HAL here. Rename it to _amips
instead, so that it won't conflict.

Merged-In: Id13f34b740959852dff600259e3405eb72d0983a
Change-Id: Id13f34b740959852dff600259e3405eb72d0983a
2017-02-21 11:56:20 -08:00
Miao Wang
b78b2f4ee6 RenderScript HIDL HAL definition and server-side implementation.
Contains the definition and implementation of the HAL.

Bug: 34396220

Test: mm, all cts tests pass on bullhead and sailfish
Merged-In: Ic560efef34f647f441c32ba01ca29d83a3d98b69
Change-Id: Ic560efef34f647f441c32ba01ca29d83a3d98b69
2017-02-21 11:55:32 -08:00