Commit Graph

33180 Commits

Author SHA1 Message Date
Anton Hansson
9c2aef851f [automerger skipped] Remove system-images files from the SDK am: c92fe23901 am: d94e960415 -s ours
am skip reason: Merged-In I7ba2eb244a5930721c82895cd2947a1d2aff63e2 with SHA-1 ae04c5c358 is already in history

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

Change-Id: I23b2cd94c78246e039d3e48fa9dc701ba28fd9f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:13:48 +00:00
Anton Hansson
e5b5a166b3 [automerger skipped] Stop building the system-image zip am: dd5a6d5c95 am: 910d7baadc -s ours
am skip reason: Merged-In I11a9aaea89c307d4698787e228fb47228244ab74 with SHA-1 897fe05053 is already in history

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

Change-Id: I2a3794a6c30733117aff3e0c37ef17374a00efdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:13:42 +00:00
Anton Hansson
d94e960415 Remove system-images files from the SDK am: c92fe23901
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18599347

Change-Id: I0b0159ba798a24c9185de3728662d289447e3206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:43:48 +00:00
Anton Hansson
910d7baadc Stop building the system-image zip am: dd5a6d5c95
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18599346

Change-Id: I90038f32e8aae8ac270522e30fa36f8f08e84f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 16:43:42 +00:00
Anton Hansson
c92fe23901 Remove system-images files from the SDK
The system images distributed externally are created by a separate
set of rules than these. There are no known consumers of these
legacy system-image files.

This makes the SDK zip architecture-agnostic.

Bug: 205008975
Test: m sdk sdk_repo dist
Test: diff sdk zips from sdk_phone_arm64 and sdk_phone_x86 (no diff)
Merged-In: I7ba2eb244a5930721c82895cd2947a1d2aff63e2
Change-Id: I7ba2eb244a5930721c82895cd2947a1d2aff63e2
2022-05-25 13:16:10 +00:00
Anton Hansson
dd5a6d5c95 Stop building the system-image zip
The system images distributed externally are created by a separate
set of rules than these. There are no known consumers of these
legacy system-image zip files.

Bug: 205008975
Test: m sdk sdk_repo dist
Merged-In: I11a9aaea89c307d4698787e228fb47228244ab74
Change-Id: I11a9aaea89c307d4698787e228fb47228244ab74
2022-05-25 13:16:07 +00:00
Yi-yo Chiang
b3b7ed9677 Merge "create_reference_dumps.py: Always rebuild lsdump_paths.txt" am: c38fa6eb0a am: f80aa1285c am: b1beda3e95 am: 5be4ceceb3 am: 05637a6cf8
Original change: https://android-review.googlesource.com/c/platform/development/+/2096997

Change-Id: I5c7359222abfcffd028c337a3c6f7a8434eae722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 05:47:00 +00:00
Yi-yo Chiang
05637a6cf8 Merge "create_reference_dumps.py: Always rebuild lsdump_paths.txt" am: c38fa6eb0a am: f80aa1285c am: b1beda3e95 am: 5be4ceceb3
Original change: https://android-review.googlesource.com/c/platform/development/+/2096997

Change-Id: Id673911d8756bda7a04e57eee3080bb1c3e5ff45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 05:28:29 +00:00
Yi-yo Chiang
5be4ceceb3 Merge "create_reference_dumps.py: Always rebuild lsdump_paths.txt" am: c38fa6eb0a am: f80aa1285c am: b1beda3e95
Original change: https://android-review.googlesource.com/c/platform/development/+/2096997

Change-Id: I68ae8793636469c5140a8b36e61889624995e82c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 05:10:52 +00:00
Yi-yo Chiang
b1beda3e95 Merge "create_reference_dumps.py: Always rebuild lsdump_paths.txt" am: c38fa6eb0a am: f80aa1285c
Original change: https://android-review.googlesource.com/c/platform/development/+/2096997

Change-Id: I9d4ed4a7685a2d74ac1602020b0a4e52418a3f20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 04:44:39 +00:00
Yi-yo Chiang
f80aa1285c Merge "create_reference_dumps.py: Always rebuild lsdump_paths.txt" am: c38fa6eb0a
Original change: https://android-review.googlesource.com/c/platform/development/+/2096997

