Commit Graph

34094 Commits

Author SHA1 Message Date
Yuyang Huang
d7a415e5ba Merge "Add NsdManagerSampleApps to show how to usd NsdManager API" into main 2023-07-25 03:05:01 +00:00
Yuyang Huang
3dd4037e6d Add NsdManagerSampleApps to show how to usd NsdManager API
The TestDiscoverService app covers the API for service discover. The
TestAdvertiseService app covers the APT for service advertisement.

Test: ./gradlew build
Change-Id: I6a8d94bbe88a9a20b1adcda8e0916898c68e7ea5
2023-07-24 17:15:34 +09:00
Treehugger Robot
6f7ecff37c Merge "Update OWNERS to add new per-file line for script" into main 2023-07-21 13:24:42 +00:00
Treehugger Robot
3062194792 Merge "scripts: Add cargo2rulesmk.py to generate rules.mk" into main 2023-07-20 13:58:57 +00:00
Nikita Putikhin
a3a0af9a93 Merge "Print adb output if pushing gdbserver fails" into main 2023-07-20 11:21:39 +00:00
Nikita Putikhin
3803ec7f07 Print adb output if pushing gdbserver fails
Right now the raised exception only shows the command and return code.
Printing the output should make the error more clear.

Test: adb root, then in adb shell touch the server and make immutable
  touch /data/local/tmp/x86_64-lldb-server
  chattr +i /data/local/tmp/x86_64-lldb-server
  Then on host lldbclient.py -r test
  Fails as expected with with "operation not permitted"

Change-Id: Ie22f41bb90809c2f9bafaee0be6a151d9b017502
2023-07-20 10:06:41 +00:00
Per Larsen
e1a65278e9 Update OWNERS to add new per-file line for script
Adding per-file line for cargo2rulesmk.py such that
it can be maintained by members of the platsec Rust
and Trusty teams.

Bug: 281857510
Change-Id: I9aedee5a76c4d463d4cf3d0851c60193d96a7696
2023-07-20 00:49:43 +00:00
Per Larsen
7b03617a54 scripts: Add cargo2rulesmk.py to generate rules.mk
Add script that generates rules.mk files from Rust crates.
Based on and inspired by cargo2android.py script to generate
blueprint files for the Android build system.

The script has only been tested on the vendored crates used to
build Trusty (see external/rust/crates) and does not support
the full range of crate types or cargo features.

Bug: 281857510
Change-Id: I1951f75476c36b9a1b794c4a51483f2c7387b1f5
2023-07-20 00:15:39 +00:00
Nikita Putikhin
eea06cf609 Merge "Add --vscode-launch-file to gdbclient.py" into main 2023-07-18 14:24:18 +00:00
Aditya Kumar
a1133e904c Merge "Clarify meaning of --port flag" into main 2023-07-15 00:52:33 +00:00
AdityaK
50c9af7a63 Clarify meaning of --port flag
Also, edited error message when lunch menu is incorrect.

Change-Id: Ie9f5a00b8560d938212eb2b38713a6343d175958
2023-07-14 16:55:55 -07:00
Treehugger Robot
03760adbee Merge "Remove timestamps from sdk_repo zips" into main 2023-07-14 00:18:33 +00:00
Cole Faust
127efd8ad1 Remove timestamps from sdk_repo zips
Switch to using soong_zip instead of regular zip because soong_zip
doesn't add timestamps.

Also remove mk-sdk-repo-pkg-3 because it was unused.

Test: m sdk sdk_repo dist
Change-Id: Ic41fab8475ac22e43128af2b60017932ee2aee89
2023-07-13 15:37:39 -07:00
Nikita Putikhin
7da179ef34 Add --vscode-launch-file to gdbclient.py
The new argument makes the generator write the VSCode launch.json config
into a file instead of stdout.

The generator uses marker lines to insert the config. This way the user
can control where in the file the launch config is written.

Test: atest gdbclient_test
Test: lldbclient.py --setup-forwarding vscode-lldb \
  --vscode-launch-props= \
  '{"internalConsoleOptions" : "openOnSessionStart"}' \
  --vscode-launch-file=.vscode/launch.json -r test

Change-Id: I92b3f479b5ebcb722933938f52d0f23ff098beac
2023-07-13 13:48:37 +00:00
Isaac Chen
ba3b3ae97a Merge "Add Module.symvers for A14 GKI KMI checking" into main 2023-07-11 15:20:31 +00:00
Yabin Cui
7533fc701a Merge "Update clang version to clang-r498229" into main 2023-07-10 16:28:42 +00:00
Isaac Chen
97b8ff21a5 Add Module.symvers for A14 GKI KMI checking
First stable Module.symvers for Android 14 GKIs:
- Android 14 GKI 6.1: build 10342778 (2023-06-18)
- Android 14 GKI 5.15: build 10342779 (2023-06-18)

Jun 2023 Module.symvers files for first Android 14 GKI releases:
- Android 14 GKI 6.1: build 10351523 (2023-06-21)
- Android 14 GKI 5.15: build 10351526 (2023-06-21)

Bug: 289918424
Bug: 289775701
Test: $ lunch aosp_arm64-userdebug
      $ m a14_kmi_compatibility_test
Change-Id: I97727be482284fcd2c76f5e3bb8ab500fc1a09c2
2023-07-10 17:57:14 +08:00
Yabin Cui
cc9c82d2c5 Update clang version to clang-r498229
Bug: 280683256
Test: OUT_DIR=out prebuilts/clang-tools/build-prebuilts.sh
Change-Id: Id1e6449e0792f3937298e0f47c6c0a9f9f8fd08e
2023-07-07 17:55:29 +00:00
Santiago Aboy Solanes
981424a4b8 Merge "Remove dmtracedump from development/build" into main 2023-07-07 15:30:21 +00:00
Dennis Song
62183259a8 Merge changes I0c16f2e1,Ifb8722b1 into main
* changes:
  Add script for mixing shared system images with a super image
  Refactor repack_super_image.py
