Treehugger Robot
8ba52630ec
Merge "Move the dist
target of mke2fs
to build/core/tasks
" into main am: 4c068a1b67
am: 32a5ff42d5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3271533
Change-Id: Ib0b10e96a60ee209eb16b915b50b1acabfcc9136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-23 03:10:34 +00:00
Treehugger Robot
4c068a1b67
Merge "Move the dist
target of mke2fs
to build/core/tasks
" into main
2024-09-23 02:35:53 +00:00
Luca Farsi
21f24aafea
Merge "Split out host shared libs target from device-tests" into main am: ccd39a1f18
am: 33e87e3f7d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3266094
Change-Id: Ia9b41f1db0e03c83db367bb205a17d1c74d23444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-19 22:10:23 +00:00
Luca Farsi
0b73dde4e9
Split out host shared libs target from device-tests
...
Split out the building of the host shared libs zip from the device-tests
target so it can be build separately. Building device-tests still still
build both.
Test: m device-tests, m device-tests-shared-libs
Bug: 366308541
Change-Id: I13741ce22823622a6bf4744cb55026765c188b8c
2024-09-19 12:05:06 -07:00
Nelson Li
21ba377f5a
Move the dist
target of mke2fs
to build/core/tasks
...
Because `mke2fs`, `make_f2fs`, and `make_f2fs_casefold` have
`recovery_available` set to true, Soong forcibly adds a new variation
with a `_recovery` suffix to the existing variations. If this is
directly added to the `dist` of the corresponding module, it will cause
duplication of the `android_recovery_<arch>/meta_lic` and
`android_<arch>/meta_lic` files.
Therefore, it is temporarily moved to `build/core/tasks`. Once the
issues are resolved, they will be moved to the corresponding modules.
Bug: 349741178
Test: m sdk dist
Change-Id: I1bea3aa2f42334c9ed14bf766aaa7e6f428ed35a
2024-09-19 07:20:46 +00:00
Treehugger Robot
e468ef50c3
Merge "Move building bootloader/radio image task to proper place" into main am: c2b351babb
am: f00af6db55
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3261778
Change-Id: Icdcda9c442d1ea2c0f5b8e3722393cea66f1a65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-12 07:43:41 +00:00
Treehugger Robot
c2b351babb
Merge "Move building bootloader/radio image task to proper place" into main
2024-09-12 07:22:38 +00:00
Treehugger Robot
e8d128c350
Merge "Move copy destination to "sts-sdk"" into main am: 6fbebd4570
am: 3d9f7146e4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3254921
Change-Id: I31a53129e713703540a62a86eed2439d7ada5a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 22:15:00 +00:00
Treehugger Robot
6fbebd4570
Merge "Move copy destination to "sts-sdk"" into main
2024-09-11 21:58:14 +00:00
Herbert Xue
48ab2f75c2
Move building bootloader/radio image task to proper place
...
Move the task of building bootloader/radio images and unpack their
partitions to build/core/tasks/tools.
Bug: 359426542
Test: presubmit
Change-Id: I3ac1a1a6eb0e21fb1eac6db628e094a13c9fc73f
2024-09-11 10:04:16 +08:00
Treehugger Robot
0af3dd86be
Merge "Move the creation of the root structure to build/core/main.mk" into main am: 963298af97
am: 2af5d1063f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3261773
Change-Id: I4ae21b49d5963f10c3c554d10b7b09e80fbd6633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-11 01:15:14 +00:00
Treehugger Robot
963298af97
Merge "Move the creation of the root structure to build/core/main.mk" into main
2024-09-11 01:01:40 +00:00
Nelson Li
1646e5c028
Move the creation of the root structure to build/core/main.mk
...
Since Soong currently doesn't support the `install_directory`
functionality, `system/core/rootdir/Android.mk` cannot be directly
converted to Android.bp. Moreover, its main content is to create
directories and symlinks for the root file system. Therefore, we'll
first rename it and move it to build/core/main.mk for handling.
In addition, consolidate the handling of meta-lic related parts into
`build/core/tasks/meta-lic.mk`.
Bug: 353642907
Test: m -j init.environ.rc
Change-Id: Ie8f8bcae5752d22c331b33a33981a959410f0a69
2024-09-10 06:51:10 +00:00
Chris Dombroski
daca2e7783
Move copy destination to "sts-sdk"
...
Also remove packaged Java
Bug: 364712647
Test: manual
Change-Id: I5b32aaa7b13ca5f4967e6214ce81dbe3fbd58791
2024-09-04 23:07:02 +00:00
Treehugger Robot
6b0523139e
Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main am: 6ed53f2e44
am: 54ab3cf7b3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3249611
Change-Id: I534c6102dfa739bc99a39424a8dbe3fb7d62760a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-04 04:46:53 +00:00
Treehugger Robot
54ab3cf7b3
Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main am: 6ed53f2e44
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3249611
Change-Id: Icc6f1bd00a05d478da2311fa13d909c79868f729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-04 04:37:45 +00:00
Herbert Xue
3e3cbeb3a5
Move COMPATIBILITY.tradefed_tests_dir to proper place
...
Bug: 341873065
Test: presubmit
Change-Id: Ibd99b07b8548eafb72254fda2a248b9ec32ee8ef
2024-08-29 14:46:50 +08:00
Qing Shen
c0d11633cd
Merge "Revert "Revert "Add a coverage suffix to avoid Ninja file regene..."" into main am: 1b8b8d23c4
am: 4e47c08b5e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3238688
Change-Id: Ib9bb0fe27fd9c8161dc46821c8c6375d1b3627eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-23 23:34:28 +00:00
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
bfbe6ce4a1
Merge "Don't pack target tests into art-host-tests.zip." into main am: cb56fa972b
am: 9ebd27ffcc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3232722
Change-Id: I98d2cf4de9cb9c80281e0c4d3842c08f5bb3cac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-20 21:50:26 +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
8e74b3449d
Merge "Update sts-sdk to use new source" into main am: 9fe7f1fa9e
am: 0038482750
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3206023
Change-Id: I109b8fdd0256f6a73df93304552562f08b299214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-08 19:02:14 +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
c2ecf3102e
Merge "Move license metadata declaration of cuttlefish/Android.mk into meta-lic.mk" into main am: ff301aa3a9
am: c1fbe7acf3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196133
Change-Id: I06ee52b3c79719e2b5c13f79010b754dedc69be4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-01 07:34:04 +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
05108eb8cd
Merge "Remove VSDK related code from build" into main am: deb62cbc41
am: 8008e22acf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3188140
Change-Id: I97fe0ed3826a317faaef3558c2949fc0e91b5ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-07-24 04:07:15 +00: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
Tongbo Liu
21f99de4b2
For android-mcts-<module>.zip, we use mts-tradefed.
...
For android-mcts.zip, we use mcts-tradefed.
Ignore-AOSP-First: test for mainline internal use
Change-Id: Id5c41d525574c8f4787fb0f94adc0db0f4ccfd38
Test: m mcts
Bug: 354254853
2024-07-23 08:38:47 +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
Tongbo Liu
27e0ce0459
Fix MCTS test suite name to enable partial downloading.
...
Ignore-AOSP-First: test for mainline internal branch
Change-Id: I94f8aedac538fbc90bfe28cd94088407a2f19c33
Test: m mcts
Bug: 332423968
2024-07-16 11:06:08 +00: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