Commit Graph

34061 Commits

Author SHA1 Message Date
Treehugger Robot
f4567a54bf Merge "Add a folder for Aconfig demo" am: 92b2b32900 am: 631ce77d19
Original change: https://android-review.googlesource.com/c/platform/development/+/2628494

Change-Id: Ia2f227582b5a0be62d72ac36c59e7362e6382059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 20:39:11 +00:00
Treehugger Robot
631ce77d19 Merge "Add a folder for Aconfig demo" am: 92b2b32900
Original change: https://android-review.googlesource.com/c/platform/development/+/2628494

Change-Id: If9c2543a972f463e3327c0f3eeae0fa379f6a82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 19:54:51 +00:00
Treehugger Robot
92b2b32900 Merge "Add a folder for Aconfig demo" 2023-06-16 19:13:07 +00:00
Zhi Dou
709eb6d9a2 Add a folder for Aconfig demo
The Aconfig demo will be used as
1. As an example for aconfig code lab
2. As an example for user to learn Aconfig

Test: N/A
Bug: 287644619
Change-Id: Ida6c922fdd52caaecfadff99809a70fab8442814
2023-06-16 17:39:23 +00:00
Treehugger Robot
6a5c46514c Merge "STT: Add encoding option to read trace files" am: 3414060631 am: a11da8e971
Original change: https://android-review.googlesource.com/c/platform/development/+/2625884

Change-Id: I0eec2b84de82d25ffaa4423307dfdcf0e5db6343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 09:19:25 +00:00
Treehugger Robot
a11da8e971 Merge "STT: Add encoding option to read trace files" am: 3414060631
Original change: https://android-review.googlesource.com/c/platform/development/+/2625884

Change-Id: I2b7cdc93eb3f3acc9a8b130fb248ba681927636d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 08:37:46 +00:00
Treehugger Robot
3414060631 Merge "STT: Add encoding option to read trace files" 2023-06-16 08:05:21 +00:00
Justin Yun
a21f7f598d STT: Add encoding option to read trace files
Bug: 284915566
Test: read_build_trace_gz.py build.trace.gz
Change-Id: I90dc3e7c70cecf63ab1a29d972bf8333423436e7
2023-06-16 15:52:42 +09:00
Justin Yun
ac57f06ae9 Merge "STT: Generate output result from the test builds" am: a5b9424827 am: f901f0a00d
Original change: https://android-review.googlesource.com/c/platform/development/+/2623792

Change-Id: Iabe14f1ad729293cff66dc755899938ed8d39093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 01:24:16 +00:00
Justin Yun
f901f0a00d Merge "STT: Generate output result from the test builds" am: a5b9424827
Original change: https://android-review.googlesource.com/c/platform/development/+/2623792

Change-Id: Ic2a17bd62595f8edfa92898d71d59d7d3554e839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 00:52:38 +00:00
Justin Yun
a5b9424827 Merge "STT: Generate output result from the test builds" 2023-06-14 00:11:12 +00:00
Treehugger Robot
0b0b5c407a Merge "Support Python 3.8.10." am: f97a3286ec am: adfca40780
Original change: https://android-review.googlesource.com/c/platform/development/+/2624609

Change-Id: I4f99d05100f64f225af3f9bea32f9b49cd84e438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 16:37:12 +00:00
Treehugger Robot
adfca40780 Merge "Support Python 3.8.10." am: f97a3286ec
Original change: https://android-review.googlesource.com/c/platform/development/+/2624609

Change-Id: Ic75fc9518973f277376efc0f1e60fdda47856c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-13 15:36:21 +00:00
Treehugger Robot
f97a3286ec Merge "Support Python 3.8.10." 2023-06-13 14:59:55 +00:00
Andrew Walbran
90bfd75d6b Support Python 3.8.10.
Redshell unfortunately uses this old version, while the union operator
for dictionaries was only added in Python 3.9.

Test: Ran cargo2android.py on a crate with variants
Change-Id: I7a875acde11c23a3b789ef384f3ab32100d7c6d5
2023-06-13 13:06:26 +00:00
Justin Yun
e2d794cff0 STT: Generate output result from the test builds
Enable multiple test builds in one command and collect the results
from the build.trace.gz files.

Bug: 284915566
Test: combined_build_test.sh -t cf_x86_64_phone -v userdebug \
                     -d out/dist -a cf_x86_64_foldable -o -c droid
Change-Id: Ie566fd76463aa615c37130f4c4c7b8287fd8c447
2023-06-13 18:48:12 +09:00
Nikita Putikhin
90767ea8b2 Merge "Add --vscode-launch-props to gdbclient.py" am: 2876fbc6ed am: c9778fc834
Original change: https://android-review.googlesource.com/c/platform/development/+/2597823