Change-Id: I216f5f6c765ef9ca50b23a20e0d9417dddfadf7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 04:18:27 +00:00
Yi-yo Chiang
c38fa6eb0a Merge "create_reference_dumps.py: Always rebuild lsdump_paths.txt" 2022-05-25 04:03:43 +00:00
Treehugger Robot
c5225bf423 Merge "create_reference_dumps.py: Clear SKIP_ABI_CHECKS" am: 323c559e2e am: 765adcd583 am: 68cbc67553 am: b5f878560d am: acd91420f1
Original change: https://android-review.googlesource.com/c/platform/development/+/2101513

Change-Id: I35e0969d53dc526b21f653cdae436bd6cc3c6935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 11:20:33 +00:00
Treehugger Robot
acd91420f1 Merge "create_reference_dumps.py: Clear SKIP_ABI_CHECKS" am: 323c559e2e am: 765adcd583 am: 68cbc67553 am: b5f878560d
Original change: https://android-review.googlesource.com/c/platform/development/+/2101513

Change-Id: Ifcd9689c70f5aa9b4fd11d62df15e1c4c7cfb189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 10:52:24 +00:00
Yi-Yo Chiang
43271c7bc8 create_reference_dumps.py: Always rebuild lsdump_paths.txt
If the contents of lsdump_paths.txt was corrupted,
create_reference_dumps.py might not rebuild lsdump_paths.txt due to
incremental build mechanism. Manually unlink and rebuild
lsdump_paths.txt in create_reference_dumps.py so that it always get the
up-to-date lsdump_paths.txt.

Bug: 233562033
Test: $ development/vndk/tools/header-checker/utils/create_reference_dumps.py -l libbinder -product aosp_arm64
  $ echo "" > $ANDROID_PRODUCT_OUT/lsdump_paths.txt
  $ development/vndk/tools/header-checker/utils/create_reference_dumps.py -l libbinder -product aosp_arm64
Change-Id: Iedccba6ffb659b3348c4f3fb57b82e38de8e53c3
2022-05-24 18:25:38 +08:00
Treehugger Robot
b5f878560d Merge "create_reference_dumps.py: Clear SKIP_ABI_CHECKS" am: 323c559e2e am: 765adcd583 am: 68cbc67553
Original change: https://android-review.googlesource.com/c/platform/development/+/2101513

Change-Id: Iba92267cabd9866f1f028e3897ef29a1e615da3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 09:44:28 +00:00
Treehugger Robot
68cbc67553 Merge "create_reference_dumps.py: Clear SKIP_ABI_CHECKS" am: 323c559e2e am: 765adcd583
Original change: https://android-review.googlesource.com/c/platform/development/+/2101513

Change-Id: I1d681b86b5beb56ff1eef06de1a42cebd0c4f06d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 09:17:02 +00:00
Treehugger Robot
765adcd583 Merge "create_reference_dumps.py: Clear SKIP_ABI_CHECKS" am: 323c559e2e
Original change: https://android-review.googlesource.com/c/platform/development/+/2101513

Change-Id: Iaad05eacd4cbb77da78bbf69b2c8d338638e33fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 08:31:22 +00:00
Treehugger Robot
323c559e2e Merge "create_reference_dumps.py: Clear SKIP_ABI_CHECKS" 2022-05-24 08:03:43 +00:00
Yi-Yo Chiang
ec469d15ea create_reference_dumps.py: Clear SKIP_ABI_CHECKS
It's possible that a developer would set SKIP_ABI_CHECKS during
development, and only execute create_reference_dumps.py before
submitting the change. If the developer forgot to clear SKIP_ABI_CHECKS
before running create_reference_dumps.py, the developer would be hit by
a confusing error (something about lsdump_paths.txt has invalid format),
because some preconditions of create_reference_dumps.py aren't met.
The error message isn't helpful as it doesn't tell the developer how to
resolve the error.
Let's just unset SKIP_ABI_CHECKS in create_reference_dumps.py, so
create_reference_dumps.py can be as fool-proof as possible.
The developer doesn't need to know the preconditions of
create_reference_dumps.py as it should handle it by itself.

