Commit Graph

34054 Commits

Author SHA1 Message Date
Justin Yun
523397cba8 STT: add ninja "explain" to see the reason of build triggers
verbose.log.gz includes the logs for the ninja explain.
The logs will be automatically cached to verbose.log.gz,
verbose.log.2.gz, and verbose.log.4.gz.

Bug: 284915566
Test: combined_build_test.sh -t cf_x86_64_phone -v userdebug \
                   -d out/dist -a cf_x86_64_foldable -o -c -r droid
Change-Id: Ib722a7c331cfe6b034ab4812b85504d2f5161881
2023-06-28 18:14:38 +09:00
Justin Yun
89c0f2e225 Merge "vndk snapshot update: read txt file with utf-8 encoding" 2023-06-28 07:50:55 +00:00
Justin Yun
6d08991cae vndk snapshot update: read txt file with utf-8 encoding
VNDK snapshot updater reads license text files. To avoid unexpected
text files to be read, explicitly set the encoding type and ignore
if failed to read.

Bug: 288846788
Test: add binary to read and see if it is ignored
Change-Id: I7e3d0bbdc6c692ef7dbc6d8bf9d53c67003d0f90
2023-06-28 13:48:55 +09:00
Xin Li
3126a4f73e Merge "Merge Android 13 QPR3" 2023-06-26 22:29:52 +00:00
Zhi Dou
c3416e2cd3 Merge "Add Injection use case" 2023-06-26 13:57:30 +00:00
Hsin-Yi Chen
57a28a1076 Merge "Check the state of ofstream" 2023-06-26 06:02:25 +00:00
Hsin-Yi Chen
e235d32717 Check the state of ofstream
This commit fixes the bug that causes the ABI tools to produce invalid
output but return success.

Bug: 288168134
Test: development/vndk/tools/header-checker/tests/test.py
Change-Id: Ifa94667e9d38eff65e943a1d277dd2c7b5493fe5
2023-06-26 11:00:41 +08:00
Zhi Dou
52f9498e0e Add Injection use case
Add the Injection use case of Aconfig flag.

Add corresponding tests.

Test: atest AconfigDemo_ContentLibs_Test
Bug: 287644619
Change-Id: I47cea59764b2956644ad0c159945d3cdb3231c09
2023-06-23 22:35:41 +00:00
Zhi Dou
3e66b70e45 Merge "A simple app uses aconfig flag" 2023-06-23 01:00:27 +00:00
Zhi Dou
648c081b56 A simple app uses aconfig flag
Add a simple app uses aconfig.

This app can demonstrate

1. declare aconfig flag
2. build aconfig flag in building system
3. generate aconfig java flag
4. use aconfig java flag in java code

Test: atest AconfigDemo_ContentProvide_Test
Bug: 280833426
Change-Id: Ieacbe4b2368a00872254dab1c87dc66c569fc30a
2023-06-23 00:26:04 +00:00
Treehugger Robot
b037e85818 Merge "c2a: Support customizing rustc" 2023-06-22 00:27:37 +00:00
Xin Li
df18cfc010 Merge Android 13 QPR3
Bug: 275386652
Merged-In: I672115740e3a191428d48f8cedfd7864065629cb
Change-Id: If29d420d1a3a0edd44407c32a5fa063d6397bd8f
2023-06-21 15:14:31 -07:00
Sim Sun
ecff5ddc84 c2a: Support customizing rustc
The current cargo2android.py doesn't work well w/ `--cargo_bin`. It would use the full path rustc(/<HOME>/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustc) instead of basename(`rustc`). The `RUSTC_PAT` and `RUSTC_VV_CMD_ARGS` regex doesn't match the full path.

This CL uses `(.*\/)?` to match the path if it exists.

Change-Id: If5e4060410c1cd45ad6c9612ebe856552aa14d08
2023-06-21 14:08:38 -07:00
Elliott Hughes
3b2b1aa115 Merge "Support gdbclient.py on riscv64" am: f87641a7ea
Original change: https://android-review.googlesource.com/c/platform/development/+/2626617

Change-Id: I672115740e3a191428d48f8cedfd7864065629cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 14:57:31 +00:00
Elliott Hughes
f87641a7ea Merge "Support gdbclient.py on riscv64" 2023-06-21 14:12:35 +00:00
Hsin-Yi Chen
4e6156cbf1 Merge "Fix the link to Update-Opt_in-Reference-ABI-Dumps" am: 01018f02c4
Original change: https://android-review.googlesource.com/c/platform/development/+/2627912

Change-Id: Ibcaa721625998d392785d17e09a7bfb1d6d32929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 10:16:33 +00:00
Treehugger Robot
2560d05b9f Merge "STT: Remove some dist artifacts from test build" am: bbb1f20b81
Original change: https://android-review.googlesource.com/c/platform/development/+/2630950

Change-Id: Iec308c319c2c689ed371c78f5b1385638a36a673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 10:16:22 +00:00
Hsin-Yi Chen
01018f02c4 Merge "Fix the link to Update-Opt_in-Reference-ABI-Dumps" 2023-06-21 10:10:54 +00:00
Treehugger Robot
bbb1f20b81 Merge "STT: Remove some dist artifacts from test build" 2023-06-21 09:34:05 +00:00
Justin Yun
b178c4c900 STT: Remove some dist artifacts from test build
They consume much disk space even though they are not used.

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: I4fd5e9326e5c77c28c5e178f63ba396c9e462cbd
2023-06-21 15:23:49 +09:00
Hsin-Yi Chen
9d4a5a7248 Fix the link to Update-Opt_in-Reference-ABI-Dumps
Test: none
Change-Id: I759f825e213cd6dcb42f2b7b29c344a41691aeaf
2023-06-20 17:56:13 +08:00
Treehugger Robot
4028276b5d Merge "Update ab tool path" am: 63cbded623
Original change: https://android-review.googlesource.com/c/platform/development/+/2627754

Change-Id: I150eb3ba697d53f06897ae3616fadb1463fa69d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-19 12:13:23 +00:00
Treehugger Robot
63cbded623 Merge "Update ab tool path" 2023-06-19 11:18:37 +00:00
Justin Yun
d7cd02f7b7 Update ab tool path
Bug: 287915808
Test: utils.get_latest_vndk_bid('android13-gsi')
Change-Id: If5fe7f0e972cc465fd126b7b3ffa6f0234898830
2023-06-19 09:01:15 +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
Samuel Holland
c434deca4e Support gdbclient.py on riscv64
Add the path to the existing architecture-specific runtime directory,
in preparation for when lldb-server is added to the toolchain build by
Iba7efaa62e7d3cc8e3bd1080d9b4a67bc241faf2.

Test: `gdbclient.py -r surfaceflinger` connected to a riscv64 board
Change-Id: I1654378a7ba92fcd7ffe478d2b491f426655e6f1
2023-06-16 09:48:11 -07: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
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
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
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
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
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
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
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