Commit graph

2810 commits

Author SHA1 Message Date
Cole Faust
f95692aee7 Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c am: 5401044873 am: 39950f876f am: 554f21af52
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I4a8fdbea1a8d312c1150d42e8b8cbbfabc4bc321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 19:10:13 +00:00
Cole Faust
554f21af52 Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c am: 5401044873 am: 39950f876f
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I6fdc4bbc11b0c7bd8ec49fb8ff33379ad8293f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 18:48:06 +00:00
Cole Faust
39950f876f Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c am: 5401044873
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I6b5a40b29856bc933aec0f6c851b28da9c800fd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 18:23:33 +00:00
Cole Faust
5401044873 Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I619faa1257949c3c0bd5d6117589031d823ba3c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 17:54:05 +00:00
Cole Faust
9452525c5c Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I5b85651b3d8297f4e271c3c60c56c0308dd7f579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 17:31:28 +00:00
Cole Faust
50190420a8 Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" 2022-04-15 17:11:34 +00:00
Bob Badour
a2d5d9a62b Non-module targets. am: fac5b05a41 am: 0b98b4ff78 am: d6fcff6139 am: ae40b57a4d am: cbe62ca1eb
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: Icf3d08fd49c297079f079da90d7419c405c28af1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 00:04:01 +00:00
Bob Badour
cbe62ca1eb Non-module targets. am: fac5b05a41 am: 0b98b4ff78 am: d6fcff6139 am: ae40b57a4d
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: I729e05f8786475feb2d95edd3f41d4fb63bc11fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 23:41:54 +00:00
Bob Badour
ae40b57a4d Non-module targets. am: fac5b05a41 am: 0b98b4ff78 am: d6fcff6139
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: I90ed326d5bb7d1996cc9e35918438c01344542c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 23:20:37 +00:00
Bob Badour
d6fcff6139 Non-module targets. am: fac5b05a41 am: 0b98b4ff78
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: Iaae3044b72bb7d9b313f62c1e0a67093ef12891f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 22:44:41 +00:00
Bob Badour
0b98b4ff78 Non-module targets. am: fac5b05a41
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: I56c264ce196330c586c584fd3aec8c62364094d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 22:27:07 +00:00
Cole Faust
d48fc0b7db Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT
The statement
```
include $(PHONE_CAR_BOARD_CONFIG)
```
is difficult to translate to the Starlark configuration file. Fortunately,
all the potential values of this variable have have similar structure, so
```
PHONE_CAR_BOARD_CONFIG := device/google_car/foo/BoardConfig.mk
....
include $(PHONE_CARD_BOARD_CONFIG)
```
can be changed to
```
PHONE_CAR_BOARD_PRODUCT := foo
....
include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
```

Bug: 190051051
Test: treehugger
Change-Id: Ic7563540a70670f42d73f6466860fadf7883fb86
2022-04-14 13:42:20 -07:00
Bob Badour
fac5b05a41 Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: I229f692e11eec9fa5a9beffd9d6ba811c378e82e
2022-04-13 13:07:02 -07:00
Eric Laurent
d6b27d48e8 Revert "audio: add immersive output" am: 4c4c40aee6 am: 3fe408132a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692481

Change-Id: Ie5f713e1a6d37f4df23bec25bf67f3cda8568d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 19:02:47 +00:00
Eric Laurent
3fe408132a Revert "audio: add immersive output" am: 4c4c40aee6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692481

Change-Id: I3e1940fe7fdabcd60dd5223022187aa6f01ef9af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 18:41:03 +00:00
Eric Laurent
4c4c40aee6 Revert "audio: add immersive output"
This reverts commit 432fc04f64.

Bug: 223736548
Test: make
Change-Id: I242dd4677d0e42e05bed443e4021ca44cddf4daf
2022-04-12 18:02:04 +02:00
Eric Laurent
97757b112a [automerger skipped] Revert "DO NOT MERGE audio: add immersive output" am: 69e753be8a am: bf45c918a4 -s ours am: 7a4168d9be -s ours am: 50f952b4e8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654992

Change-Id: I646a6b710ca45f02344a48dc6cdf0b8379c04dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:45:00 +00:00
Eric Laurent
32906c516d [automerger skipped] Revert "DO NOT MERGE Audio configuration for spatial audio" am: 10848fe081 am: 7044b7d704 -s ours am: f0d273077f -s ours am: 57f4f76588 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654991

Change-Id: If2c7e174b765da183ea2066539f59a4daee67cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:44:59 +00:00
Eric Laurent
f9e270f775 [automerger skipped] Merge changes from topic "presubmit-am-1830507c0de2408caacf9436d85826eb" into sc-v2-dev-plus-aosp am: 7b77d473a7 -s ours am: 073a13490c -s ours am: f2cac81514 -s ours
am skip reason: skipped by user elaurent

