Commit Graph

1234 Commits

Author SHA1 Message Date
Treehugger Robot
eceff59258 Merge "Add license metadata declarations which are moved from hardware/libhardware_legacy/Android.mk" into main am: 8865fcdd10
Original change: https://android-review.googlesource.com/c/platform/build/+/3139093

Change-Id: I6948ea7c345e74e15127becdd3cf2011576f6f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-26 03:08:33 +00:00
Treehugger Robot
8865fcdd10 Merge "Add license metadata declarations which are moved from hardware/libhardware_legacy/Android.mk" into main 2024-06-26 03:05:43 +00:00
Xin Li
c5b3759ccf Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future 2024-06-20 20:31:51 +00:00
Yihan Dong
7c1c245214 Add cts-api-map report targets
Test: m cts-api-html-api-map cts-api-xml-api-map
cts-system-api-xml-api-map cts-system-api-html-api-map
Bug: 328699028

Change-Id: Idadeb9a9819148071761a75d97d814610c35fd30
2024-06-20 06:43:25 +00:00
yangbill
472c60a8e2 Add license metadata declarations which are moved from hardware/libhardware_legacy/Android.mk
Bug: 347653696
Test: CIs
Change-Id: I11300928e9846748e46f7690ecefa68da8e244e2
2024-06-19 03:21:57 +00:00
Treehugger Robot
0159e92532 Merge "Add license metadata declaration in packages/services/Car" into main 2024-06-19 00:13:56 +00:00
Treehugger Robot
efa01af0cb Merge "Move clean-oat-host to build/core/tasks/art.mk" into main am: 98905f38c2 am: 33a0dc9153
Original change: https://android-review.googlesource.com/c/platform/build/+/3127593

Change-Id: I558f82e78e73ff6ef0224c724fc4be8f85a370e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 00:57:21 +00:00
Treehugger Robot
33a0dc9153 Merge "Move clean-oat-host to build/core/tasks/art.mk" into main am: 98905f38c2
Original change: https://android-review.googlesource.com/c/platform/build/+/3127593

Change-Id: I185383a0ab40c123536adc5e382954d27d2c76e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 00:50:13 +00:00
Treehugger Robot
98905f38c2 Merge "Move clean-oat-host to build/core/tasks/art.mk" into main 2024-06-14 00:46:46 +00:00
Treehugger Robot
1b6940c175 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main am: f94c02c7f3 am: c17b8e9aa6
Original change: https://android-review.googlesource.com/c/platform/build/+/3127554

Change-Id: Ia0d68d147b21ab878d3d6a24197307b5e0e1747d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 02:51:19 +00:00
Treehugger Robot
c17b8e9aa6 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main am: f94c02c7f3
Original change: https://android-review.googlesource.com/c/platform/build/+/3127554

Change-Id: I3eb52390b1da643d2e28e373560bde96d35076e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-13 02:43:51 +00:00
Treehugger Robot
f94c02c7f3 Merge "Move license metadata declaration of bramble/Android.mk into meta-lic.mk" into main 2024-06-13 02:34:51 +00:00
Nelson Li
4abfb5c09e Move clean-oat-host to build/core/tasks/art.mk
Since Soong genrules now run in sandboxed mode, they cannot execute
commands like `rm -rf` within `clean-oat-target` to remove physical
directories.

The only solution is to move the `clean-oat-target` commands into
`build/core/tasks`.

Bug: 345133095
Test: m clean-oat; m clean-oat-host
Change-Id: Ifce4d5dc4bdb8e3735784135cf6f2ff143e90fe9
2024-06-13 02:09:35 +00:00
Herbert Xue
5c71b1af0e Move license metadata declaration of bramble/Android.mk into meta-lic.mk
Bug: 346457924
Test: NA
Change-Id: Ie0fcb71bd3a10d54700256f3e19296a6aaac1298
2024-06-12 14:34:31 +08:00
Jim Tang
ee4f021f6e Add license metadata declaration in packages/services/Car
Bug: 343598504
Test: presubmit
Change-Id: I858d65c70fb9c3904f01c6ed29be156248a73467
2024-06-11 13:56:04 +08:00
Treehugger Robot
6fd890a5e5 Merge "Add license metadata declaration in device/generic/goldfish" into main am: a96b36bd9f am: fc9567c25b
Original change: https://android-review.googlesource.com/c/platform/build/+/3113262

Change-Id: I32983f131d32c1519e52daba6f7b879c3fa17ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-08 02:42:57 +00:00
Treehugger Robot
fc9567c25b Merge "Add license metadata declaration in device/generic/goldfish" into main am: a96b36bd9f
Original change: https://android-review.googlesource.com/c/platform/build/+/3113262

Change-Id: I27d42d389336a7fd2edb7f3b08a7f75a3c971f8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-08 02:24:47 +00:00
Yihan Dong
b89bb9d547 fix wrong mts folder issue
Bug: 345042907
Test: m mts-mainline-infra
Ignore-AOSP-First: For internal use

