Commit Graph

32058 Commits

Author SHA1 Message Date
Treehugger Robot
9ef5036620 Merge "[DO NOT MERGE] Update winscope proxy on R" am: afdc6bc134 am: 3cb8c57463
Original change: https://android-review.googlesource.com/c/platform/development/+/2071347

Change-Id: Ibb243e57947005b9589778b92ad8ddf85d8f4a06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 17:52:13 +00:00
Nataniel Borges
fc37e65e61 [DO NOT MERGE] Update winscope proxy on R am: 50775a7444 am: 0043465bcc
Original change: https://android-review.googlesource.com/c/platform/development/+/2071347

Change-Id: I0504b1374be2f2bb200ca66ea2d0d9e525af8bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 17:52:11 +00:00
Treehugger Robot
3cb8c57463 Merge "[DO NOT MERGE] Update winscope proxy on R" am: afdc6bc134
Original change: https://android-review.googlesource.com/c/platform/development/+/2071347

Change-Id: I0182232e715485618f97b121b8db908e466a24b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 17:28:26 +00:00
Nataniel Borges
0043465bcc [DO NOT MERGE] Update winscope proxy on R am: 50775a7444
Original change: https://android-review.googlesource.com/c/platform/development/+/2071347

Change-Id: I0fe351a9d58f3eb7658f2e37940bcf8271a84922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 17:28:24 +00:00
Treehugger Robot
afdc6bc134 Merge "[DO NOT MERGE] Update winscope proxy on R" 2022-04-21 17:13:07 +00:00
Nataniel Borges
50775a7444 [DO NOT MERGE] Update winscope proxy on R
Backport uspport for device paths with :

Fixes: 196260922
Test: open winscope and collect a trace
Change-Id: Ib2d8088e3a3452c1fea1cccb599dbd9d2ce642d4
2022-04-21 14:32:26 +00:00
Treehugger Robot
c9f3141735 Merge "Fix incorrect prebuilt-info.txt" am: 6cf816bbcf am: 19cd0dcbd2
Original change: https://android-review.googlesource.com/c/platform/development/+/2044647

Change-Id: I4c164e420979ca0fe0cfb796829feb93bfabe944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 07:44:12 +00:00
Treehugger Robot
19cd0dcbd2 Merge "Fix incorrect prebuilt-info.txt" am: 6cf816bbcf
Original change: https://android-review.googlesource.com/c/platform/development/+/2044647

Change-Id: I95ec3a0bdbe18f171de08de6ed728fa24d6f6cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 07:16:30 +00:00
Treehugger Robot
6cf816bbcf Merge "Fix incorrect prebuilt-info.txt" 2022-04-20 06:54:32 +00:00
Yi Kong
8527613189 Merge "Update clang-tools build to clang-r450784c" am: 0228b3a92e am: a9f1d7ba01
Original change: https://android-review.googlesource.com/c/platform/development/+/2064972

Change-Id: Ie85ccdade3fb131a138e8e0557e2196c5e2f159e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 19:25:49 +00:00
Yi Kong
a9f1d7ba01 Merge "Update clang-tools build to clang-r450784c" am: 0228b3a92e
Original change: https://android-review.googlesource.com/c/platform/development/+/2064972

Change-Id: I949df76f81fa5733075631f2815f66d19ce250f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 18:49:36 +00:00
Yi Kong
0228b3a92e Merge "Update clang-tools build to clang-r450784c" 2022-04-18 18:24:21 +00:00
Yi Kong
76b6aa23c2 Update clang-tools build to clang-r450784c
Bug: 219872355
Test: presubmit
Change-Id: I38ce0c3d9ec7d983f7146509c7701b79ba97f531
2022-04-16 22:32:31 +08:00
Edward Liaw
faec52fde5 Merge "gdbclient: use host ip when connecting to gdb" am: 7a89ee5b1b am: e1113109b9
Original change: https://android-review.googlesource.com/c/platform/development/+/2056834

Change-Id: I074fceefa5298c11070e3c2b7890ce93cdb360d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:37:43 +00:00
Edward Liaw
e1113109b9 Merge "gdbclient: use host ip when connecting to gdb" am: 7a89ee5b1b
Original change: https://android-review.googlesource.com/c/platform/development/+/2056834

Change-Id: I880ce81d882f7656a70e3c482e102fb1345d9923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:39:12 +00:00
Edward Liaw
7a89ee5b1b Merge "gdbclient: use host ip when connecting to gdb" 2022-04-07 18:19:33 +00:00
Edward Liaw
22e9c50ec0 gdbclient: use host ip when connecting to gdb
When the device is not on localhost, gdbclient won't connect to it
properly.  If the serial is a tcp address, parse the host and pass that
to gdb-remote.

Bug: 228371506
Test: gdbclient.py -r /system/bin/ls /bin
Change-Id: I635d4bdc483a66ab908f5aa02aa94e2504976a45
2022-04-07 00:46:07 +00:00
Treehugger Robot
cd153e83da Merge "Fix typo in documentation of script acov-llvm.py." am: 721e4ba29e am: 3216ed66b3
Original change: https://android-review.googlesource.com/c/platform/development/+/2053953