Original change: undetermined

Change-Id: If324ef16c7127049faf50476fc6c2a685b5adee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:44:42 +00:00
Eric Laurent
73de9e53f5 resolve merge conflicts of 7b77d473a7 to tm-dev am: 5f85a1763f am: 89e4c5e249
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692477

Change-Id: I6a09638f8d7e51cc5a8e359e794051373d0bb5d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:44:28 +00:00
Eric Laurent
50f952b4e8 [automerger skipped] Revert "DO NOT MERGE audio: add immersive output" am: 69e753be8a am: bf45c918a4 -s ours am: 7a4168d9be -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654992

Change-Id: Iae23a78c9c8005b5efff14cc068a2b5a2167732b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:24:20 +00:00
Eric Laurent
57f4f76588 [automerger skipped] Revert "DO NOT MERGE Audio configuration for spatial audio" am: 10848fe081 am: 7044b7d704 -s ours am: f0d273077f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654991

Change-Id: I2a3295c3dbdee9a0ebb376c743a0c24713a3883e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:24:19 +00:00
Eric Laurent
f2cac81514 [automerger skipped] Merge changes from topic "presubmit-am-1830507c0de2408caacf9436d85826eb" into sc-v2-dev-plus-aosp am: 7b77d473a7 -s ours am: 073a13490c -s ours
am skip reason: skipped by user elaurent

Original change: undetermined

Change-Id: I08de6f7992b0e5ecd5a7062975cc4ad89d37e672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:23:33 +00:00
Eric Laurent
89e4c5e249 resolve merge conflicts of 7b77d473a7 to tm-dev am: 5f85a1763f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692477

Change-Id: Id46b9587e045233a833938dc7637fdd4246ad37b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:22:22 +00:00
Eric Laurent
7a4168d9be [automerger skipped] Revert "DO NOT MERGE audio: add immersive output" am: 69e753be8a am: bf45c918a4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654992

Change-Id: Ic8e006ac7bd960bcab4428318257fb9dd9aff191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:21:43 +00:00
Eric Laurent
f0d273077f [automerger skipped] Revert "DO NOT MERGE Audio configuration for spatial audio" am: 10848fe081 am: 7044b7d704 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654991

Change-Id: I4da097fbd3b0ebaf366bd32bf4a80c8a3ec67741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:21:42 +00:00
Eric Laurent
073a13490c [automerger skipped] Merge changes from topic "presubmit-am-1830507c0de2408caacf9436d85826eb" into sc-v2-dev-plus-aosp am: 7b77d473a7 -s ours
am skip reason: skipped by user elaurent

Original change: undetermined

Change-Id: Ifc70cb5b674d069a1a9726527c15b7b4ae7b41f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:21:33 +00:00
Eric Laurent
5f85a1763f resolve merge conflicts of 7b77d473a7 to tm-dev
Revert "DO NOT MERGE Audio configuration for spatial audio"

Bug: 223736548
Test: make
This reverts commit edfc5e86bd.

Change-Id: Ie693f24b76d00469ad71a36989e481023946c3bb
2022-04-12 11:17:09 +02:00
Eric Laurent
bf45c918a4 Revert "DO NOT MERGE audio: add immersive output" am: 69e753be8a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654992

Change-Id: I04c56f53d48a86c456947f47ce91020f4c1727b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 08:29:35 +00:00
Eric Laurent
7044b7d704 Revert "DO NOT MERGE Audio configuration for spatial audio" am: 10848fe081
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17654991

Change-Id: Ide5de220ec0c8d82a0f16efbc3c061788539db35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 08:29:34 +00:00
Eric Laurent
7b77d473a7 Merge changes from topic "presubmit-am-1830507c0de2408caacf9436d85826eb" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Revert "DO NOT MERGE Audio configuration for spatial audio" 2p: f4f8fa1fed
  Revert "DO NOT MERGE Audio configuration for spatial audio"
2022-04-12 08:00:52 +00:00
Eric Laurent
69e753be8a Revert "DO NOT MERGE audio: add immersive output"
Bug: 223736548
Test: make

This reverts commit d91acaba1a.

Change-Id: I18aa2cb60403b131dcf353f8b51e831a9f4614da
2022-04-12 08:00:52 +00:00
Eric Laurent
10848fe081 Revert "DO NOT MERGE Audio configuration for spatial audio"
Bug: 223736548
Test: make
This reverts commit edfc5e86bd.

Change-Id: Ie693f24b76d00469ad71a36989e481023946c3bb
2022-04-12 08:00:52 +00:00
shawnlin
ad802ec13c [automerge] Update status bar height res to correct size 2p: fb9b9c83c4 am: b079c10eb3 am: 8142ccbe43 am: aa93c9f454
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17686747