Change-Id: I3dcbb604198711484ad6a6d75e3e5a3e0c919ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 10:53:15 +00:00
Nikita Putikhin
c9778fc834 Merge "Add --vscode-launch-props to gdbclient.py" am: 2876fbc6ed
Original change: https://android-review.googlesource.com/c/platform/development/+/2597823

Change-Id: I0f06aa5aa0cd2fc6ac5cad4f622f73c5910b6317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 10:13:54 +00:00
Nikita Putikhin
2876fbc6ed Merge "Add --vscode-launch-props to gdbclient.py" 2023-06-12 09:32:33 +00:00
Nikita Putikhin
9aa3bc65ba Add --vscode-launch-props to gdbclient.py
The new argument allows the user to pass a JSON of properties to merge
into the generated launch.json config when setting up vscode-lldb
forwarding. This way the user can add pre-build tasks, extra init
commands etc.

Test: atest gdbclient_test
Test: lldbclient.py --setup-forwarding=vscode-lldb
  --vscode-launch-props='{"sourceMap": {"test1": "test2"},
  "postDebugTask": "Stop LLDB client", "processCreateCommands" :
  ["test"]}' -r test
Change-Id: I763dd15dde10421e86bc0a6ddfde974156ef1588
2023-06-10 20:47:31 +00:00
Treehugger Robot
843a808ae8 Merge "Test script for source tree treble build" am: 43e163e870 am: 58de5189e1
Original change: https://android-review.googlesource.com/c/platform/development/+/2619170

Change-Id: I1a6c72382cfef48308f975f537331d345c5ca4c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 05:12:32 +00:00
Treehugger Robot
58de5189e1 Merge "Test script for source tree treble build" am: 43e163e870
Original change: https://android-review.googlesource.com/c/platform/development/+/2619170

Change-Id: I6cf9655fa3b366738c752a93583885060d5817d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08 04:28:43 +00:00
Treehugger Robot
43e163e870 Merge "Test script for source tree treble build" 2023-06-08 03:27:24 +00:00
Justin Yun
b931ab1e4c Test script for source tree treble build
The script tests building two targets with a sigle build artifact
path.
Give two targets A and B, build A and then build B without cleaning
the out directory. After that, build the A again.

Bug: 284915566
Test: combined_build_test.sh -t cf_x86_64_phone \
             -a cf_x86_64_foldable -v userdebug -c -d out/dist droid
Change-Id: I143412ca67717a5ee3b437c84b230a58a00b065e
2023-06-07 17:45:21 +09:00
Treehugger Robot
219c85ab47 Merge "Apply riscv64 workarounds." am: fc9eaf5daa am: aec7fe8e92
Original change: https://android-review.googlesource.com/c/platform/development/+/2618389

Change-Id: I9e0c3343ac024e5475a613e5e719ddf266e7f573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 02:27:21 +00:00
Treehugger Robot
aec7fe8e92 Merge "Apply riscv64 workarounds." am: fc9eaf5daa
Original change: https://android-review.googlesource.com/c/platform/development/+/2618389

Change-Id: I1978e31b867595760d15ea36fa588aae5d965c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 01:46:26 +00:00
Treehugger Robot
9f55edf9ef Merge "Package version bump to 34.0.4" am: 5d5398a7f5 am: 139025abb3
Original change: https://android-review.googlesource.com/c/platform/development/+/2606177

Change-Id: I29873aece9322242b59013b5270bf5e02fafc236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 01:00:44 +00:00
Treehugger Robot
fc9eaf5daa Merge "Apply riscv64 workarounds." 2023-06-07 00:54:33 +00:00
Treehugger Robot
139025abb3 Merge "Package version bump to 34.0.4" am: 5d5398a7f5
Original change: https://android-review.googlesource.com/c/platform/development/+/2606177

Change-Id: I37e188073bb2a0ee2a5492133d2ba7c24ad662e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07 00:20:40 +00:00
Dan Albert
cc5dad70f8 Apply riscv64 workarounds.
These were needed in build-ndk-prebuilts.sh too. Copy them here.

Bug: None
Test: ./update_ndk_abi.sh
Change-Id: Ia6263ff1b0936aa3a80747042662df24ddfb88e0
2023-06-06 23:39:55 +00:00
Treehugger Robot
5d5398a7f5 Merge "Package version bump to 34.0.4" 2023-06-06 23:28:28 +00:00
Shaju Mathew
a933fc2956 Package version bump to 34.0.4
Merged-in:https://googleplex-android-review.git.corp.google.com/c/platform/development/+/23456351

Test: treehugger

Bug: 284530649
Change-Id: I3a55f52aa74d2743280288b21e6dfafa1064674f
2023-06-06 22:16:54 +00:00
Nikita Putikhin
fb2be538a4 Merge "Add type annotations to gdbclient.py" am: f118084dfa am: 84b412ce4c
Original change: https://android-review.googlesource.com/c/platform/development/+/2609050