Bug: 233562033
Test: export SKIP_ABI_CHECKS=true && ./create_reference_dumps.py
Change-Id: I397f1fcad7f0a1f9a7cb2781f32d85cdf2439e60
2022-05-24 14:29:01 +08:00
Treehugger Robot
79b73f460b Merge "Fix adb proxy get device id on windows" am: 120f46ef53 am: 5d4f0e7546 am: da6908fec7 am: b8ee00638c am: 846f9658e8
Original change: https://android-review.googlesource.com/c/platform/development/+/2098153

Change-Id: Ie0b8e2ca8add2c727b8cce8739a866a289cbeff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 16:17:48 +00:00
Treehugger Robot
846f9658e8 Merge "Fix adb proxy get device id on windows" am: 120f46ef53 am: 5d4f0e7546 am: da6908fec7 am: b8ee00638c
Original change: https://android-review.googlesource.com/c/platform/development/+/2098153

Change-Id: I90dbf4a303fe2db63edae6d0a2781cc1ed47de38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 15:58:07 +00:00
Treehugger Robot
b8ee00638c Merge "Fix adb proxy get device id on windows" am: 120f46ef53 am: 5d4f0e7546 am: da6908fec7
Original change: https://android-review.googlesource.com/c/platform/development/+/2098153

Change-Id: I102b0de63473a6f350b0b07dfae4e2a821d6ccdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 15:33:47 +00:00
Treehugger Robot
da6908fec7 Merge "Fix adb proxy get device id on windows" am: 120f46ef53 am: 5d4f0e7546
Original change: https://android-review.googlesource.com/c/platform/development/+/2098153

Change-Id: I519a1541f823739faefa347a97a05525557dd53f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 15:16:00 +00:00
Treehugger Robot
5d4f0e7546 Merge "Fix adb proxy get device id on windows" am: 120f46ef53
Original change: https://android-review.googlesource.com/c/platform/development/+/2098153

Change-Id: I0af71f0dbb26c1dfd0b52aadf6c68ec20bca6c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 14:57:42 +00:00
Treehugger Robot
120f46ef53 Merge "Fix adb proxy get device id on windows" 2022-05-23 14:42:21 +00:00
Kean Mariotti
111237a5a6 Cleanup test code
Replace multiple ad-hoc Node classes with single builder class

Test: yarn run test
Change-Id: Iebe76c59fbc3bcccdf89885f7d4cdbaa0d6a0576
2022-05-16 15:26:58 +00:00
Kean Mariotti
987d8af036 Merge "Fix Chips missing on SF/WM traces when "Show Diff" toggled" 2022-05-16 06:17:42 +00:00
Kean Mariotti
f0273cd5b4 Fix Chips missing on SF/WM traces when "Show Diff" toggled
Test: yarn run test
Fixes: 231924100
Change-Id: I1923b01e0841282fb27757b5c48ec5b3c76cb24a
2022-05-13 15:09:51 +00:00
zengshuchuan
a7526ac28b Fix adb proxy get device id on windows
Window adb device contains a '\r' character,
translate string to integer comparing.

Bug: 232488036
Test: 1. Excute python.exe winscope_proxy.py on Window Powershell.
2. Launch winscope index.html and set the Winscope token.
3. Tablet connect adb and winscope select the device.
4. Tap the 'DUMP STATE' button.

Change-Id: I8c261da523763982ea4a4bfae6883694b221883c
2022-05-13 16:58:41 +08:00
Anton Hansson
27c135a4d4 Merge "Use lint database from api_versions_public" am: 4f9305a51c am: 0f1b793d59 am: 664f937fc6 am: 68f7aa6ad3 am: 885b041b34
Original change: https://android-review.googlesource.com/c/platform/development/+/2092064

Change-Id: Ib45dab4f016eefc6be804ed917aae8393b1c333b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 04:02:47 +00:00
Anton Hansson
885b041b34 Merge "Use lint database from api_versions_public" am: 4f9305a51c am: 0f1b793d59 am: 664f937fc6 am: 68f7aa6ad3
Original change: https://android-review.googlesource.com/c/platform/development/+/2092064