Change-Id: I457403b0f9b50179d7b6ca9e13d1040b2a039b54
2024-06-07 05:31:20 +00:00
Jim Tang
39d190e7c3 Add license metadata declaration in device/generic/goldfish
Bug: 343823190
Test: presubmit
Change-Id: I112061067ff7cb6dc6894a798dc4edf51918b5ea
2024-06-04 22:22:45 +08:00
Ronald Braunstein
173298547b Merge "Reapply "Add soong installed files to general-tests.zip"" into main am: 68452cdcce
Original change: https://android-review.googlesource.com/c/platform/build/+/3111079

Change-Id: I94c5fcd5952eaa54fc34f4ee9aba5933f25c43a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-03 23:03:07 +00:00
Ronald Braunstein
b86f9ef159 Reapply "Add soong installed files to general-tests.zip"
This reverts commit f2685e5ccf.

Original commit broke building sdk/ndk in post submit.
Fixed with small patch in build/soong

Test: m general-tests
Test: IST_DIR=/usr/local/google/dist/bug TARGET_RELEASE=trunk_staging TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true packages/modules/common/build/mainline_modules_sdks.sh
Change-Id: I47e39913878219adec6471a474e3c238c4bdeed1
2024-06-02 07:21:37 -07:00
Priyanka Advani
4a6c4b076d Merge "Revert "Add soong installed files to general-tests.zip"" into main am: cfb51aa499
Original change: https://android-review.googlesource.com/c/platform/build/+/3109351

Change-Id: I9dcf300af6407f9a42827a417417970e739adecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 23:43:54 +00:00
Priyanka Advani
f2685e5ccf Revert "Add soong installed files to general-tests.zip"
Revert submission 3060229-ron-tmc-symlinks

Reason for revert: Droidmonitor created revert due to b/344045516

Reverted changes: /q/submissionid:3060229-ron-tmc-symlinks

Change-Id: Ic471df68c3ebdeb368eac9549446ee50b17d7c2f
2024-05-31 23:31:17 +00:00
Ronald Braunstein
7d64251134 Merge "Add soong installed files to general-tests.zip" into main am: 279204f0c9
Original change: https://android-review.googlesource.com/c/platform/build/+/3066804

Change-Id: I0c8cc58b7977a1b36b04905bf06b071b4590daa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 23:03:11 +00:00
Ronald Braunstein
523696e964 Add soong installed files to general-tests.zip
The module `test_module_config` will be installing symlinks in the
testcases directory pointing back to the `base` test for .apk files.
This saves a gigs of space on disk and in suite zip files.

However, the .mk files were using  LOCAL_COMPATIBILITY_SUPPORT_FILE to
do two things:
  1) copy the file from intermediates to testcases
  2) package the testcases files in zips.

Because the test_module_config rule is taking care of 1), we need a new
variable to do just 2)

Test: m general-tests device-tests
Change-Id: Icdad4401cde27d8edd5e13e486b96c62817a4bbb
2024-05-31 08:23:08 -07:00
Xin Li
b04e9cc36f Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I713a528d437e3446d32461add648e3b52b036d7a
Change-Id: I7fdd415a218d1425f7fc37095d02c674ddfae6eb
2024-05-24 08:30:06 -07:00
Julien Desprez
fdb60734e9 Patch zips makefile to properly use private variables
Test: m device-platinum-tests, m performance-tests
Bug: 341947105
Change-Id: Ic77d0dc71450f7c97717291e0f998dc53fbb31b1
2024-05-23 11:55:47 -07:00
Julien Desprez
250a70d366 Merge "Add a new device-platinum-tests zip" into main 2024-05-21 17:15:38 +00:00
Julien Desprez
73378355fa Merge "Add a performance-tests zips for perf tests" into main 2024-05-21 02:57:06 +00:00
Julien Desprez
e28650f4b0 Add a new device-platinum-tests zip
This is meant for platinum tests that require device
signing. They will be migrated out of device-tests.zip

Test: presubmit
Bug: 341719739
Change-Id: Ie30c4bedc2edf4f537deb49099d0e23b4eec2626
2024-05-20 22:58:37 +00:00
Julien Desprez
100f641823 Add a performance-tests zips for perf tests
Test: presubmit, m performance-tests
Bug: 341719739
Change-Id: Ieb3798cf7ded6d8e669ae7cef0ef3e5bf03415b7
2024-05-20 22:57:31 +00:00
Treehugger Robot
d429640373 Merge "Make side of converting refreshmod to a shell script" into main 2024-05-20 22:38:13 +00:00
Joe Onorato
143f9e0b72 Make side of converting refreshmod to a shell script
Bug: 340648588
Test: refreshmod
Change-Id: Iedbdd31f9a58cb609a826dfe8066c9eff8aa5904
2024-05-20 14:22:20 -07:00
Hugo Drumond Jacob
faf9b0128c Dump the required modules into module-info.json
Certain applications, like tracking the dependency chain of modules,
knowing the "required" dependencies is required.

