Qing Shen
4e47c08b5e
Merge "Revert "Revert "Add a coverage suffix to avoid Ninja file regene..."" into main am: 1b8b8d23c4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3238688
Change-Id: I28f6ad173447a46c8bc13243279912e03244f72d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-23 23:25:13 +00:00
Qing Shen
6a8fff595b
Revert "Revert "Add a coverage suffix to avoid Ninja file regene..."
...
Revert submission 3235973-revert-3207217-emma-flip-time-saver-BYWASVIMTD
Reason for revert: Rolling forward with a fix.
Also add coverage suffix for module-info.mk.
https://android-build.corp.google.com/builds/abtd/run/L52600030005977043 shows the failure: FAILED: ninja: 'out/soong/module-info-sdv_ivi_cf.json', needed by 'out/target/product/sdv_ivi_cf/module-info.json', missing and no known rule to make it
Reverted changes: /q/submissionid:3235973-revert-3207217-emma-flip-time-saver-BYWASVIMTD
Change-Id: I0088fa18bf4d24a1c1d55389bd4a4b952ca2002b
TESTED: https://android-build.corp.google.com/builds/abtd/run/L00600030005992749
Bug: 331444846
2024-08-23 20:53:15 +00:00
Treehugger Robot
9ebd27ffcc
Merge "Don't pack target tests into art-host-tests.zip." into main am: cb56fa972b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3232722
Change-Id: I35a32d11772af64517381b65564b849f50eecdd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-20 17:22:37 +00:00
Jiakai Zhang
7731accb15
Don't pack target tests into art-host-tests.zip.
...
art-host-tests.mk packs target tests into art-host-tests.zip. This
behavior has been there since the very first version
(https://r.android.com/1437898 ).
Today, this behavior normally does nothing because target tests are
included in the ART testing apex and therefore not visible to Make.
However, if we remove any target tests from the ART testing apex, this
behavior will start to cause problems (b/360150490), as it will pack
those removed target tests into art-host-tests.zip and continous testing
will fail to run them.
This change removes this behavior.
Bug: 357802879
Bug: 169111770
Bug: 360150490
Test: `m art-host-tests` and see that the output is bit-identical with
and without the change.
Change-Id: I2e9abdf4ed51bd8dc91637d7502350dfafb4aa39
2024-08-20 14:47:58 +00:00
Treehugger Robot
0038482750
Merge "Update sts-sdk to use new source" into main am: 9fe7f1fa9e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3206023
Change-Id: I756c12981f92d3e208b125cbcd3288d7d6135af3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-08 18:36:09 +00:00
Chris Dombroski
1b569e4dd3
Update sts-sdk to use new source
...
Test: builds
Bug: 325295485
Change-Id: Iced085665b567eb675e3ee4ff54070d542b97f7d
2024-08-02 21:31:31 +00:00
Treehugger Robot
c1fbe7acf3
Merge "Move license metadata declaration of cuttlefish/Android.mk into meta-lic.mk" into main am: ff301aa3a9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196133
Change-Id: Iaec2858232544463a0bbaf2ce7ce29717bef60d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-01 07:19:07 +00:00
Herbert Xue
973d57ce67
Move license metadata declaration of cuttlefish/Android.mk into meta-lic.mk
...
Bug: 348120216
Test: presubmit
Change-Id: Iad21acbbc29c84181646bdafbdb3069a863a098a
2024-07-26 11:21:03 +08:00
Kiyoung Kim
8008e22acf
Merge "Remove VSDK related code from build" into main am: deb62cbc41
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3188140
Change-Id: I817e2a414b33aa28ce6460676fa3c43a74e42321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-24 03:52:43 +00:00
Kiyoung Kim
6f701b2882
Remove VSDK related code from build
...
Remove leftover VSDK related code from build, as they are no longer in
use.
Bug: 332986564
Test: AOSP CF build succeeded
Change-Id: Idb34adc37022e71603f150200635ef1fb81e8ec4
2024-07-23 11:29:31 +09:00
Yike Zhang
f5893e405c
Merge "Link shared libs to per test module folder in host-unit-tests.zip" into main am: fb308d3c5d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3163460
Change-Id: Idf8e52891fe5e8afbdfb698d64dc430202fc0529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-12 22:13:10 +00:00
Yike Zhang
fb308d3c5d
Merge "Link shared libs to per test module folder in host-unit-tests.zip" into main
2024-07-12 21:52:51 +00:00
yike
79422c8ed9
Link shared libs to per test module folder in host-unit-tests.zip
...
Downstream testing infra needs per test module folder to be
self-contained to prune dependencies and increase testing efficiency.
Bug: 351909435
Test: presubmit
Change-Id: Icda8982af8eb223ba4ae45be7975dc5aa42a183e
2024-07-12 20:58:37 +00:00
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