Change-Id: I3531983dbb1f187f2db1b32c287507b3343cc623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 22:07:40 +00:00
Anton Hansson
68f7aa6ad3 Merge "Use lint database from api_versions_public" am: 4f9305a51c am: 0f1b793d59 am: 664f937fc6
Original change: https://android-review.googlesource.com/c/platform/development/+/2092064

Change-Id: Ibc705ec453ac3a1e5fca0a3b6e3af95cea280d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 21:22:27 +00:00
Anton Hansson
664f937fc6 Merge "Use lint database from api_versions_public" am: 4f9305a51c am: 0f1b793d59
Original change: https://android-review.googlesource.com/c/platform/development/+/2092064

Change-Id: I1fa57fb66e062e8ae9c37275fb20b4eb914b195b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:48:08 +00:00
Anton Hansson
0f1b793d59 Merge "Use lint database from api_versions_public" am: 4f9305a51c
Original change: https://android-review.googlesource.com/c/platform/development/+/2092064

Change-Id: Id3b47831f9a0d1a4966b7248c7e8110d9ef902f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:41:59 +00:00
Anton Hansson
4f9305a51c Merge "Use lint database from api_versions_public" 2022-05-11 08:11:45 +00:00
Anton Hansson
1d75c7fe31 Use lint database from api_versions_public
These two databases are (nearly) identical but the latter is generated
in a much more efficient way.

The diffs are very minor and it's not clear to me which versions is more
correct than the other, though I'm fairly confident they don't matter.

https://paste.googleplex.com/5567994005553152

Bug: 187398174
Test: diff api-versions.xml
Change-Id: I97375e0d72675bc8ff102551b3e3913e684be683
2022-05-09 10:46:38 +00:00
Raju Kulkarni
ec4793c7b5 Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 2540a48f06 am: ecdf034b81 am: d80e64bacf
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: Ie016f5ec28ea1bc7fb9fcdee7f9583dbaa0fcd75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 07:01:28 +00:00
Raju Kulkarni
e83cf596e2 Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 068f90107c am: 30892421df am: 414ac0ebaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I3e7ece11ae8a778796aaac82f7fd7242501d92e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 07:01:21 +00:00
Raju Kulkarni
8eb93eee26 Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 2540a48f06 am: 0cd7c6ef49 am: 5f987629af
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I2a4c622ef25e9fe6e4fdf7388decedae6d430bbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 07:01:12 +00:00
Raju Kulkarni
d80e64bacf Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 2540a48f06 am: ecdf034b81
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: If0027fd8e2db2741501109fe03e7082beafbf1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:41:56 +00:00
Raju Kulkarni
414ac0ebaa Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 068f90107c am: 30892421df
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I3f90e0447295f37ff1b58a1287a386b916b86aa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:41:49 +00:00
Raju Kulkarni
5f987629af Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 2540a48f06 am: 0cd7c6ef49
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I866ca07ef36a41eb7dd02384b728ad5ed572ed6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:41:33 +00:00
Raju Kulkarni
ecdf034b81 Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 2540a48f06
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I696ecc916a7eb63f4404c073fca0b5147a17d3bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:26:53 +00:00
Raju Kulkarni
30892421df Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 068f90107c
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: Ia90dd1644f22728cb9fc2ce62eb134598a13af75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:26:49 +00:00
Raju Kulkarni
0cd7c6ef49 Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: 2540a48f06
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I8df2afb8bc1b8c9fe98f26b5ef9315c3246e56d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:26:48 +00:00
Raju Kulkarni
405a4a34ad Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed am: b37ba7153e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I38197b6f5fad0383fc6e46a1182ca97500ddd8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:26:23 +00:00
Raju Kulkarni
2540a48f06 Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: Ic9498b221f1086dfa17950898da52b66e939cbbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:03:51 +00:00
Raju Kulkarni
b37ba7153e Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: Icebe7c6e47a2da12f9cbc921f7035cd7e2877e8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:03:01 +00:00
Raju Kulkarni
068f90107c Reset version number for SDK and Build tools with SDK Finalization complete for API Level 33 am: 70032a2eed
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/18186516

Change-Id: I2cdbfa1a465c4bd0b51f5e926c87a2c438565b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-08 06:02:37 +00:00