Change-Id: I3f9e20a8c241ee316062036ceb049e9c449fa340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 03:00:12 +00:00
shawnlin
aa93c9f454 [automerge] Update status bar height res to correct size 2p: fb9b9c83c4 am: b079c10eb3 am: 8142ccbe43
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17686747

Change-Id: I6cea40f9f714ced0c86a374615d9db807e1ebcb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:38:04 +00:00
shawnlin
8142ccbe43 [automerge] Update status bar height res to correct size 2p: fb9b9c83c4 am: b079c10eb3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17686747

Change-Id: Id2331d2e592e977747e7c7e74992415f8f511748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:35:46 +00:00
chungkai
8d7ba8a5b4 Enable load kernel modules in parallel am: 36e728a381 am: 272c2ce425
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17690765

Change-Id: I1f5702855ef81b4d053320fa52bd419d9fa9f6df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 02:08:31 +00:00
chungkai
272c2ce425 Enable load kernel modules in parallel am: 36e728a381
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17690765

Change-Id: I2e06dcd32989f4a0c37b543514d5fd9b9db9bc8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 01:44:15 +00:00
chungkai
36e728a381 Enable load kernel modules in parallel
only enable for launched project.

Test: boot to home screen without error and avc denials on R4/O6
Bug: 180676019
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: I374a25b3c7debcf8a268e62f939a7909b31fe1e8
2022-04-11 09:21:28 +00:00
shawnlin
b079c10eb3 [automerge] Update status bar height res to correct size 2p: fb9b9c83c4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17686747

Bug: 216782082
Change-Id: I38b632931f5865fa9eb27565abcdeec0ed10ac58
2022-04-11 06:02:04 +00:00
shawnlin
fb9b9c83c4 Update status bar height res to correct size
Test: make
Bug: 216782082
Change-Id: Ibc23f990e4fda040a86b52f78effce6da0235931
2022-04-11 11:52:09 +08:00
Steve Berbary
d5dc3b9d4d Update oriole SVN to 26 am: 08d806ddfd am: dd07c1c6d4 am: 505a101117 am: bed94809b8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364

Change-Id: I3ba169ad4b1ec30514cb555e15af3258d354e676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:54:19 +00:00
Steve Berbary
fbbcd60a20 Update raven SVN to 26 am: 77bcf08c3a am: 6130465028 am: f82eac9ed6 am: 6dc7e33c51
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945

Change-Id: Ic2ec8a33aa174b095aeee36ddb5bcfe4998ab367
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:54:14 +00:00
TreeHugger Robot
10a0c6fc7d Merge changes from topic "presubmit-am-0be9c78d93d143ea893abc2e69997e6e" into sc-v2-dev-plus-aosp am: 319009ffc5 am: 13d24861b2 am: add238ffa5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364

Change-Id: Ice62fe57b2411bcadc7afbf58d9fb4f12dc8cdde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:54:03 +00:00
TreeHugger Robot
99dd1380ad Merge changes from topic "presubmit-am-45c82800be5d4e2ea03d01bd258037f1" into sc-v2-dev-plus-aosp am: aa3b845972 am: b8003fdd17 am: b7c7169d47
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945

Change-Id: I94843085bcb36d7d0d33306168360f13454f804c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:53:47 +00:00
Steve Berbary
bed94809b8 Update oriole SVN to 26 am: 08d806ddfd am: dd07c1c6d4 am: 505a101117
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364

Change-Id: I151de1d1368bdfb0209ca3ee04f70ea661a866fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:31:19 +00:00
Steve Berbary
6dc7e33c51 Update raven SVN to 26 am: 77bcf08c3a am: 6130465028 am: f82eac9ed6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945

Change-Id: I89c9c9de8e98da0743e9369f2ba036318f1157dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:31:13 +00:00
TreeHugger Robot
add238ffa5 Merge changes from topic "presubmit-am-0be9c78d93d143ea893abc2e69997e6e" into sc-v2-dev-plus-aosp am: 319009ffc5 am: 13d24861b2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364

Change-Id: I4dafca64227ecefba5a7768475959c0ee7cfc33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:31:08 +00:00
TreeHugger Robot
b7c7169d47 Merge changes from topic "presubmit-am-45c82800be5d4e2ea03d01bd258037f1" into sc-v2-dev-plus-aosp am: aa3b845972 am: b8003fdd17
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17607945

Change-Id: I540c5c1a3f3a0917cb50902bf83fac3cc8556629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:30:30 +00:00
Steve Berbary
505a101117 Update oriole SVN to 26 am: 08d806ddfd am: dd07c1c6d4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17608364

Change-Id: I332bd0ac66495876bc56f02eb1625b8086f77e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-10 16:17:19 +00:00