Change-Id: I231dde9cd7d8efd9d0d95664aa882bb36489c122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 20:12:37 +00:00
Treehugger Robot
3216ed66b3 Merge "Fix typo in documentation of script acov-llvm.py." am: 721e4ba29e
Original change: https://android-review.googlesource.com/c/platform/development/+/2053953

Change-Id: If888fc46743b94d430ffc9a91d108032d2bb3c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 19:46:36 +00:00
Treehugger Robot
721e4ba29e Merge "Fix typo in documentation of script acov-llvm.py." 2022-04-05 17:06:58 +00:00
Roland Levillain
e6d2736cf4 Fix typo in documentation of script acov-llvm.py.
Test: n/a (comment-only change)
Change-Id: I1c10bfd65477dd2550ed86732f9bf077c59b5a59
2022-04-05 11:00:01 +01:00
Xin Li
5daeacafac [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c045ec9dd2 -s ours
am skip reason: Merged-In I01040f537f57008e11d5aa693591fa8adab2c6b1 with SHA-1 f0651f3179 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/17544436

Change-Id: I4b98d33d3779de2f94eec99a37ce2221bd26092b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 02:30:08 +00:00
Xin Li
c045ec9dd2 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: I01040f537f57008e11d5aa693591fa8adab2c6b1
Change-Id: I08cc6f3157b735cf8a59136961de1229c3162443
2022-04-01 20:31:51 +00:00
Rob Seymour
f0651f3179 Merge "Do not install host snapshot modules with existing prebuilts." am: 3f04ab2fb4 am: 2a581813c8
Original change: https://android-review.googlesource.com/c/platform/development/+/2045663

Change-Id: I01040f537f57008e11d5aa693591fa8adab2c6b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 01:25:33 +00:00
Rob Seymour
2a581813c8 Merge "Do not install host snapshot modules with existing prebuilts." am: 3f04ab2fb4
Original change: https://android-review.googlesource.com/c/platform/development/+/2045663

Change-Id: I7b639fc71bf3ad51aa5e0e4029eb8a149029a04f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 01:06:53 +00:00
Rob Seymour
3f04ab2fb4 Merge "Do not install host snapshot modules with existing prebuilts." 2022-03-30 00:52:39 +00:00
Rob Seymour
01a4f9b2e3 Do not install host snapshot modules with existing prebuilts.
Host fake snapshot includes a prebuilt attribute for a host module
that already contains a prebuilt version in the source tree.  When
installing the host snapshot ignore any modules that already contains
a prebuilt version.

Bug: 225890931
Test: m HOST_FAKE_SNAPSHOT_ENABLE=true host-fake-snapshot dist
Test: install fake snapshot with update.py and validate prebuilt modules are not included
Change-Id: Ia8bb44c00ad5fc448ab9110d840d9059ae3294f9
2022-03-29 16:09:25 +00:00
Ivan Lozano
b1c9f7f199 Merge "Add Rust proc-macros to host snapshot update.py" am: ffb96b63ef am: aa52716392
Original change: https://android-review.googlesource.com/c/platform/development/+/2041926

Change-Id: Ieeec48a0938001b1795eee666ec4628fc49f32cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 14:32:50 +00:00
Ivan Lozano
aa52716392 Merge "Add Rust proc-macros to host snapshot update.py" am: ffb96b63ef
Original change: https://android-review.googlesource.com/c/platform/development/+/2041926

Change-Id: I563e92a84754286353eab4872303a81aa2302c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 14:08:26 +00:00
Ivan Lozano
ffb96b63ef Merge "Add Rust proc-macros to host snapshot update.py" 2022-03-29 13:29:24 +00:00
Treehugger Robot
98f38b55ae Merge "Revert "Add parameters to repack_kernels.sh"" am: 681bf56a56 am: 2b26a37959
Original change: https://android-review.googlesource.com/c/platform/development/+/2046245

Change-Id: Ieb33f734348ff56632a185501f0394a9a21e25ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 04:13:54 +00:00
Treehugger Robot
2b26a37959 Merge "Revert "Add parameters to repack_kernels.sh"" am: 681bf56a56
Original change: https://android-review.googlesource.com/c/platform/development/+/2046245

Change-Id: I77a92487c43e0001892896b88f0584496b5d02f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29 03:53:28 +00:00
Treehugger Robot
681bf56a56 Merge "Revert "Add parameters to repack_kernels.sh"" 2022-03-29 03:27:21 +00:00
SzuWei Lin
5384e2bd34 Revert "Add parameters to repack_kernels.sh"
This reverts commit a2a360813f.

Reason for revert: build errors

Change-Id: I33df157af39e148adef1e26e8b06e25157d78397
2022-03-29 01:34:10 +00:00
Treehugger Robot
85356a30f2 Merge "Add parameters to repack_kernels.sh" am: 3e0d53dc2f am: e6bd773e2e
Original change: https://android-review.googlesource.com/c/platform/development/+/2044646

Change-Id: I45b171936cad7d53f6a769f0feb008770f8af248
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:36:41 +00:00
Treehugger Robot
e6bd773e2e Merge "Add parameters to repack_kernels.sh" am: 3e0d53dc2f
Original change: https://android-review.googlesource.com/c/platform/development/+/2044646

Change-Id: I3b3f99b0f02dd13956ee520ffc5fec3adc92a37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-28 07:15:24 +00:00
Treehugger Robot
3e0d53dc2f Merge "Add parameters to repack_kernels.sh" 2022-03-28 06:53:23 +00:00
Howard Chen
f3e1facf7f Fix incorrect prebuilt-info.txt
The 8351194 has a kernel-build-id=8339614 in the prebuilt-info.txt.
This value is incorrect and should be 8350305. Fix this issue by
get the build id from artifact.

Bug: 198363484
Test: development/gsi/build_with_kernel/repack_kernels.sh aarch64
Change-Id: I4c0fd6273df4a794b7dddb5346d182e7fc91adf4
2022-03-25 13:00:16 +08:00
SzuWei Lin
a2a360813f Add parameters to repack_kernels.sh
To handle different CPU architectures and build variants. To avoid
output dist/kernel/*-debug folder on user builds

Bug: 226297708
Test: TH
Change-Id: I8ebfa00cb3f9e54bc131d8226cf756f92335be19
2022-03-25 12:46:41 +08:00
Treehugger Robot
b12f537798 Merge "Remove obsolete OWNER." am: c59205de2a am: 56dce3334b
Original change: https://android-review.googlesource.com/c/platform/development/+/2042670

Change-Id: I2114e02557a70de5984c6a647343891b4d4fd63f
Signed-off-by: Automerger Merge Worker
2022-03-24 23:04:04 +00:00
Treehugger Robot
56dce3334b Merge "Remove obsolete OWNER." am: c59205de2a
Original change: https://android-review.googlesource.com/c/platform/development/+/2042670

Change-Id: Ice3b01b8fc1dbf8621a9caad426b2379bbb18643
Signed-off-by: Automerger Merge Worker
2022-03-24 22:41:30 +00:00
Treehugger Robot
c59205de2a Merge "Remove obsolete OWNER." 2022-03-24 22:22:30 +00:00
Ivan Lozano
5a747c7b55 Add Rust proc-macros to host snapshot update.py
Bug: 204304380
Test: The host snapshot Android.bp includes proc-macros.
Change-Id: I7d406d9075fc5a6aa5983a5fef71edd119c6f67f
2022-03-24 15:33:38 -04:00
Dan Albert
22902078f1 Remove obsolete OWNER.
Test: None
Bug: None
Change-Id: I0bbaafb392b5283edd0ec49de3d15a3dd7834173
2022-03-24 12:22:59 -07:00
Treehugger Robot
741f9d7763 Merge "Avoid duplicated module name for vndk_prebuilt_shared" am: 9ad7ca0281 am: 978343d3b1
Original change: https://android-review.googlesource.com/c/platform/development/+/2031883

Change-Id: I05d57b0bcf086d6d4363725be335c4f83318e408
2022-03-21 06:10:34 +00:00
Treehugger Robot
978343d3b1 Merge "Avoid duplicated module name for vndk_prebuilt_shared" am: 9ad7ca0281
Original change: https://android-review.googlesource.com/c/platform/development/+/2031883

Change-Id: I11ec10df51ded4e14ef3bd20e8eb1f7200e25644
2022-03-21 05:37:37 +00:00
Treehugger Robot
9ad7ca0281 Merge "Avoid duplicated module name for vndk_prebuilt_shared" 2022-03-21 05:11:08 +00:00
Justin Yun
fea111c2a7 Avoid duplicated module name for vndk_prebuilt_shared
There may have prebuilt files that share a single name causing
duplicated module name error. Fix this bug by generating the
vndk_prebuilt_shared module per each module name.

Bug: 225265099
Bug: 225243872
Test: development/vndk/snapshot/gen_buildfiles.py
Change-Id: I2f6df9956d33b2ed0e901d73c93621ff4727370d
2022-03-18 12:03:52 +00:00
Treehugger Robot
0a24a459cf Merge "Add open_then_run to TEST_EXCLUDE" am: 8d976b785a am: 81bd698d16
Original change: https://android-review.googlesource.com/c/platform/development/+/2026903

Change-Id: I5393087c8e3a8e3829c956ee41a88a2c4dce7400
2022-03-16 18:35:56 +00:00
Treehugger Robot
81bd698d16 Merge "Add open_then_run to TEST_EXCLUDE" am: 8d976b785a
Original change: https://android-review.googlesource.com/c/platform/development/+/2026903

Change-Id: Id2f5a43d429b6353c2d7e167218e5c352f0acd2e
2022-03-16 18:05:02 +00:00