In this context, "required" here means the `required` field in
Android.bp files.

Bug: 339193439
Test: Inspect module-info.json for the `required` field
Change-Id: I09977bf71a0a0ae46ea9268ce1faa5c90673bb7a
2024-05-20 18:35:24 +02:00
Wei Li
595e404bfc Add license metadata declarations which are moved from hardware/interfaces/tv/Android.mk.
Bug: 340935319
Test: CIs
Change-Id: I5e84d3204b30bd68b89c117eefcf68ab78ab0692
2024-05-15 14:39:35 -07:00
Wei Li
a255e914d8 Add license metadata declarations which are moved from hardware/google/camera/Android.mk.
Bug: 339706722
Test: CIs
Change-Id: I67199d9603e4e398b624ec46de164d24491c48a8
2024-05-09 15:13:26 -07:00
Wei Li
93e946dfae Add license metadata declarations which are moved from device/google/redfin/Android.mk.
Bug: 311544087
Test: CIs
Change-Id: I3d98e813e998e35177e16c12ff5a5298f79a7fcc
2024-05-07 16:38:26 -07:00
Wei Li
be21974f95 Add license metadata declarations which are moved from device/google/barbet/Android.mk.
Bug: 311287207
Test: CIs
Change-Id: I7a36359845865f3ddda503b5600a52fc16013cc9
2024-05-02 15:46:29 -07:00
Wei Li
5ff777f333 Merge "Add license metadata declarations which are moved from device/google/trout/Android.mk." into main 2024-05-02 22:23:35 +00:00
Cole Faust
c80e7eeb77 Merge "sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)" into main 2024-05-01 19:32:12 +00:00
Wei Li
d83c7d020b Add license metadata declarations which are moved from device/google/trout/Android.mk.
Bug: 309903693
Test: CIs
Change-Id: Iee042d5d10acc6f3a49a56f4dce9d2ef2e102918
2024-04-30 17:29:32 +00:00
Wei Li
4d1491db47 Add license metadata declarations which are moved from device/google/raviole/Android.mk.
Bug: 311522698
Test: CIs
Change-Id: I3350590e626f1d6ffe1767e0c6d39384b63d7ad8
2024-04-26 12:24:35 -07:00
Wei Li
671bb0bd4a Add license metadata declarations which are moved from device/google/gs101/Android.mk.
Bug: 310058310
Test: CIs
Change-Id: Ie49bce281879ed49482a9a43791b3839328348fa
2024-04-25 11:54:00 -07:00
Wei Li
8edc560eda Add license metadata declarations which are moved from device/google/coral/Android.mk.
Bug: 336592724
Test: CIs
Change-Id: Ifa586648ec2d25cc4f122ad84894e21fc8acebe5
2024-04-24 19:36:23 +00:00
Wei Li
6b5caf0f7f Add license metadata declarations.
They are moved from:
- device/generic/car/Android.mk
- device/generic/trusty/Android.mk
- device/generic/uml/Android.mk
- device/google_car/common/Android.mk
- device/google/atv/Android.mk

With this CL the Android.mk files can be deleted.

Bug: 309884347
Test: CIs
Change-Id: I8c27c1add6c27eb8d651779f39bb4d951acaf613
2024-04-15 22:28:39 +00:00
Yike Zhang
2b92885ea4 Merge "Fix is_unit_test in module-info" into main 2024-04-11 17:45:18 +00:00
Thiago Amanajas
7e8a80d857 Added automotive-sdv-tests
BUG: 333039457

Test: Locally
Change-Id: I9e80d2336c54130509730fd388d0bccce8cf22ef
2024-04-08 11:16:46 +02:00
yike
9ec7a00364 Fix is_unit_test in module-info
`is_unit_test` is removed from module-info.json by mistake.

Bug: 309006256
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: I03ccc0efec83fbf5a0c6e548941bba6467ce8cd1
2024-04-05 04:40:57 +00:00
Nelson Li
85f5c34e0a Move berberis tests to build/core/tasks
Move the executes `berberis_host_tests_result` and
`berberis_run_host_tests` to `build/core/tasks`, as Soong might
currently have difficulty supporting this part.

Set the OWNER of berberis_test.mk

Bug: 321643544
Test: 1. lunch sdk_phone64_x86_64_riscv64-trunk_staging-eng
      2. m berberis_all
      3. m berberis_host_tests_result
      4. m berberis_run_host_tests
Change-Id: I44a03e9eae9ee6a3c82a6d2e6de3a03b2c7d81da
2024-04-02 02:43:48 +00:00
Nelson Li
f4a7ad1947 Convert device/sample/Android.mk to Android.bp
Move the work of `declare-1p-copy-files` from
`device/sample/Android.mk` to `build/core/task/meta-lic.mk`

Bug: 309885432
Test: CIs
Change-Id: I11ab4289d73d518df2e4b53429fdcad5e80f1e78
2024-04-01 06:08:24 +00:00