Connor O'Brien
ee011948b7
Merge "Add statically linked boot HAL impl in recovery"
...
am: e14e593d8f
Change-Id: I03d46c8b8b17a64cb794449e6c7fa2a2f7b7b7e2
2018-10-22 16:01:38 -07:00
Chih-hung Hsieh
48a2ebbe1f
Merge "Fix implicit-fallthrough warnings."
...
am: 1ea726b6d7
Change-Id: I8c7c8605b70e74374ae010b2c7e46197641b1800
2018-10-22 15:56:08 -07:00
Chih-hung Hsieh
7182d9c970
[automerger skipped] Merge "Fix implicit-fallthrough warnings. DO NOT MERGE."
...
am: 593ede93f0 -s ours
Change-Id: Ie5c44dd6a6559f82085d8e10e19d59e103d6b8d1
2018-10-22 15:48:03 -07:00
Connor O'Brien
e14e593d8f
Merge "Add statically linked boot HAL impl in recovery"
2018-10-22 21:45:29 +00:00
Chih-hung Hsieh
1ea726b6d7
Merge "Fix implicit-fallthrough warnings."
2018-10-22 20:36:53 +00:00
Chih-hung Hsieh
593ede93f0
Merge "Fix implicit-fallthrough warnings. DO NOT MERGE."
2018-10-22 20:35:52 +00:00
Chih-hung Hsieh
d28cfb6188
Merge "Allow implicit-fallthrough warnings locally."
...
am: e6d3e9ff5d
Change-Id: I240c248a032a80b3edbc9a8987e4cde02d4b2fa3
2018-10-22 12:46:58 -07:00
Keun Soo YIM
a3c69bd9e4
Merge "run vts build rule updater when hal make files are updated"
...
am: adad44aa24
Change-Id: I1cf86c2c5a0dae5a18612ee95c8e473beb09479d
2018-10-22 12:45:54 -07:00
Chih-hung Hsieh
e6d3e9ff5d
Merge "Allow implicit-fallthrough warnings locally."
2018-10-22 19:33:58 +00:00
Treehugger Robot
adad44aa24
Merge "run vts build rule updater when hal make files are updated"
2018-10-22 19:30:41 +00:00
Chih-Hung Hsieh
55e2a1adf0
[automerger skipped] Allow implicit-fallthrough warnings locally. DO NOT MERGE.
...
am: ad8557bde8 -s ours
Change-Id: I5899b7c537ab383bab63c039baead2787be269ef
2018-10-22 11:17:58 -07:00
Przemyslaw Szczepaniak
e0cfca0d01
Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp2"
...
am: 1191f516fe
Change-Id: I33dca6e35522eaac2acbe44ea6adea61f0998822
2018-10-22 11:01:23 -07:00
Chih-Hung Hsieh
ad8557bde8
Allow implicit-fallthrough warnings locally. DO NOT MERGE.
...
It will be a global error by default.
This change is not needed for goog/master.
Test: make checkbuild
Bug: 112564944
Change-Id: Ie90ad1f59f6922da6cecd4a0ac136b1e42b6d482
Exempt-From-Owner-Approval: do not block on new warnings
2018-10-22 09:44:49 -07:00
Chih-Hung Hsieh
9e1793b891
Allow implicit-fallthrough warnings locally.
...
It will be a global error by default.
Test: make checkbuild
Bug: 112564944
Change-Id: I3e914835fcb4ee97662ab51136f143e665d0ba01
Exempt-From-Owner-Approval: do not block on new warnings
2018-10-22 09:42:57 -07:00
Przemyslaw Szczepaniak
1191f516fe
Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp2"
...
* changes:
Adds TENSOR_FLOAT16 operand type.
Add TENSOR_QUANT16_ASYMM to operand types
Add new OperandType BOOL.
Add HAL entry to allow querying device impl version.
2018-10-22 16:03:04 +00:00
Chih-Hung Hsieh
dc607bc28e
Merge "Fix implicit-fallthrough warnings."
...
am: ad9708f570
Change-Id: I3847f9f6263f9e80e0e78dd7c30b8dec2f396456
2018-10-20 01:12:28 -07:00
Treehugger Robot
ad9708f570
Merge "Fix implicit-fallthrough warnings."
2018-10-20 04:45:15 +00:00
Chih-Hung Hsieh
c5def0beeb
Fix implicit-fallthrough warnings. DO NOT MERGE.
...
These changes are not needed in goog/master.
Test: make checkbuild
Bug: 112564944
Change-Id: I4f1727d9b33108d34d314787460aa1d2298ae5b2
2018-10-19 15:29:11 -07:00
Bill Yi
bd3170f63e
Merge pi-dr1-dev to aosp-master
...
am: 5989a2f631
Change-Id: I17b25b401ebabf42f796474eb4572247fc1d255e
2018-10-19 14:55:10 -07:00
Chih-Hung Hsieh
eb1be49ae1
Fix implicit-fallthrough warnings.
...
Test: make checkbuild
Bug: 112564944
Change-Id: Ib93559a5c1512861f9746cd28d8b19073ce92aa8
2018-10-19 14:26:01 -07:00
Chih-Hung Hsieh
63f4fe65b2
Fix implicit-fallthrough warnings.
...
Test: make checkbuild
Bug: 112564944
Change-Id: Ifc8b7444b95d667b0d185c7d45b3f15278d4af2f
2018-10-19 14:24:58 -07:00
Keun Soo YIM
7b46731b0e
run vts build rule updater when hal make files are updated
...
Test: ./update-makefiles.sh
Bug: 117826861
Change-Id: I7c7b22ecff1a373cd905fedd96bdaa12e1a558f0
2018-10-19 12:34:16 -07:00
Connor O'Brien
3847ffcc0e
Add statically linked boot HAL impl in recovery
...
The default Treble boot HAL implementation currently can only work in
recovery on devices that specifically build their libhardware
implementation as a shared library for recovery.
This CL adds the option to statically link the libhardware
implementation in recovery instead of finding it using
hw_get_module(). This new approach allows devices that define
PRODUCT_STATIC_BOOT_CONTROL_HAL to begin using the Treble HAL in
recovery without requiring device-specific changes.
A previous version of this CL broke some device builds by omitting
libbase.recovery from LOCAL_SHARED_LIBRARIES. This version fixes that
issue.
Test: adb sideload succeeds
Bug: 78598708
Change-Id: I1c2ef7fa59575ac7975129f7544f741459b8540e
Signed-off-by: Connor O'Brien <connoro@google.com >
2018-10-19 12:21:13 -07:00
Bill Yi
5989a2f631
Merge pi-dr1-dev to aosp-master
...
Change-Id: Ida0bc98526f4fc7a1c20f5bbd3210b2f6156d459
2018-10-19 12:20:42 -07:00
Chia-I Wu
1dbb1b6530
graphics: composer@2.2 does not require mapper@2.1 am: 0eafa742c6
...
am: 7d49f30d3e
Change-Id: I9208930c4a6653f5bf780c1be25c8738b85f9f53
2018-10-19 12:06:51 -07:00
Chia-I Wu
7d49f30d3e
graphics: composer@2.2 does not require mapper@2.1
...
am: 0eafa742c6
Change-Id: I6f045113a3c0218a4b8f2c8e794892a21c1fc306
2018-10-19 11:48:36 -07:00
Michael K. Sanders
5dd841253d
Adds TENSOR_FLOAT16 operand type.
...
Bug: 113563458
Test: VtsHalNeuralnetworksV1_2TargetTest --hal_service_instance=android.hardware.neuralnetworks@1.2::IDevice/sample-all
Change-Id: If12ceff428e1b1a90ef99b7353f0df60d4ef8010
Merged-In: If12ceff428e1b1a90ef99b7353f0df60d4ef8010
(cherry picked from commit 19d63453d4 )
2018-10-19 09:29:09 +01:00
Lev Proleev
68c8c17467
Add TENSOR_QUANT16_ASYMM to operand types
...
Add new OperandType::TENSOR_QUANT16_ASYMM.
Add VTS validation for the new type.
Bug: 113561892
Test: NeuralNetworksTest_static
Test: VtsHalNeuralnetworksV1_0TargetTest
Test: VtsHalNeuralnetworksV1_1TargetTest
Test: VtsHalNeuralnetworksV1_2TargetTest
Change-Id: I4f9ed6a33d5d3ec227e9f335df71954c73edf344
Merged-In: I4f9ed6a33d5d3ec227e9f335df71954c73edf344
(cherry picked from commit 5d7c99527e )
2018-10-19 09:29:09 +01:00
Lev Proleev
08662c6f66
Add new OperandType BOOL.
...
- Add new enum OperandType::BOOL.
- Add v1.2 Operand, OperandType.
- Add VTS validation tests for BOOL.
Bug: 117423393
Test: NeuralNetworksTest_static
Test: VtsHalNeuralnetworksV1_2TargetTest
Change-Id: I420e2afeb09b881a499eee6b138c1f26e9874f5a
Merged-In: I420e2afeb09b881a499eee6b138c1f26e9874f5a
(cherry picked from commit abad9eac44 )
2018-10-19 09:29:09 +01:00
Miao Wang
618028b888
Add HAL entry to allow querying device impl version.
...
Bug: 111425781
Bug: 112661050
Test: mm
Test: NeuralNetworksTest_static
Change-Id: I32527fa09e45459bc9759f5b679646073cf96785
Merged-In: I32527fa09e45459bc9759f5b679646073cf96785
(cherry picked from commit 44b029b181 )
2018-10-19 09:29:09 +01:00
Chih-hung Hsieh
9232ca3782
Merge "Fix implicit fallthrough warnings."
...
am: 591171a659
Change-Id: I6fc2f638f3e7559a1ec2face4c8ec2dab51506be
2018-10-18 23:27:06 -07:00
Chih-hung Hsieh
591171a659
Merge "Fix implicit fallthrough warnings."
2018-10-18 18:33:21 +00:00
Chia-I Wu
0eafa742c6
graphics: composer@2.2 does not require mapper@2.1
...
Fix composer@2.2 VTS to not require mapper@2.1. We will need a
better test infra before things get too complex.
Bug: 112248843
Test: manual
Change-Id: Ia71a102742fd26f14e8edf3f43f3351786350ccd
Merged-In: Ia71a102742fd26f14e8edf3f43f3351786350ccd
2018-10-18 11:22:09 -07:00
Steven Moreland
70d20a497e
Merge "Update makefiles."
...
am: c202d17fa6
Change-Id: I91e945ede9f4e46867aac20303063b309576ed9d
2018-10-17 13:58:30 -07:00
Treehugger Robot
c202d17fa6
Merge "Update makefiles."
2018-10-17 19:48:41 +00:00
Yifan Hong
2507ba27cb
removed unused line.
...
am: ab6de249ec
Change-Id: I8ad61ab708eed3e86876e673a376ba0fa29b2f9e
2018-10-16 19:51:38 -07:00
Steven Moreland
1c15915098
Update makefiles.
...
Some of these were out of date.
Bug: N/A
Test: N/A
Change-Id: I25a2706b95e199f5728cda5a5e4e2b23c60a8d40
2018-10-16 16:36:45 -07:00
Chih-Hung Hsieh
5daaea7cdc
Fix implicit fallthrough warnings.
...
Test: make checkbuild
Bug: 112564944
Change-Id: Ib2b337146de86e4abe40ded5932196f1b8b698c6
2018-10-16 14:22:12 -07:00
Yifan Hong
ab6de249ec
removed unused line.
...
Test: builds
Change-Id: I6df9338de150e35147c191a551b1e5eb538db32e
2018-10-16 12:00:25 -07:00
Yifan Hong
9f897faa8b
Merge "compatibility matrices: move to soong"
...
am: 9cfddb6282
Change-Id: I3e88b69a9ed6f57c1b5d011349473b3c568bc74f
2018-10-16 10:29:18 -07:00
chenhg
86ec58ff52
Merge "Avoid segfaults if disconnect USB camera while preview."
...
am: 4dce57e459
Change-Id: I08b09d87cbaf4ed3c18ccbd5cd28b3de8fa4c8e4
2018-10-16 10:23:06 -07:00
Yifan Hong
9cfddb6282
Merge "compatibility matrices: move to soong"
2018-10-16 17:20:50 +00:00
Treehugger Robot
4dce57e459
Merge "Avoid segfaults if disconnect USB camera while preview."
2018-10-16 17:05:08 +00:00
Jack Yu
777d7abef3
Merge "Restored 'maxConnsTime' and 'maxConns' in data profile"
...
am: bcb0c1b49a
Change-Id: I376197118faadef4175ed97be87ed50b4573e919
2018-10-15 18:20:47 -07:00
Treehugger Robot
bcb0c1b49a
Merge "Restored 'maxConnsTime' and 'maxConns' in data profile"
2018-10-16 00:54:19 +00:00
Yifan Hong
0cd10dd03e
compatibility matrices: move to soong
...
* Kernel config requirements are built as
separate rules in kernel/configs. All kernel requirements
(including minlts and configs) are represented there.
* device framework compatibility matrix and final
framework compatibility matrix need special environment
variables, so they are not generic enough to be written
in the soong rule.
See compatibility_matrices/Android.bp for sample usages.
Test: builds and compare output before change
Change-Id: I53bf88362314f96487ca243c9292570b7931f24b
2018-10-15 15:42:11 -07:00
Chih-Hung Hsieh
80c5b8fc76
Fix implicit fallthrough warnings.
...
am: 40b77ef6b5
Change-Id: I0eee7ff35ef8943847d6966720a2c5477fc21fd0
2018-10-15 14:21:11 -07:00
Chih-Hung Hsieh
40b77ef6b5
Fix implicit fallthrough warnings.
...
Test: make checkbuild
Bug: 112564944
Change-Id: Iaaa0e2c325e860572d058ae27a7ad7dc00134564
2018-10-15 10:30:38 -07:00
Jack Yu
4b5371de99
Restored 'maxConnsTime' and 'maxConns' in data profile
...
These two fields are still needed for some carriers. Should
not be removed in 1.3. Reverted back to what we have in 1.0.
Test: Telephony sanity tests
Bug: 73659459
Change-Id: I33e7b9b0cb26b56fc3c0e011557657136cb38a6c
2018-10-15 09:55:12 -07:00
chenhg
06ced051d9
Avoid segfaults if disconnect USB camera while preview.
...
BUG: 117575807
Test: manual test by disconnect USB camera while preview.
Change-Id: Ia74b03e7f2a672efd9e9dfd651b5894529daeeee
2018-10-12 14:17:04 -07:00