summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-22Snap for 5681426 from 9f53eda37fe905211ce6546d32784e7f4d980614 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid-build-team Robot
Change-Id: I0682e76655255ea681531723bdda3c5478fcd454
2019-06-19Combine libhwbinder into libhidlbase.android10-devSteven Moreland
For memory. Bug: 134961554 Test: boot Change-Id: I18b61e8d3a3cb1fd30a8d04edfefaf93be5f0211
2019-06-15Snap for 5663820 from a46371d5b3ffd08808ae93ec420721345738ec65 to qt-releaseandroid-build-team Robot
Change-Id: I6c82353bd5e06c882599e53b57e5a0b32fa4e23b
2019-06-12Combine libhidlbase/libhidltransport into one lib.Steven Moreland
For performance/memory. HIDL transport split at this level will be de-emphasized moving forward as it is not necessary. Bug: 134961554 Test: librank Change-Id: I66183294232bdd0616a943d6cdd08254732ffb45
2019-06-06Snap for 5637134 from a80fddb7acb3c62efc1e5172dbf616188de6e133 to qt-releaseandroid-build-team Robot
Change-Id: I6db75a2a14b5e0c37f195d7cb1e974ae6b127859
2019-06-05Delete vestigial Status parcel read. am: 7fd5fbec0c am: 44311cb8c7 am: ↵Steven Moreland
e4372fbfa9 am: 17038a466d Change-Id: I7a039a464041f043ec7e4112418fc5835a99a09f
2019-06-05Delete vestigial Status parcel read. am: 7fd5fbec0c am: 44311cb8c7Steven Moreland
am: e4372fbfa9 Change-Id: I9a9396d92c856b30105aa3e44d13368f7a3d271d
2019-06-05Delete vestigial Status parcel read. am: 7fd5fbec0cSteven Moreland
am: 44311cb8c7 Change-Id: I39ebea4f195d34a09ba872004ee80327f34d38f4
2019-06-05Delete vestigial Status parcel read.Steven Moreland
am: 7fd5fbec0c Change-Id: I8db582a21a9f5fea0690eb56568cdd2296f21f54
2019-06-04Delete vestigial Status parcel read.Steven Moreland
libbinder Status has the exception type EX_HAS_REPLY_HEADER for fat Java-specific errors. This code jumps Parcel position to an arbitrary position in memory based on a value it reads from this parcel. Since this is unused in HIDL, removing entirely. Bug: 132650049 Test: HIDL's run_all_device_tests.sh Change-Id: Iac815f92c5da4ead283d3566892b5d4d209dab3b
2019-05-09Snap for 5546586 from 36d110f68b09ee84fb58c1cb0ff0e085ed7de4da to qt-releaseandroid-build-team Robot
Change-Id: I31b9660e3e5d679389e1d7da70c8507a123f9337
2019-05-08[automerger skipped] Zero-initialize hidl_vec data am: 6e8d69c766 am: ↵Steven Moreland
2f6751627d -s ours am: a6c2d037cf -s ours am: 8cb4782f80 -s ours am skip reason: change_id Ica6c55e7346b9e1ba91192472e2b229cb786802c with SHA1 7a3202296f is in history Change-Id: I5b8d12e4e850b95f4d392655e30a13046dc5259c
2019-05-08[automerger skipped] Zero-init HIDL core types (all) am: 0cea857b15 am: ↵Steven Moreland
083f08aacb -s ours am: f85b9ffa01 -s ours am: 0fd3996f03 -s ours am skip reason: change_id I3979232879bb437d17d3a6f6013b53b2951a2138 with SHA1 aa79ac59c8 is in history Change-Id: I1ea1bc6cba925966f18070f72d2a8a23cf3ff53e
2019-05-08[automerger skipped] Zero-initialize hidl_vec data am: 6e8d69c766 am: ↵Steven Moreland
2f6751627d -s ours am: a6c2d037cf -s ours am skip reason: change_id Ica6c55e7346b9e1ba91192472e2b229cb786802c with SHA1 7a3202296f is in history Change-Id: I66311c44654b58df133e55068e27bf317d2852e4
2019-05-08[automerger skipped] Zero-init HIDL core types (all) am: 0cea857b15 am: ↵Steven Moreland
083f08aacb -s ours am: f85b9ffa01 -s ours am skip reason: change_id I3979232879bb437d17d3a6f6013b53b2951a2138 with SHA1 aa79ac59c8 is in history Change-Id: Icc1b522966758f123920fec067520655fe097cc4
2019-05-08[automerger skipped] Zero-initialize hidl_vec data am: 6e8d69c766Steven Moreland
am: 2f6751627d -s ours am skip reason: change_id Ica6c55e7346b9e1ba91192472e2b229cb786802c with SHA1 7a3202296f is in history Change-Id: I8942d1a5397925d3c40e291f89c58627e152c953
2019-05-08[automerger skipped] Zero-init HIDL core types (all) am: 0cea857b15Steven Moreland
am: 083f08aacb -s ours am skip reason: change_id I3979232879bb437d17d3a6f6013b53b2951a2138 with SHA1 38db64566e is in history Change-Id: Ia1306f4217cf26f18f293af52725a155da72db4b
2019-05-08[automerger skipped] Zero-initialize hidl_vec data am: 7a3202296f -s oursSteven Moreland
am: 8003450f57 -s ours am skip reason: change_id Ica6c55e7346b9e1ba91192472e2b229cb786802c with SHA1 03b0bf2f20 is in history Change-Id: I877295e5c26c9e3c253acf6756c3ff98d2cb928f
2019-05-08[automerger skipped] Zero-init HIDL core types (all) am: 38db64566e -s oursSteven Moreland
am: 6015a706d9 -s ours am skip reason: change_id I3979232879bb437d17d3a6f6013b53b2951a2138 with SHA1 aa79ac59c8 is in history Change-Id: I92a044ec6a6ecc3bc3ac264280e0cb4e8a1b006c
2019-05-08Zero-initialize hidl_vec dataSteven Moreland
am: 6e8d69c766 Change-Id: I7c37dc2ee6e10eb0b5214b253467656580c12862
2019-05-08Zero-init HIDL core types (all)Steven Moreland
am: 0cea857b15 Change-Id: I61f9499a4912b759287034708b318877838d2858
2019-05-08[automerger skipped] Zero-initialize hidl_vec dataSteven Moreland
am: 7a3202296f -s ours am skip reason: change_id Ica6c55e7346b9e1ba91192472e2b229cb786802c with SHA1 03b0bf2f20 is in history Change-Id: Ic0aded1a71e636af1413e0c3b06870c324279efd
2019-05-08[automerger skipped] Zero-init HIDL core types (all)Steven Moreland
am: 38db64566e -s ours am skip reason: change_id I3979232879bb437d17d3a6f6013b53b2951a2138 with SHA1 aa79ac59c8 is in history Change-Id: I075153bcf8c4df82d0847ce647025c198e821831
2019-05-08Zero-initialize hidl_vec dataSteven Moreland
Bug: 131356202 Test: manually check padding in structs allocated in these arrays Test: libhwbinder_benchmark, well within variance (this test allocates arrays). Before: --------------------------------------------------------------------- Benchmark Time CPU Iterations --------------------------------------------------------------------- BM_sendVec_binderize/4 34935 ns 15081 ns 36091 BM_sendVec_binderize/8 39140 ns 16846 ns 38865 BM_sendVec_binderize/16 36495 ns 15833 ns 44182 BM_sendVec_binderize/32 39785 ns 17182 ns 38870 BM_sendVec_binderize/64 35647 ns 15466 ns 38215 BM_sendVec_binderize/128 39145 ns 16873 ns 44856 BM_sendVec_binderize/256 38836 ns 16801 ns 41596 BM_sendVec_binderize/512 41014 ns 17831 ns 40161 BM_sendVec_binderize/1024 37534 ns 16270 ns 41794 BM_sendVec_binderize/2048 37662 ns 16471 ns 42331 BM_sendVec_binderize/4096 38551 ns 16809 ns 35635 BM_sendVec_binderize/8192 36139 ns 15865 ns 42185 BM_sendVec_binderize/16384 51743 ns 22600 ns 31556 BM_sendVec_binderize/32768 46644 ns 20616 ns 30220 BM_sendVec_binderize/65536 68763 ns 30412 ns 25429 After: --------------------------------------------------------------------- Benchmark Time CPU Iterations --------------------------------------------------------------------- BM_sendVec_binderize/4 39549 ns 17214 ns 35193 BM_sendVec_binderize/8 38786 ns 16822 ns 37402 BM_sendVec_binderize/16 37787 ns 16492 ns 37100 BM_sendVec_binderize/32 40796 ns 17567 ns 36399 BM_sendVec_binderize/64 41024 ns 17797 ns 45328 BM_sendVec_binderize/128 36169 ns 15707 ns 39602 BM_sendVec_binderize/256 37136 ns 16094 ns 47081 BM_sendVec_binderize/512 37998 ns 16443 ns 48487 BM_sendVec_binderize/1024 35190 ns 15318 ns 40091 BM_sendVec_binderize/2048 37665 ns 16399 ns 39498 BM_sendVec_binderize/4096 45963 ns 19877 ns 36884 BM_sendVec_binderize/8192 40075 ns 17620 ns 34013 BM_sendVec_binderize/16384 46224 ns 20315 ns 34384 BM_sendVec_binderize/32768 49775 ns 21994 ns 35334 BM_sendVec_binderize/65536 60181 ns 27238 ns 22205 Change-Id: Ica6c55e7346b9e1ba91192472e2b229cb786802c Merged-In: Ica6c55e7346b9e1ba91192472e2b229cb786802c
2019-05-08Zero-init HIDL core types (all)Steven Moreland
hidl_pointer - already zero initialized hidl_string - now memset to 0 hidl_array - has no pad to initialize, default initialize since we now expect structs to be default initialized to sane values. hidl_vec - now memset to 0 hidl_memory - has three aligned(8) items which are always set hidl_version - unused, but has two uint16_t entries Zero-init HIDL core types (hidl_handle). Has 7 padded bits at the end. Since they are passed across processes. Bug: 131356202 Test: print out values Change-Id: I3979232879bb437d17d3a6f6013b53b2951a2138 Merged-In: I3979232879bb437d17d3a6f6013b53b2951a2138
2019-05-08Zero-initialize hidl_vec dataSteven Moreland
Bug: 131356202 Test: manually check padding in structs allocated in these arrays Test: libhwbinder_benchmark, well within variance (this test allocates arrays). Before: --------------------------------------------------------------------- Benchmark Time CPU Iterations --------------------------------------------------------------------- BM_sendVec_binderize/4 34935 ns 15081 ns 36091 BM_sendVec_binderize/8 39140 ns 16846 ns 38865 BM_sendVec_binderize/16 36495 ns 15833 ns 44182 BM_sendVec_binderize/32 39785 ns 17182 ns 38870 BM_sendVec_binderize/64 35647 ns 15466 ns 38215 BM_sendVec_binderize/128 39145 ns 16873 ns 44856 BM_sendVec_binderize/256 38836 ns 16801 ns 41596 BM_sendVec_binderize/512 41014 ns 17831 ns 40161 BM_sendVec_binderize/1024 37534 ns 16270 ns 41794 BM_sendVec_binderize/2048 37662 ns 16471 ns 42331 BM_sendVec_binderize/4096 38551 ns 16809 ns 35635 BM_sendVec_binderize/8192 36139 ns 15865 ns 42185 BM_sendVec_binderize/16384 51743 ns 22600 ns 31556 BM_sendVec_binderize/32768 46644 ns 20616 ns 30220 BM_sendVec_binderize/65536 68763 ns 30412 ns 25429 After: --------------------------------------------------------------------- Benchmark Time CPU Iterations --------------------------------------------------------------------- BM_sendVec_binderize/4 39549 ns 17214 ns 35193 BM_sendVec_binderize/8 38786 ns 16822 ns 37402 BM_sendVec_binderize/16 37787 ns 16492 ns 37100 BM_sendVec_binderize/32 40796 ns 17567 ns 36399 BM_sendVec_binderize/64 41024 ns 17797 ns 45328 BM_sendVec_binderize/128 36169 ns 15707 ns 39602 BM_sendVec_binderize/256 37136 ns 16094 ns 47081 BM_sendVec_binderize/512 37998 ns 16443 ns 48487 BM_sendVec_binderize/1024 35190 ns 15318 ns 40091 BM_sendVec_binderize/2048 37665 ns 16399 ns 39498 BM_sendVec_binderize/4096 45963 ns 19877 ns 36884 BM_sendVec_binderize/8192 40075 ns 17620 ns 34013 BM_sendVec_binderize/16384 46224 ns 20315 ns 34384 BM_sendVec_binderize/32768 49775 ns 21994 ns 35334 BM_sendVec_binderize/65536 60181 ns 27238 ns 22205 Change-Id: Ica6c55e7346b9e1ba91192472e2b229cb786802c Merged-In: Ica6c55e7346b9e1ba91192472e2b229cb786802c
2019-05-08Zero-init HIDL core types (all)Steven Moreland
hidl_pointer - already zero initialized hidl_string - now memset to 0 hidl_array - has no pad to initialize, default initialize since we now expect structs to be default initialized to sane values. hidl_vec - now memset to 0 hidl_memory - has three aligned(8) items which are always set hidl_version - unused, but has two uint16_t entries Zero-init HIDL core types (hidl_handle). Has 7 padded bits at the end. Since they are passed across processes. Bug: 131356202 Test: print out values Change-Id: I3979232879bb437d17d3a6f6013b53b2951a2138 Merged-In: I3979232879bb437d17d3a6f6013b53b2951a2138
2019-05-08[automerger skipped] Zero-initialize hidl_vec dataSteven Moreland
am: 03b0bf2f20 -s ours am skip reason: change_id Ica6c55e7346b9e1ba91192472e2b229cb786802c with SHA1 97e2d175cf is in history Change-Id: I855463a8bb7d4480cfba1aadcd852aac4b283620
2019-05-08[automerger skipped] Zero-init HIDL core types (all)Steven Moreland
am: aa79ac59c8 -s ours am skip reason: SHA1 aa79ac59c8 skipped by user smoreland Change-Id: I6dd8ddaaea2e135d6eadf210e6be57e108173bc6
2019-05-07Zero-initialize hidl_vec dataSteven Moreland
Bug: 131356202 Test: manually check padding in structs allocated in these arrays Test: libhwbinder_benchmark, well within variance (this test allocates arrays). Before: --------------------------------------------------------------------- Benchmark Time CPU Iterations --------------------------------------------------------------------- BM_sendVec_binderize/4 34935 ns 15081 ns 36091 BM_sendVec_binderize/8 39140 ns 16846 ns 38865 BM_sendVec_binderize/16 36495 ns 15833 ns 44182 BM_sendVec_binderize/32 39785 ns 17182 ns 38870 BM_sendVec_binderize/64 35647 ns 15466 ns 38215 BM_sendVec_binderize/128 39145 ns 16873 ns 44856 BM_sendVec_binderize/256 38836 ns 16801 ns 41596 BM_sendVec_binderize/512 41014 ns 17831 ns 40161 BM_sendVec_binderize/1024 37534 ns 16270 ns 41794 BM_sendVec_binderize/2048 37662 ns 16471 ns 42331 BM_sendVec_binderize/4096 38551 ns 16809 ns 35635 BM_sendVec_binderize/8192 36139 ns 15865 ns 42185 BM_sendVec_binderize/16384 51743 ns 22600 ns 31556 BM_sendVec_binderize/32768 46644 ns 20616 ns 30220 BM_sendVec_binderize/65536 68763 ns 30412 ns 25429 After: --------------------------------------------------------------------- Benchmark Time CPU Iterations --------------------------------------------------------------------- BM_sendVec_binderize/4 39549 ns 17214 ns 35193 BM_sendVec_binderize/8 38786 ns 16822 ns 37402 BM_sendVec_binderize/16 37787 ns 16492 ns 37100 BM_sendVec_binderize/32 40796 ns 17567 ns 36399 BM_sendVec_binderize/64 41024 ns 17797 ns 45328 BM_sendVec_binderize/128 36169 ns 15707 ns 39602 BM_sendVec_binderize/256 37136 ns 16094 ns 47081 BM_sendVec_binderize/512 37998 ns 16443 ns 48487 BM_sendVec_binderize/1024 35190 ns 15318 ns 40091 BM_sendVec_binderize/2048 37665 ns 16399 ns 39498 BM_sendVec_binderize/4096 45963 ns 19877 ns 36884 BM_sendVec_binderize/8192 40075 ns 17620 ns 34013 BM_sendVec_binderize/16384 46224 ns 20315 ns 34384 BM_sendVec_binderize/32768 49775 ns 21994 ns 35334 BM_sendVec_binderize/65536 60181 ns 27238 ns 22205 Change-Id: Ica6c55e7346b9e1ba91192472e2b229cb786802c Merged-In: Ica6c55e7346b9e1ba91192472e2b229cb786802c
2019-05-07Zero-init HIDL core types (all)Steven Moreland
hidl_pointer - already zero initialized hidl_string - now memset to 0 hidl_array - has no pad to initialize, default initialize since we now expect structs to be default initialized to sane values. hidl_vec - now memset to 0 hidl_memory - has three aligned(8) items which are always set hidl_version - unused, but has two uint16_t entries Zero-init HIDL core types (hidl_handle). Has 7 padded bits at the end. Since they are passed across processes. Bug: 131356202 Test: print out values Change-Id: I3979232879bb437d17d3a6f6013b53b2951a2138 Merged-In: I56bacf9ca7ac51d73449d11883c6224e214b8773 Merged-In: I8dd52e196e1585028d91d97f00861021c21ec09c
2019-05-02Snap for 5523284 from 97e2d175cf96d460010c437f073ede9053f6c5d9 to qt-releaseandroid-build-team Robot
Change-Id: I7b9b40dd1c4100292e6ab8e55443caea041e13f2
2019-05-01Zero-initialize hidl_vec dataSteven Moreland
Bug: 131356202 Test: manually check padding in structs allocated in these arrays Test: libhwbinder_benchmark, well within variance (this test allocates arrays). Before: --------------------------------------------------------------------- Benchmark Time CPU Iterations --------------------------------------------------------------------- BM_sendVec_binderize/4 34935 ns 15081 ns 36091 BM_sendVec_binderize/8 39140 ns 16846 ns 38865 BM_sendVec_binderize/16 36495 ns 15833 ns 44182 BM_sendVec_binderize/32 39785 ns 17182 ns 38870 BM_sendVec_binderize/64 35647 ns 15466 ns 38215 BM_sendVec_binderize/128 39145 ns 16873 ns 44856 BM_sendVec_binderize/256 38836 ns 16801 ns 41596 BM_sendVec_binderize/512 41014 ns 17831 ns 40161 BM_sendVec_binderize/1024 37534 ns 16270 ns 41794 BM_sendVec_binderize/2048 37662 ns 16471 ns 42331 BM_sendVec_binderize/4096 38551 ns 16809 ns 35635 BM_sendVec_binderize/8192 36139 ns 15865 ns 42185 BM_sendVec_binderize/16384 51743 ns 22600 ns 31556 BM_sendVec_binderize/32768 46644 ns 20616 ns 30220 BM_sendVec_binderize/65536 68763 ns 30412 ns 25429 After: --------------------------------------------------------------------- Benchmark Time CPU Iterations --------------------------------------------------------------------- BM_sendVec_binderize/4 39549 ns 17214 ns 35193 BM_sendVec_binderize/8 38786 ns 16822 ns 37402 BM_sendVec_binderize/16 37787 ns 16492 ns 37100 BM_sendVec_binderize/32 40796 ns 17567 ns 36399 BM_sendVec_binderize/64 41024 ns 17797 ns 45328 BM_sendVec_binderize/128 36169 ns 15707 ns 39602 BM_sendVec_binderize/256 37136 ns 16094 ns 47081 BM_sendVec_binderize/512 37998 ns 16443 ns 48487 BM_sendVec_binderize/1024 35190 ns 15318 ns 40091 BM_sendVec_binderize/2048 37665 ns 16399 ns 39498 BM_sendVec_binderize/4096 45963 ns 19877 ns 36884 BM_sendVec_binderize/8192 40075 ns 17620 ns 34013 BM_sendVec_binderize/16384 46224 ns 20315 ns 34384 BM_sendVec_binderize/32768 49775 ns 21994 ns 35334 BM_sendVec_binderize/65536 60181 ns 27238 ns 22205 Change-Id: Ica6c55e7346b9e1ba91192472e2b229cb786802c
2019-04-30Zero-init HIDL core types (all)Steven Moreland
hidl_pointer - already zero initialized hidl_string - now memset to 0 hidl_array - has no pad to initialize, default initialize since we now expect structs to be default initialized to sane values. hidl_vec - now memset to 0 hidl_memory - has three aligned(8) items which are always set hidl_version - unused, but has two uint16_t entries Zero-init HIDL core types (hidl_handle). Has 7 padded bits at the end. Since they are passed across processes. Bug: 131356202 Test: print out values Change-Id: I3979232879bb437d17d3a6f6013b53b2951a2138 Merged-In: I56bacf9ca7ac51d73449d11883c6224e214b8773 Merged-In: I8dd52e196e1585028d91d97f00861021c21ec09c
2019-04-27Snap for 5511022 from 874486019fa65856bbd35d173be04b472afa1637 to qt-releaseandroid-build-team Robot
Change-Id: Ib3f68540c05e9f836b66c150f3036693342e2089
2019-04-26Merge "Add product manifest." into qt-devYifan Hong
2019-04-24Add product manifest.Yifan Hong
Bug: 126770403 Bug: 130714844 Test: build product_manifest.xml Change-Id: I7c3a0cd380d87ef6d3539585ee4727d53eab0d9b Merged-In: I7c3a0cd380d87ef6d3539585ee4727d53eab0d9b
2019-04-24Snap for 5499134 from c1e587fb8d7867c4d7bea3d77078aedd9adca2cb to qt-releaseandroid-build-team Robot
Change-Id: Icb64d3fb7ecca7ef75bbb82077d4f2053e9ffb6c
2019-04-24Merge "Do not destruct static maps." into qt-devSteven Moreland
2019-04-23Do not destruct static maps.Steven Moreland
In case they are deleted while some threads are using them (this happens sometimes depending on how these libraries are loaded and how they are being used). Noting that b/69122224 is filed to move these into functions. Bug: 129726097 Test: HIDL's run_all_device_tests.sh Test: no longer see error where it repro'd before: FORTIFY: pthread_mutex_lock called on a destroyed mutex Change-Id: I66eb9aa24e31d7fc652f0426361c17600b4716ec (cherry picked from commit b1c7d06b1fe4d2b702b3512f946f9a5041fb4ef5) Merged-In: I66eb9aa24e31d7fc652f0426361c17600b4716ec
2019-04-22Allow multiple DEVICE_MATRIX_FILEYifan Hong
Test: define multiple entries in DEVICE_MATRIX_FILE and build, then lshal Bug: 130714844 Change-Id: Idb8e7eff81720bbd3705597d532f6a8306214db2
2019-03-14Snap for 5374457 from 0b6d39d2bbf3c52f9242d8195fd77deb7ac9334c to qt-releaseandroid-build-team Robot
Change-Id: I503b6a692d65f6c63b6f6a615f0f75a476096fde
2019-03-12[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into ↵Xin Li
master" am: 88fdd29aae -s ours am: ed5774e47f -s ours am: bd78d98949 -s ours am skip reason: subject contains skip directive Change-Id: I885842d83805d87e365da639375a3bc2bcbca5f7
2019-03-12[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li
4cf9c3b1a3 -s ours am: f60a73628c -s ours am: d9209f28f2 -s ours am skip reason: subject contains skip directive Change-Id: Ic8f0d64e39246040d95194c601cf9ecb9bc26fed
2019-03-12[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into ↵Xin Li
master" am: 88fdd29aae -s ours am: ed5774e47f -s ours am skip reason: subject contains skip directive Change-Id: If9bb4e2f2ec9bfa9df22af68a77842587916339b
2019-03-12[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li
4cf9c3b1a3 -s ours am: f60a73628c -s ours am skip reason: subject contains skip directive Change-Id: I45b8c2ec0454b6e21949931dc898fb84d23a8039
2019-03-12[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"Xin Li
am: 88fdd29aae -s ours am skip reason: subject contains skip directive Change-Id: I626e50760b644d0627baf8101ea568e7e778202a
2019-03-12[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li
am: 4cf9c3b1a3 -s ours am skip reason: subject contains skip directive Change-Id: I81bf0ba69605302a43bb06955f05c596403be826
2019-03-13Snap for 5370966 from e0fe581c48376af2e0711f825c1086bd021ab603 to qt-releaseandroid-build-team Robot
Change-Id: Icd94fb04c0ce24be7944017a35753bc14bdb9ee7
2019-03-13Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.10Xin Li