2023-07-07 02:01:58 +00:00
Dennis Song
4088f384d5 Add script for mixing shared system images with a super image
Bug: 289369510
Test: ./development/gsi/repack_super_image/mix_ssi_with_device_image.py \
      --device-image-files aosp_cf_arm64_phone-img.zip \
      --ssi-files ssi-target_files.zip \
      --misc-info misc_info.txt \
      --ota-tools otatools.zip \
      --output-dir output_dir
Change-Id: I0c16f2e13036a5d66e96309c268214231d56d90b
2023-07-06 13:52:55 +08:00
Dennis Song
e1e7e3f8a1 Refactor repack_super_image.py
Allow import repack_super_image from other scripts

Bug: 289369510
Test: repack_super_image --ota-tools otatools.zip \
      --misc-info misc_info.txt super.img \
      system=system.img system_ext=system_ext.img \
      product=product.img
Change-Id: Ifb8722b1d6dc9cdc4b2cd3f08a31a0171f0e539b
2023-07-06 00:44:27 +08:00
Guang Zhu
7845b265db Merge "Add direct usage of Flags in demo app" 2023-06-30 21:28:35 +00:00
Guang Zhu
1037f3dc47 Add direct usage of Flags in demo app
So that flags aren't subject to optimization

Bug: 289449667
Test: atest FlagStateComboTests
Change-Id: Idafa571e74448fad3ae3d36c1e00a960abb21f24
2023-06-30 12:34:16 -07:00
Treehugger Robot
4ddf7eec71 Merge "Unbreak build by removing bindgen temporarily" 2023-06-30 18:28:44 +00:00
Jeff Hamilton
d811c8842b Merge "add more variantions for flag on/off filtering demo" 2023-06-30 03:43:53 +00:00
Treehugger Robot
8188b6f593 Merge "STT: fix build error for the ninja explain argument" 2023-06-30 00:19:30 +00:00
Guang Zhu
b6434aae53 add more variantions for flag on/off filtering demo
... also fixed missing copyright headers in 2 existing test files
... also made the instrumentation against the demo activity for real

Bug: 277819423
Test: atest FlagStateComboTests
      adb shell device_config put test \
        com.example.android.aconfig.demo.flags.awesome_flag_1 <true|false>
      adb shell device_config put test \
        com.example.android.aconfig.demo.flags.awesome_flag_2 <true|false>
Change-Id: I6083f11ee743a8b4f0f9bc23ac6945b5d072ab5e
2023-06-29 16:03:24 -07:00
Treehugger Robot
caa50e9f44 Merge "Add bugs in the flag declaration" 2023-06-29 18:21:26 +00:00
Zhi Dou
da74895830 Add bugs in the flag declaration
Test: presubmit
Bug: 287644619
Change-Id: I676d2415c833354b1f053fcd04da8dace61943cd
2023-06-29 17:29:22 +00:00
Justin Yun
884015b708 STT: fix build error for the ninja explain argument
The command must be in quotations. Use eval to run commands.

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: I41881527434a05736224de502ff6b09dcc45a55c
2023-06-29 23:15:39 +09:00
Treehugger Robot
740345b38f Merge "STT: Stop the test run if any builds fail" 2023-06-29 05:10:44 +00:00
Matthew Maurer
72fe590178 Unbreak build by removing bindgen temporarily
Bindgen has been updated in platform, but additional repos need to be
mapped into this build to work properly. Since changing manifests
requires special permissions, this unbreaks the build until we can get
the manifest fixed to re-add bindgen.

Test: TH
Change-Id: Idd7bf289212a2570e267eaab0e94d332ed8a44b2
2023-06-29 02:02:52 +00:00
Justin Yun
dde502b9de STT: Stop the test run if any builds fail
The script must fail and be excluded from the build stats if any
build run fails.

Bug: 284915566
Test: run_command with fault command
Change-Id: I0bc8d14286ebce52036f45ba4dee675f333a3ff0
2023-06-29 09:09:22 +09:00
Zhi Dou
69f0ed6b5a Merge "Add a new flag for demo" 2023-06-28 20:37:40 +00:00
Zhi Dou
403b998e1d Add a new flag for demo
Bug: 287644619
Test: presubmit
Change-Id: Ic91d0f7e829a249dd6d1d8973d9c179b545d025b
2023-06-28 19:24:05 +00:00
Patrick Rohr
43a0a82979 Merge "Merge cronet sample app into Development app" 2023-06-28 16:43:50 +00:00
Justin Yun
b14b8a6334 Merge "STT: add ninja "explain" to see the reason of build triggers" 2023-06-28 11:51:28 +00:00
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
Patrick Rohr
33118abaa9 Merge cronet sample app into Development app
So we have a way to play with the android.net.http APIs.

This is essentially copied from
https://source.chromium.org/chromium/chromium/src/+/main:components/cronet/android/sample/
with minor modifications to support android.net.http APIs (mainly,
renaming APIs and working around the fact that apihelpers are not
available to apps).

Test: adb install -r $OUT/system/app/Development/Development.apk
Change-Id: I8fdb2f64f110551edd39fab074abaf84e76b010f
2023-06-27 16:09:01 -07:00
Santiago Aboy Solanes
dc33a269c7 Remove dmtracedump from development/build
Bug: 287576918
Fixes: 287576918
Change-Id: I7c9c407bbff1b94e6b09898fe10734597fce4d9d
2023-06-27 16:07:45 +01: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