Treehugger Robot
f722d4a26a
Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 am: fc8e1abc67 am: 94092b5c2a am: eb009ffec1 am: 05d874064e
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326
Change-Id: I10d98c9e3c16aa2d610e1a9cb6d0d265afd21bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 09:36:05 +00:00
Treehugger Robot
05d874064e
Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 am: fc8e1abc67 am: 94092b5c2a am: eb009ffec1
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326
Change-Id: Id19689b211a77f14e10c7426dac518b1ca2454d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 09:18:28 +00:00
Treehugger Robot
eb009ffec1
Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 am: fc8e1abc67 am: 94092b5c2a
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326
Change-Id: Ia02c8aa3bf7a5bd4cae3917f877cbe4266800a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 08:51:46 +00:00
Treehugger Robot
94092b5c2a
Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824 am: fc8e1abc67
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326
Change-Id: Ibba4c0028ffe5732b2f038f891fcee9c038e4745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 08:27:53 +00:00
Treehugger Robot
fc8e1abc67
Merge "Fix the incorrect prebuilts-info in aosp-master-boot" am: 9428c27824
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2168326
Change-Id: Ida5e332f83e60d6f3c427e4c85718a031f2b76b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 08:08:07 +00:00
Treehugger Robot
9428c27824
Merge "Fix the incorrect prebuilts-info in aosp-master-boot"
2022-08-02 07:44:25 +00:00
Howard Chen
8013679744
Fix the incorrect prebuilts-info in aosp-master-boot
...
Bug: 241050793
Test: \
development/gsi/build_with_kernel/repack_kernels.sh aarch64 \
development/gsi/build_with_kernel/update_kernel_prebuilts_510_arm64.sh \
development/gsi/build_with_kernel/update_kernel_prebuilts_515_arm64.sh \
build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=gki_arm64 TARGET_BUILD_VARIANT=user DIST_DIR=%dist_dir% droid dist \
development/gsi/build_with_kernel/kernel_info_to_dist.sh aarch64
Change-Id: I6ee2e6a5dfbc4e3105bfcdf7191dd306edb59b4c
2022-08-02 14:28:18 +08:00
Priyanka Patel
8181e2a221
Merge changes from topic "Trace Collection"
...
* changes:
Add component tests and an upload card.
Adding ability to run and end traces via proxy.
Refactor code to use common connection.
Migration of proxy.
trace collection UI
2022-07-29 12:43:21 +00:00
Priyanka Patel
c40abfeb90
Add component tests and an upload card.
...
Adding component spec tests for all new components involved in trace
collection. This includes a new card for this CL, UploadTracesComponent,
to make testing more methodical.
Test: npm run test:component
Bug: b/238981126
Change-Id: I46d1b24fed84ce35432dad36fd5ac24d35cd0542
2022-07-29 11:36:25 +00:00
Priyanka Patel
64b08efa13
Adding ability to run and end traces via proxy.
...
Finishing proxy migration by creating functionality to run and end
traces and dumps after selecting trace config.
Test: Connect a device via remote device proxy and follow the proxy
workflow for a trace or dump. Should see a placeholder message saying data loaded (trace
views not yet created).
Bug: b/238113543
Change-Id: Ic7e0948341511f6ec0bf1021d2ffbb7b198c9410
2022-07-29 10:52:13 +00:00
Priyanka Patel
b6ee5d4794
Refactor code to use common connection.
...
None of the components should directly interact with the proxy because
non-android development workflow (using web adb) will also be possible
in the future. Instead the ui components interact with a common
connection interface which handles the proxy or web adb respectively.
Test: check that proxy workflow still works as expected.
Bug: b/234103636
Change-Id: I0e7bbaf4b5f342ca99dd67f890c135dbf3ef61ec
2022-07-29 10:50:31 +00:00
Priyanka Patel
88ea98f6ba
Migration of proxy.
...
Migrating the proxy to the new trace collection UI. Should be able to
enter the proxy token, select your connected device and then make
changes to trace configrurations.
Test: try running the proxy and test that functionality is same as old
winscope.
Bug: b/238113543
Change-Id: I195f65df5d09e22db54cb9f5a7ba0396948f43d3
2022-07-29 10:50:12 +00:00
Priyanka Patel
b91e72bf40
trace collection UI
...
Created new UI components for trace collection. Since the proxy is not
yet migrated, click through the buttons to automatically cycle through
the components.
Bug: b/238981126
Test: npm run start
Click Web ADB tab to see basic component. Click ADB proxy tab to see
proxy component. Click Retry to get to authorisation options. Click
Connect to get to trace configuration component.
Change-Id: I1e7a9895ece06856c095d8c85c28d22bbfa94b31
2022-07-29 10:49:44 +00:00
Treehugger Robot
21e05b2c1d
Merge "Fix license_collector" am: e32fd5baaa am: 3d35ced879 am: 7012f00472 am: 8bbdf758b2 am: a1007c3e09
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323
Change-Id: I2805f3d1ac9cd9afcd48c3210e635dd61028a9cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 09:54:35 +00:00
Treehugger Robot
a1007c3e09
Merge "Fix license_collector" am: e32fd5baaa am: 3d35ced879 am: 7012f00472 am: 8bbdf758b2
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323
Change-Id: I9cefa3e8ad1e8593f0849ce3009b75e2f5ec1032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 09:31:04 +00:00
Treehugger Robot
8bbdf758b2
Merge "Fix license_collector" am: e32fd5baaa am: 3d35ced879 am: 7012f00472
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323
Change-Id: Ic36c2eb270ea47c35b54d17739c71218f7dd5282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 09:07:41 +00:00
Treehugger Robot
7012f00472
Merge "Fix license_collector" am: e32fd5baaa am: 3d35ced879
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323
Change-Id: I0e5677ed10b3f855284f6e25278a26951b0d4968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 08:42:40 +00:00
Treehugger Robot
3d35ced879
Merge "Fix license_collector" am: e32fd5baaa
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2168323
Change-Id: I93e1094c97f7f8fc278be876d2b35a68660e9dee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 07:46:24 +00:00
Treehugger Robot
e32fd5baaa
Merge "Fix license_collector"
2022-07-29 07:21:46 +00:00
Justin Yun
1bd0e29bc8
Fix license_collector
...
This fixes a bug for the VNDK license collector that fails to get the
license kinds when a path is given.
Bug: 192434786
Test: python3 development/vndk/snapshot/gen_buildfiles.py -vv 29
Change-Id: I101b08b97cfc1229f4e0c67fa66341d4b49fa201
2022-07-29 06:33:43 +00:00
Frederick Mayle
86e2e8a5e6
Merge "cargo2android: Fix edge case in --add_workspace feature" am: 4b4779ae81 am: 941ee91b23 am: 7aecb879d9 am: 2f611ebc70 am: c6523e771b
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2166722
Change-Id: I3ce51a41abacecb7d9e88e2f813d06043d000b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 00:16:05 +00:00
Frederick Mayle
c6523e771b
Merge "cargo2android: Fix edge case in --add_workspace feature" am: 4b4779ae81 am: 941ee91b23 am: 7aecb879d9 am: 2f611ebc70
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2166722
Change-Id: I3ea7a9457acb5be9fdbe7de19b97aa4e7f87737e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-28 23:45:53 +00:00
Frederick Mayle
2f611ebc70
Merge "cargo2android: Fix edge case in --add_workspace feature" am: 4b4779ae81 am: 941ee91b23 am: 7aecb879d9
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2166722
Change-Id: Id49b83f9d1c14bad479b6df949902c41aa7f45d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-28 23:09:40 +00:00
Frederick Mayle
7aecb879d9
Merge "cargo2android: Fix edge case in --add_workspace feature" am: 4b4779ae81 am: 941ee91b23
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2166722
Change-Id: I94b339eaa0477a4fb2e45a5b1cd5d907dee671b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-28 22:44:58 +00:00
Frederick Mayle
941ee91b23
Merge "cargo2android: Fix edge case in --add_workspace feature" am: 4b4779ae81
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2166722
Change-Id: I34dc1145ba925dfedd031755615f6926323a6cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-28 22:17:30 +00:00
Frederick Mayle
4b4779ae81
Merge "cargo2android: Fix edge case in --add_workspace feature"
2022-07-28 21:54:59 +00:00
Hui Ling Shi
febda81348
Merge "Downgrade vue-material version"
2022-07-27 06:04:05 +00:00
Frederick Mayle
71722b10e5
cargo2android: Fix edge case in --add_workspace feature
...
If the last line of a Cargo.toml was a `[*]`, then appending
`[workspace]` without newlines would result in an invalid toml file.
external/crosvm/tracing/Cargo.toml is an example.
Test: ran on crosvm
Change-Id: Ib949e7f92d0205b1bc6433d1e231924832ddb536
2022-07-27 00:13:52 +00:00
Kean Mariotti
6751fa5bd3
fix flickerlib facade
...
Remove code related to error/tag, which was removed from the Kotlin flickerlib as well
Test: npm run build:all && npm run test:all
Change-Id: Iaba34b458dd08aaae5ad18968a11ca8ab2d1e33a
2022-07-26 15:22:55 +00:00
Hui Ling Shi
8130d2c9e8
Downgrade vue-material version
...
Fix vue-material errors that show up when using MdSelect (which
we use for <Overlay />). These errors are a known bug in the
vue-material codebase
(https://github.com/vuematerial/vue-material/issues/2285 ) but no
patch is out for it yet. Hence, downgrade vue-material to the
latest version that does not have these errors.
Test: manual with local build of Winscope
Bug: 238262637
Change-Id: Icffead3cbf1fa1f2a6e4ec83564078f396e660cf
2022-07-25 07:49:36 +00:00
Treehugger Robot
a4f5fa7ba7
Merge "Set ALLOW_UNKNOWN_WARNING_OPTION" am: 5a5aa3357a am: 5fcc737b41 am: 91dd2e97b3 am: e12d626ee9 am: 303c666757
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2161662
Change-Id: I604f443ef0bbd77e29b0fb4279b6812c5f398502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-22 00:26:22 +00:00
Treehugger Robot
303c666757
Merge "Set ALLOW_UNKNOWN_WARNING_OPTION" am: 5a5aa3357a am: 5fcc737b41 am: 91dd2e97b3 am: e12d626ee9
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2161662
Change-Id: Iafab7a0c28faa92277374bbbb3388aeb90f5e36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-21 23:40:13 +00:00
Treehugger Robot
e12d626ee9
Merge "Set ALLOW_UNKNOWN_WARNING_OPTION" am: 5a5aa3357a am: 5fcc737b41 am: 91dd2e97b3
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2161662
Change-Id: I266be4e7e84735f456ac0c8c949f1a3031787a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-21 23:20:53 +00:00
Treehugger Robot
91dd2e97b3
Merge "Set ALLOW_UNKNOWN_WARNING_OPTION" am: 5a5aa3357a am: 5fcc737b41
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2161662
Change-Id: Id9e696ee18172f72b8bac57837c683fdcb548b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-21 23:00:36 +00:00
Treehugger Robot
5fcc737b41
Merge "Set ALLOW_UNKNOWN_WARNING_OPTION" am: 5a5aa3357a
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2161662
Change-Id: If7f0dd37bed7d027c3aecee9c20fd3426de8b8b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-21 22:29:58 +00:00
Treehugger Robot
5a5aa3357a
Merge "Set ALLOW_UNKNOWN_WARNING_OPTION"
2022-07-21 12:23:28 +00:00
Yi Kong
7549a9f9a6
Set ALLOW_UNKNOWN_WARNING_OPTION
...
header-checker build may use an older version of clang than the platform
version, causing errors for unknown cflags. Setting the env var allows
these errors to be suppressed.
Test: presubmit
Change-Id: Icf08ec5913f5608ffc1e14daf3e6ed71610f733a
2022-07-21 17:45:07 +08:00
Steven Moreland
cb700e164a
Merge "Create a module for create_reference_dumps.py" am: ba781b8eac am: d3e6c8e283 am: 42c106c5a0 am: 32ce1645ea am: d009ea4013
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2157919
Change-Id: I13025e667f64203ac7135e0081dc1770ccc7ad00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 17:31:27 +00:00
Steven Moreland
d009ea4013
Merge "Create a module for create_reference_dumps.py" am: ba781b8eac am: d3e6c8e283 am: 42c106c5a0 am: 32ce1645ea
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2157919
Change-Id: Ieca6f46572590f6fc000ab6d4d1f1740b881d377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 17:03:00 +00:00
Steven Moreland
32ce1645ea
Merge "Create a module for create_reference_dumps.py" am: ba781b8eac am: d3e6c8e283 am: 42c106c5a0
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2157919
Change-Id: Ic0ece4668c6dfce4d3131e4a0fe9188d6087d749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 16:46:05 +00:00
Steven Moreland
42c106c5a0
Merge "Create a module for create_reference_dumps.py" am: ba781b8eac am: d3e6c8e283
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2157919
Change-Id: I28356f4679625721f28afc46944daa3de5b19064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 16:28:08 +00:00
Steven Moreland
d3e6c8e283
Merge "Create a module for create_reference_dumps.py" am: ba781b8eac
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2157919
Change-Id: I3032e52c529a9661ff5da8e60a2b9b60b4572839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 16:02:08 +00:00
Steven Moreland
ba781b8eac
Merge "Create a module for create_reference_dumps.py"
2022-07-19 15:43:53 +00:00
Treehugger Robot
a2b818c331
Merge "Exclude list may have comment" am: 71caa549f3 am: eeba035377 am: daa7ed2846 am: b06917a133 am: 8ecfab5be1
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2158136
Change-Id: Idd73fbd17ac826dfaec421857a303730b9c45628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 08:30:22 +00:00
Treehugger Robot
8ecfab5be1
Merge "Exclude list may have comment" am: 71caa549f3 am: eeba035377 am: daa7ed2846 am: b06917a133
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2158136
Change-Id: I42ea086da287947209ed1a18d2fd836f58d79f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 08:11:22 +00:00
Treehugger Robot
b06917a133
Merge "Exclude list may have comment" am: 71caa549f3 am: eeba035377 am: daa7ed2846
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2158136
Change-Id: I680d382fb2ef61fb8a4532124657ec9d8881e43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 07:45:37 +00:00
Treehugger Robot
daa7ed2846
Merge "Exclude list may have comment" am: 71caa549f3 am: eeba035377
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2158136
Change-Id: Ifcaabd6a1741d8d1324e60beada2f219ba334924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 07:27:40 +00:00
Treehugger Robot
eeba035377
Merge "Exclude list may have comment" am: 71caa549f3
...
Original change: https://android-review.googlesource.com/c/platform/development/+/2158136
Change-Id: Ifc39a4719c6c1ea0c5589ec46ae7babf1479f98f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-19 07:01:48 +00:00
Treehugger Robot
71caa549f3
Merge "Exclude list may have comment"
2022-07-19 06:44:43 +00:00
Justin Yun
b2143bf4dc
Exclude list may have comment
...
With this change the exclude list file may have comments that start
with '#'
Test: Run collect_ninja_inputs.py with excluded file list that has
'#' comments
Change-Id: Ic2e3da8a34144426e00ebd45ee09ff9cb3b339bd
2022-07-19 14:31:44 +09:00