summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-07[automerger skipped] Include cuttlefish bluetooth sepolicy am: 618d4bd062 -s ↵temp_319669529Enrico Granata
ours am skip reason: Merged-In Iddf0a3973206a7bc3d9f3088862093de87980e98 with SHA-1 759f163914 is already in history Original change: https://android-review.googlesource.com/c/device/google/trout/+/2952125 Change-Id: Ib3b0158c3e845c40619ffe4473051c4a0ed8aaf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06Include cuttlefish bluetooth sepolicyEnrico Granata
Change-Id I04c339155d4b61a595083d3714476507cd60f27f broke trout builds. Due to how we include bluetooth into our project, this sepolicy was no longer getting included in our build. Adding it back fixes a build error. Bug: 316341137 Test: build Change-Id: Iddf0a3973206a7bc3d9f3088862093de87980e98 Merged-In: Iddf0a3973206a7bc3d9f3088862093de87980e98
2024-02-06Include cuttlefish bluetooth sepolicyEnrico Granata
Change-Id I04c339155d4b61a595083d3714476507cd60f27f broke trout builds. Due to how we include bluetooth into our project, this sepolicy was no longer getting included in our build. Adding it back fixes a build error. Bug: 316341137 Test: build (cherry picked from https://android-review.googlesource.com/q/commit:3065357751d84deba957ee1d897154b8f5c1ec6f) Merged-In: Iddf0a3973206a7bc3d9f3088862093de87980e98 Change-Id: Iddf0a3973206a7bc3d9f3088862093de87980e98
2024-02-05Merge "Remove left over ANGLE sepolicy" into main am: 02137d74adJason Macnak
Original change: https://android-review.googlesource.com/c/device/google/trout/+/2940666 Change-Id: Ia66a477d0aba21c4794e28e353404b3026fe71e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05Merge "Remove left over ANGLE sepolicy" into mainJason Macnak
2024-01-31Remove left over ANGLE sepolicyJason Macnak
... which points to files which don't exist after ANGLE was moved to /system partition. Bug: b/323177432 Test: cvd start --gpu_mode=guest_swiftshader Change-Id: Ie40448fee3bdfc449fbc9678eb37e42a5c9da90e
2024-01-23Merge Android 24Q1 Release (ab/11220357)Xin Li
Bug: 319669529 Merged-In: I9dc4b51cb57e5accb3591d1168b43cb756f80f11 Change-Id: I743e47dc69186facf917c99bf67ff0ac10ce8b5e
2024-01-22Remove TARGET_ENABLE_DRMHWCOMPOSER variable am: f605cac642Devin Moore
Original change: https://android-review.googlesource.com/c/device/google/trout/+/2918545 Change-Id: If820ed509f8c73877510514c9812c3e16afcef07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18Remove TARGET_ENABLE_DRMHWCOMPOSER variableDevin Moore
It's no longer used and no longer supported. Test: none Bug: 218588089 Change-Id: I84925bc3fc2e2b4f50cf429e187e91dc3fb88f69
2023-12-12Merge "Sensor HAL 2.1 Migration"Brian Daniels
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: e644505e34 -s oursXin Li
am skip reason: Merged-In Ib251f67a77d66bd076ef00d9aeafb71d42a987ae with SHA-1 2521cf01fb is already in history Original change: https://android-review.googlesource.com/c/device/google/trout/+/2866289 Change-Id: I3d1d848b5720cb05d0ab9d456d57aa6548526318 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: Ib251f67a77d66bd076ef00d9aeafb71d42a987ae Bug: 315507370 Change-Id: I5817c5fe570958bd70b8b695abe903ecb8059f68
2023-12-06Fix -Wunused-variable compiler warning am: 2868fcfab8tmp_amf_315507370Yi Kong
Original change: https://android-review.googlesource.com/c/device/google/trout/+/2861965 Change-Id: Ib251f67a77d66bd076ef00d9aeafb71d42a987ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Fix -Wunused-variable compiler warningYi Kong
Test: presubmit Change-Id: I81e679d3bc1f7b3f9b855baca157d2af5b6ee867
2023-12-04[automerger skipped] Sandbox DumpstateServerProtoStub_cc/h am: 349f8fc61d -s ↵Cole Faust
ours am skip reason: skipped by user colefaust Original change: https://partner-android-review.googlesource.com/c/device/google/trout/+/2677252 Change-Id: Idd0f98941ded252b7f41aba66b97cecfdc0a9717 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01Sandbox DumpstateServerProtoStub_cc/hCole Faust
go/roboleaf-busy-beavers-sandboxing This is a cherrypick with modifications of pa/2536556 Bug: 307824623 Bug: 289216071 Test: Presubmits Change-Id: I9dc4b51cb57e5accb3591d1168b43cb756f80f11
2023-11-22Sandbox trout genrules am: ff5424763bCole Faust
Original change: https://partner-android-review.googlesource.com/c/device/google/trout/+/2668054 Change-Id: I5e8cb07d7744eded7abc61827ad3ad3318185975 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22Sandbox trout genrules am: d597bb2646Cole Faust
Original change: https://android-review.googlesource.com/c/device/google/trout/+/2839595 Change-Id: I7d3802b99ccd28dcc5d232a1614960b57ca43e7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20Sandbox trout genrulesCole Faust
go/roboleaf-busy-beavers-sandboxing Bug: 307824623 Test: ./build/soong/tests/genrule_sandbox_test.py TracingVMProtoStub_cc TracingVMProtoStub_h VehicleServerProtoStub_cc@default-grpc VehicleServerProtoStub_cc@2.0-grpc-trout VehicleServerProtoStub_h@2.0-grpc-trout VehicleServerProtoStub_h@default-grpc Change-Id: I4f7b3fde2c97f86ab5b40d555c298969432ac63c
2023-11-20Sandbox trout genrulesCole Faust
go/roboleaf-busy-beavers-sandboxing Bug: 307824623 Test: ./build/soong/tests/genrule_sandbox_test.py TracingVMProtoStub_cc TracingVMProtoStub_h VehicleServerProtoStub_cc@default-grpc VehicleServerProtoStub_cc@2.0-grpc-trout VehicleServerProtoStub_h@2.0-grpc-trout VehicleServerProtoStub_h@default-grpc Change-Id: I4f7b3fde2c97f86ab5b40d555c298969432ac63c
2023-11-20Sandbox trout genrulesCole Faust
go/roboleaf-busy-beavers-sandboxing Bug: 307824623 Test: ./build/soong/tests/genrule_sandbox_test.py TracingVMProtoStub_cc TracingVMProtoStub_h VehicleServerProtoStub_cc@default-grpc VehicleServerProtoStub_cc@2.0-grpc-trout VehicleServerProtoStub_h@2.0-grpc-trout VehicleServerProtoStub_h@default-grpc Change-Id: I4f7b3fde2c97f86ab5b40d555c298969432ac63c
2023-11-16Sensor HAL 2.1 MigrationBrian Daniels
This migrates the Sensor HAL from version 2.0 to 2.1. This was completed by following the migration guide: https://source.android.com/docs/core/interaction/sensors/sensors-multihal#port-multihal21 This includes but is not limited to: - Moved the sensor HAL from ./hal/2.0 to ./hal/2.1 - Included the 2.1 version of the sensor HAL interface headers and libs - Updated the ::android::hardware::sensors::V2_0 namespace to ::android::hardware::sensors::V2_1 within the implementation - Updated all relevant types to use the 2.1 versions as needed - Updated all calls to `postEvents` to use the new interface, including a new call to `createScopedWakelock` - I used the implementation within the `goldfish` target as an example - Renamed both `getSensorsList()` and `injectSensorData()` to `getSensorsList_2_1()` and `injectSensorData_2_1()`, as described in the migration guide. - Updated the host tests to use the new types and ensured they pass - Updated the sensor config file to reference the new 2.1 sensor types - Swap the HIDL-based `android.hardware.sensors@2.0-service.multihal` for the AIDL-based `android.hardware.sensors-service.multihal` Bug: 266001101 Test: atest, build trout_arm64, KitchenSink app on Osprey board, no CTS regressions Change-Id: I3bf80381dca81cc9d25a65ee9737adae9db9b058
2023-11-07Disable light service am: b1f876424bBrian Daniels
Original change: https://android-review.googlesource.com/c/device/google/trout/+/2819517 Change-Id: Iff48b85701cd1b6884c4e36ca484bbb9aaaf37f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07Disable OEMLock am: c28d8522f7Hao Chen
Original change: https://android-review.googlesource.com/c/device/google/trout/+/2818897 Change-Id: I7a59210dfd6b21506628e14219630ff6d0aeb715 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07Disable light serviceBrian Daniels
Bug: 307420170 Test: build and boot on board Change-Id: Ic0bdf3fa9d6d4e63e16d2bcce0378376cf36d0f6
2023-11-06Disable OEMLockHao Chen
Test: Build and boot with https://android-review.git.corp.google.com/c/device/google/cuttlefish/+/2620460 Bug: 285587449 Change-Id: I03916cabb75005b5bcc9fa3e9118ba85ca059ae6 (cherry picked from commit 17cccf26cd11b303113254d2c2c990a55bef7b89)
2023-11-03Remove duplicate includes of cuttlefish build files am: 8234eaa535Brian Daniels
Original change: https://android-review.googlesource.com/c/device/google/trout/+/2815895 Change-Id: I73e496797e214d06cb202c880930afb207d16de0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03Merge "Add Hao Chen as OWNER for trout"Treehugger Robot
2023-11-02Add Hao Chen as OWNER for troutEnrico Granata
Bug: None Test: looked a file Change-Id: Ifd85ae5575cef2b62eb654c874027061746791b1
2023-11-02Remove duplicate includes of cuttlefish build filesBrian Daniels
The shared/BoardConfig.mk file already includes the two files that were included by this file. This second include was causing a build error regarding duplicate type definition in cuttlefish's sepolicy. Bug: 307420170 Test: build Change-Id: I23298206216d6c2054b75512e112771214dabd69
2023-11-02[automerger skipped] Disable OEMLock am: 2a768420fc -s oursHao Chen
am skip reason: Merged-In I03916cabb75005b5bcc9fa3e9118ba85ca059ae6 with SHA-1 17cccf26cd is already in history Original change: https://partner-android-review.googlesource.com/c/device/google/trout/+/2653002 Change-Id: I49ba9e1ffda05208148b35bbfb92488f22b4ac3c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-01Disable OEMLockHao Chen
Test: Build and boot with https://android-review.git.corp.google.com/c/device/google/cuttlefish/+/2620460 Bug: 285587449 (cherry picked from https://partner-android-review.googlesource.com/q/commit:17cccf26cd11b303113254d2c2c990a55bef7b89) Merged-In: I03916cabb75005b5bcc9fa3e9118ba85ca059ae6 Change-Id: I03916cabb75005b5bcc9fa3e9118ba85ca059ae6
2023-10-31[automerger skipped] Declare inputs for AudioFocusControlProtoStub_cc/h am: ↵Cole Faust
ac1312877a -s ours am skip reason: Merged-In Id5a6a2f2d51ca8a965e8f638a0c8605b2fcb4249 with SHA-1 e60506538a is already in history Original change: https://partner-android-review.googlesource.com/c/device/google/trout/+/2652672 Change-Id: Idda18b7ae6ff5e6aea6450b549ad856f7590875f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31Declare inputs for AudioFocusControlProtoStub_cc/hCole Faust
So that they can be used with sandboxing. Test: m AudioFocusControlProtoStub_cc AudioFocusControlProtoStub_h (cherry picked from https://android-review.googlesource.com/q/commit:5102534d1199a68b2c43273b96acea64d1e140ce) Merged-In: Id5a6a2f2d51ca8a965e8f638a0c8605b2fcb4249 Change-Id: Id5a6a2f2d51ca8a965e8f638a0c8605b2fcb4249 (cherry picked from commit e60506538a412e0a84c4346fee4a762ceabd1254)
2023-10-31Merge "Declare inputs for AudioFocusControlProtoStub_cc/h" into main am: ↵Treehugger Robot
821773306d Original change: https://android-review.googlesource.com/c/device/google/trout/+/2802650 Change-Id: I3380e22c3b870af913a04ea5beb2a5892acf46a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31Merge "Declare inputs for AudioFocusControlProtoStub_cc/h" into mainTreehugger Robot
2023-10-31Fix lunch choices for git_main am: d892fd3171Greg Kaiser
Original change: https://android-review.googlesource.com/c/device/google/trout/+/2809882 Change-Id: Ib0b9b188ad252738b989af12c7b460a4d5a9b841 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30Declare inputs for AudioFocusControlProtoStub_cc/hCole Faust
So that they can be used with sandboxing. Test: m AudioFocusControlProtoStub_cc AudioFocusControlProtoStub_h (cherry picked from https://android-review.googlesource.com/q/commit:5102534d1199a68b2c43273b96acea64d1e140ce) Merged-In: Id5a6a2f2d51ca8a965e8f638a0c8605b2fcb4249 Change-Id: Id5a6a2f2d51ca8a965e8f638a0c8605b2fcb4249
2023-10-30Fix lunch choices for git_mainGreg Kaiser
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446, 308429230 Test: lunch Merged-In: I8a418423491d5e2ef687ec4ff190b54e3641935a Change-Id: I8a418423491d5e2ef687ec4ff190b54e3641935a
2023-10-25Fix lunch choices for git_mainGreg Kaiser
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are valid in the trunk stable setup. Bug: 307738446 Test: lunch Change-Id: I8a418423491d5e2ef687ec4ff190b54e3641935a
2023-10-25Declare inputs for AudioFocusControlProtoStub_cc/hCole Faust
So that they can be used with sandboxing. Test: m AudioFocusControlProtoStub_cc AudioFocusControlProtoStub_h Change-Id: Id5a6a2f2d51ca8a965e8f638a0c8605b2fcb4249
2023-10-24trout: nuke virgl am: 2ffafa0f95Gurchetan Singh
Original change: https://android-review.googlesource.com/c/device/google/trout/+/2800813 Change-Id: I35fd044be024cc658707c08afb3e3679bcfe32d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24trout: nuke virglGurchetan Singh
This was removed in: https://android-review.git.corp.google.com/q/topic:%22trout-angle%22 However, the Android 14 merge broke the build again. Fix this. BUG=307420170 TEST=abtd run Change-Id: Id29f2175e392bd49002c103b6eda497838bb7729
2023-10-17Merge 10952656Xin Li
Merged-In: I97664ef3350c8fb3bcd4846f5d3376e14496fe67 Change-Id: Ide27c363fb40a487fa2df349d2180f954662e625
2023-10-06[automerger skipped] Merge Android 14 am: 75071ca93c -s oursXin Li
am skip reason: Merged-In Iaac05fe22bc25c6080a6cc980dd041f190231e96 with SHA-1 9657955881 is already in history Original change: https://android-review.googlesource.com/c/device/google/trout/+/2774978 Change-Id: Ib07ce25791762c6e8cb66b3481264a1667aacc12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: Iaac05fe22bc25c6080a6cc980dd041f190231e96 Change-Id: I1210f309606b9bf92c9d5a90beb22cdedcf8a3b3
2023-10-02Reset BOARD_KERNEL_VERSIONHao Chen
Trout inherit the BOARD_KERNEL_VERSION variable from Cuttlefish, but Trout may use different kernel. So we reset this variable in case of kernel version mismatching. Test: Build Bug: 302558027 Change-Id: I5bdd6390837524ac0f8a0c1926b53749105ab091
2023-09-05Fix build failure on troutKelvin Zhang
Usage of vendor ramdisk requires boot image header version 4. Test: th Bug: 297946272 Change-Id: Iaac05fe22bc25c6080a6cc980dd041f190231e96
2023-08-29Remove virgl from troutBrian Daniels
Test: trout_x86_64 with launch_cvd Test: trout_arm64, build only Bug: 297352707 Change-Id: I7ee43bf700b06f207bfaceea6342316943e86049
2023-08-29Fix build failure on trout am: 9657955881tmp_amf_298295554Kelvin Zhang
Original change: https://android-review.googlesource.com/c/device/google/trout/+/2729582 Change-Id: Ia0a4edfef2e60344cacfabfdd3d775c83915cea6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 19:54:57 +0000