Change-Id: Iea2c9d38d390908618501ac5c15e1e848e3694ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 13:31:18 +00:00
Nikita Putikhin
84b412ce4c Merge "Add type annotations to gdbclient.py" am: f118084dfa
Original change: https://android-review.googlesource.com/c/platform/development/+/2609050

Change-Id: I9bab6c7be9f096db3413d65a9a297bf03b17e1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-05 12:49:10 +00:00
Nikita Putikhin
f118084dfa Merge "Add type annotations to gdbclient.py" 2023-06-05 12:01:07 +00:00
Nikita Putikhin
516960e34e Add type annotations to gdbclient.py
In a couple cases it exposed unused arguments or type errors. This
change fixes those as well.

Test: mypy development/scripts/gdbclient.py
Test: gdbclient -r /system/bin/date
Change-Id: If471a1853b813e01c89e321eab3d424f1c256f2d
2023-05-31 21:57:38 +00:00
Treehugger Robot
7f26f40856 [automerger skipped] Merge "Deprecate FILE_NAME_TAG" am: 8520a96d35 am: 79292970a6 -s ours
am skip reason: Merged-In I040b66d5448b2b4c8276ef1148f4517a3ab3b13a with SHA-1 5485f39ff9 is already in history

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

Change-Id: I19f3cdd49a44b0e5bb721c4700c77c0b95f26f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 10:05:25 +00:00
Treehugger Robot
79292970a6 Merge "Deprecate FILE_NAME_TAG" am: 8520a96d35
Original change: https://android-review.googlesource.com/c/platform/development/+/2567130

Change-Id: Ic24660f40ac435e3e7955115f2a6d9ccae79c482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 09:28:02 +00:00
Treehugger Robot
8520a96d35 Merge "Deprecate FILE_NAME_TAG" 2023-05-23 08:56:48 +00:00
Jeongik Cha
5485f39ff9 Deprecate FILE_NAME_TAG
Test: m dist
Bug: 278060169
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7c7459a5175d0c18a9721b1c206fc9f1ab88a25a)
Merged-In: I040b66d5448b2b4c8276ef1148f4517a3ab3b13a
Change-Id: I040b66d5448b2b4c8276ef1148f4517a3ab3b13a
2023-05-22 22:42:13 +00:00
Jeongik Cha
88895e5233 Deprecate FILE_NAME_TAG
Test: m dist
Bug: 278060169
Change-Id: I040b66d5448b2b4c8276ef1148f4517a3ab3b13a
Merged-In: I040b66d5448b2b4c8276ef1148f4517a3ab3b13a
2023-05-22 12:36:16 +00:00
Treehugger Robot
97a14685f8 Merge "Export type info." am: 3b3aef3544 am: 63d972d93b
Original change: https://android-review.googlesource.com/c/platform/development/+/2592486

Change-Id: Ia3e84bf09f1c102c6e42e37d52b43f3289c81cd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 00:45:50 +00:00
Treehugger Robot
63d972d93b Merge "Export type info." am: 3b3aef3544
Original change: https://android-review.googlesource.com/c/platform/development/+/2592486

Change-Id: I149d1b47523ae58ab743451496130cf9ac3fa520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 23:57:17 +00:00
Treehugger Robot
3b3aef3544 Merge "Export type info." 2023-05-19 22:54:26 +00:00
Dan Albert
86965f5938 Merge "Convert to setuptools pacakge." am: 14c0b1006d am: af87d432bb
Original change: https://android-review.googlesource.com/c/platform/development/+/2591688

Change-Id: If688abaa131ae1769b90098cee7e1ee579cdc699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 20:49:18 +00:00
Dan Albert
af87d432bb Merge "Convert to setuptools pacakge." am: 14c0b1006d
Original change: https://android-review.googlesource.com/c/platform/development/+/2591688

Change-Id: I18aa86e0132f6e631a709638961d751c7f8fd728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 20:03:36 +00:00
Dan Albert
14c0b1006d Merge "Convert to setuptools pacakge." 2023-05-18 18:43:22 +00:00
Treehugger Robot
8b6f72ac33 Merge "Support delete" am: d50ebda005 am: 176525b3d4
Original change: https://android-review.googlesource.com/c/platform/development/+/2545512

Change-Id: Iafea307de0c3db374985ac648b3d2e392fd2a19e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 12:59:15 +00:00
Treehugger Robot
176525b3d4 Merge "Support delete" am: d50ebda005
Original change: https://android-review.googlesource.com/c/platform/development/+/2545512

Change-Id: Ie166b2e12535d8ee19ade5aced9b445190fec8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 11:14:43 +00:00
Treehugger Robot
d50ebda005 Merge "Support delete" 2023-05-18 10:26:42 +00:00