Commit Graph

1211 Commits

Author SHA1 Message Date
Wei Li
6cb6fe0660 Merge "Add license metadata declarations which are moved from device/google/trout/Android.mk." into main am: 5ff777f333 am: b6598cc3b7
Original change: https://android-review.googlesource.com/c/platform/build/+/3065663

Change-Id: I89ffb9f6a99a7226235ebc358e33f25df9e8f904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 23:06:58 +00: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
546ef69fea Merge "sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)" into main am: c80e7eeb77 am: dabe8ef1f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2976591

Change-Id: I86026cba2d201635531f2c5a0ac523290b365aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 20:10:21 +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
892dcdade5 Merge "Add license metadata declarations which are moved from device/google/raviole/Android.mk." into main am: 013330b028 am: 9c4df583b5
Original change: https://android-review.googlesource.com/c/platform/build/+/3063293

Change-Id: Ib8cc9413d2c8ee2df5f1c7460b2b42753413d0fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 19:06:07 +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
5dd1e886d6 Merge "Add license metadata declarations which are moved from device/google/gs101/Android.mk." into main am: 68d63d47af am: b59a63495f
Original change: https://android-review.googlesource.com/c/platform/build/+/3062144

Change-Id: I7c151dcb458487e45b17bdb8f35d3fcb3540e09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-26 02:27:28 +00: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
798eb47d0b Merge "Add license metadata declarations which are moved from device/google/coral/Android.mk." into main am: 5deb660e32 am: 95fdefa267
Original change: https://android-review.googlesource.com/c/platform/build/+/3056782

Change-Id: Id421802bbe7f85986effdb89be1a5f84a81e724d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-25 08:00:49 +00: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
d7348db661 Merge "Add license metadata declarations." into main am: 7f2b0fe594 am: ad5198bdef
Original change: https://android-review.googlesource.com/c/platform/build/+/3042952

Change-Id: Id74cf285b4d3e4214442b6b1ab63d8a99ed321a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 23:24:06 +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
736f1e23fa Merge "Fix is_unit_test in module-info" into main am: 2b92885ea4 am: 78b2198d6a
Original change: https://android-review.googlesource.com/c/platform/build/+/3028378

Change-Id: I8adc0a633c38161f550a9a2b6f9f165912f44ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 18:19:51 +00:00
Yike Zhang
2b92885ea4 Merge "Fix is_unit_test in module-info" into main 2024-04-11 17:45:18 +00:00
Hugo Drumond Jacob
58564478c4 Merge "Added automotive-sdv-tests" into main am: a5a59126c8 am: 7844c27b63
Original change: https://android-review.googlesource.com/c/platform/build/+/3027322

Change-Id: Ide2b116e954459d238b834452029d5cbecc692f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-08 19:08:51 +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
Treehugger Robot
e626dd3330 Merge "Move berberis tests to build/core/tasks" into main am: b4231b3705 am: 6c44d34dfb
Original change: https://android-review.googlesource.com/c/platform/build/+/3011136

Change-Id: I9a1f0f8c9b1a9038ef138297ffc9c9796e16c984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-03 01:54:34 +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
Treehugger Robot
ff7ca182ef Merge "Convert device/sample/Android.mk to Android.bp" into main am: eb59dd9cbd am: a9c4b5ad60
Original change: https://android-review.googlesource.com/c/platform/build/+/3020823

Change-Id: I0689af21f64493994c165fff30d1c8decb9266a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-02 01:39:22 +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
Kiyoung Kim
5e781f324e Merge "Remove PLATFORM_VNDK_VERSION related code" into main am: d3df8b5b06 am: 83b851c938
Original change: https://android-review.googlesource.com/c/platform/build/+/3018445

Change-Id: I0189cdcab500eb9bb12ff8aedb6f3ca2ae3c9865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-29 03:32:41 +00:00
Kiyoung Kim
fdeacfd30a Remove PLATFORM_VNDK_VERSION related code
As of VNDK deprecation, PLATFORM_VNDK_VERSION should no longer be used.
This change removes most of references for PLATFORM_VNDK_VERSION
variable.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: I9293deffc01d2431740c43ecae23719a9171f344
2024-03-28 13:05:05 +09:00
Treehugger Robot
5d47690772 Merge "Dedupe input for target-native-copy-pairs" into main am: 65c865bd05 am: 2536dc3bea
Original change: https://android-review.googlesource.com/c/platform/build/+/3013153

Change-Id: Ic0f14ae680c7a70672f407ef36b15b5d868abc39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-27 02:03:49 +00:00
yangbill
ee0a77ba3a Dedupe input for target-native-copy-pairs
$(ALL_MODULES.$(m).BUILT_INSTALLED) may have duplicated value which may
lead to `overriding commands for target` error.

Bug: 331135912
Test: m ltp
Test: m vts
Test: m vts_kernel_ltp_tests
Change-Id: Ia84ece733cb4062ea5ca1f2f702c145cd4df2a0b
2024-03-26 03:34:41 +00:00
Treehugger Robot
b25b34ede7 Merge "Move frameworks/base/Android.mk to build/core" into main am: 9ba9e0a71e am: 5fe2ba2087
Original change: https://android-review.googlesource.com/c/platform/build/+/2988638

Change-Id: I5e25b65ffb7e72cda7f699e3cbe64086a80a9800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 03:55:28 +00:00
Nelson Li
2b27ed0077 Move frameworks/base/Android.mk to build/core
1. Move the work of `declare-1p-copy-files` to
  `build/core/tasks/meta-lic.mk`.
2. Remove `$(LOCAL_PATH)/pathmap.mk` because the variables defined in
   it are no longer used.
3. The variable `ONE_SHOT_MAKEFILE` is deprecated and can be removed
   directly.
4. Move the work of `offline-sdk-docs` to
   `build/core/tasks/offline-sdk-docs.mk` because Soong cannot specify
   the output path to `$(OUT_DOCS)/`.
5. Move the work of `framework-doc-stubs` to `build/core/Makefile`
   because Soong cannot specify the output path to
   `framework-doc-stubs-metadata_intermediates`, and because
   `SDK_METADATA_FILES` is a dependency of the SDK, it must be moved
   before the SDK's dependencies are determined, and it cannot be moved
   to `build/core/tasks`.
6. `ANDROID_BUILD_EMBEDDED` can be removed because the `.mk` files that
   use this variable are currently not used.

Bug: 322732227
Test: m sdk docs offline-sdk-docs framework-doc-stubs
Change-Id: Ieef40808a0bbaa63a73491ddde0949ae1780e615
2024-03-07 11:25:57 +00:00
Clinton Ke
bfe98e6f89 Merge "Revert "Move frameworks/base/Android.mk to build/tasks"" into main am: 3ac6614666 am: 8a65d66269
Original change: https://android-review.googlesource.com/c/platform/build/+/2990390

Change-Id: I32613470c1b92238459778e1f34bf649ef8b00c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06 05:01:46 +00:00
Clinton Ke
8a65d66269 Merge "Revert "Move frameworks/base/Android.mk to build/tasks"" into main am: 3ac6614666
Original change: https://android-review.googlesource.com/c/platform/build/+/2990390

Change-Id: Icb3c8a629adb2b19e700af8c1a92cb1892ba2ca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06 04:21:11 +00:00
Nelson Li
3c3a6ab8d7 Revert "Move frameworks/base/Android.mk to build/tasks"
Revert submission 2988149-framework_library

Reason for revert: Broken build 11534795 on git_aosp-main-future on sdk-next-userdebug

Reverted changes: /q/submissionid:2988149-framework_library

Change-Id: I065ac8d664cc0e508c849c49e95a52b49d423083
Bug: 328325889
Bug: 328326210
2024-03-06 03:35:37 +00:00
Treehugger Robot
868a75f4ce Merge "Move frameworks/base/Android.mk to build/tasks" into main am: fa31735f7f am: 9b3e3df245
Original change: https://android-review.googlesource.com/c/platform/build/+/2988149

Change-Id: I2e0829c5ce65eb04db883d2c99fe453a13656a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06 01:47:48 +00:00
Treehugger Robot
9b3e3df245 Merge "Move frameworks/base/Android.mk to build/tasks" into main am: fa31735f7f
Original change: https://android-review.googlesource.com/c/platform/build/+/2988149

Change-Id: Ie4671e24d218d748ec4dd3fbb6842cebcf214d2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-06 01:28:06 +00:00
Nelson Li
589e3bc83c Move frameworks/base/Android.mk to build/tasks
1. Move the work of `declare-1p-copy-files` to `meta-lic.mk`.
2. Remove `$(LOCAL_PATH)/pathmap.mk` because the variables defined in
   it are no longer used.
3. The variable `ONE_SHOT_MAKEFILE` is deprecated and can be removed
   directly.
4. Move the main work of generating the targets `docs`,
   `offline-sdk-docs`, and `framework-doc-stubs` to
   `framework_library.mk`. Because Soong cannot specify the output
   to paths such as `$(OUT_DOCS)/` and
   `framework-doc-stubs-metadata_intermediates/`.
5. `ANDROID_BUILD_EMBEDDED` can theoretically be removed because the
   `.mk` files that use this variable are not currently in use, but
   since it involves many other files that are unrelated to this task,
   the work of removing this variable will be moved to other changes.

Bug: 322732227
Test: m docs offline-sdk-docs framework-doc-stubs
Change-Id: Ie51dbf88c78861fc60c6ba9c40542455e4cd4f55
2024-03-05 03:51:49 +00:00
DroidFreak32
a326537e10 sdk-addon: Prevent nested data/ inside $(PRIVATE_STAGING_DIR)
Current logic recursively copies $(PRODUCT_OUT)/data into $(PRIVATE_STAGING_DIR)/data
This leads to creating $(PRIVATE_STAGING_DIR)/data/data on incremental
builds causing emulator to fail to boot.

Test: Build emulator sdk_addon twice, extract the zip, run the emulator
and verify it boots and reaches homescreen

Change-Id: I9e74d2ab28f9fbd67362578672d25d438fad0d53
2024-03-01 17:09:30 +05:30
Wei Li
9f3159b407 Merge "Add meta-lic.mk for declaring license metadata of some 1P files." into main am: 7c48999446 am: c1ed63b8d0
Original change: https://android-review.googlesource.com/c/platform/build/+/2983691

Change-Id: I6f8338cfc9e6b0e465e02b06ffc6fea1d748bc51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 17:41:33 +00:00
Wei Li
c1ed63b8d0 Merge "Add meta-lic.mk for declaring license metadata of some 1P files." into main am: 7c48999446
Original change: https://android-review.googlesource.com/c/platform/build/+/2983691

Change-Id: Ib6bca4f2400a3197fe683107a2c7c3a2d1ff0b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 16:59:44 +00:00
Wei Li
5dd61f03ff Add meta-lic.mk for declaring license metadata of some 1P files.
The 1p files are included in PRODUCT_COPY_FILES and released with products.

Bug: 316805918
Test: CIs
Change-Id: Ibe443af26fb14c1bd84552c9f327a1c2ba8c70a4
2024-02-28 15:15:42 -08:00
Luca Farsi
d51e32afb3 Merge "Split out host shared libs target from general-tests" into main am: ba6f6806c6 am: aff5705707
Original change: https://android-review.googlesource.com/c/platform/build/+/2957818

Change-Id: Id27eeae9589a6f6a05f5d4d418384c175faf4de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 21:33:31 +00:00
Luca Farsi
aff5705707 Merge "Split out host shared libs target from general-tests" into main am: ba6f6806c6
Original change: https://android-review.googlesource.com/c/platform/build/+/2957818

Change-Id: I3db62673775c37a52762dc5283af04435ba0852f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 20:53:24 +00:00
Luca Farsi
a677887047 Split out host shared libs target from general-tests
Split out the building of the host shared libs zip from the
general-tests target so it can be built separately. building
general-tests will still build both.

Test: m general-tests, m general-tests-shared-libs
Bug: 314171817
Change-Id: I99f6d7ae5578d8bc97ddc0c047398defbf9b8cc9
2024-02-20 14:06:02 -08:00
Xin Li
e693b5037e Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I21eb7d5dc8cef9c1dd797ba1ab2ee830a8a5a42b
Change-Id: I42210485ad8f07e19408bef0e5a2af23f6a0e596
2024-01-30 10:33:42 -08:00
Ziwei Zhang
e2bac44173 Package ATS console into CTS.
Test: m cts
Bug: 318325038
Ignore-AOSP-First: enable ATS console internally first
Change-Id: I7acd36f747490bd3f7896972e39861a0a6b369ef
2024-01-24 11:01:57 +00:00
Treehugger Robot
a8e42edae0 Merge "Move fontchain_lint to build/core/tasks" into main am: 34a9a0e851 am: f0d102e022
Original change: https://android-review.googlesource.com/c/platform/build/+/2919067

Change-Id: Ia7514cd740e72496a770ce0bb6cd9e03edffac80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-24 02:52:09 +00:00
Nelson Li
6a699c8d47 Move fontchain_lint to build/core/tasks
Because `system.img` is a dependency of `fontchain_lint`, and
`system.img` is currently not generated inside `Soong`, it is not
possible to directly convert `fontchain_lint` to `Android.bp`.
Move it to build/core/task first.

Bug: 319050958
Test: m fontchain_lint
Change-Id: I2c318f6f51107cd80f0c70531e23f73569b0ec83
2024-01-19 06:59:22 +00:00
Tongbo Liu
361333e74c Enable building executable module partail MTS
Ignore-AOSP-First: MCTS will be tested internally first
Bug: 316484945
Test: m mts-<module>
Change-Id: I676725407028b440d3e502ea4bf98f2ebbfdb0c3
2024-01-18 08:59:55 +00:00
Tongbo Liu
ca0ace3629 Modify the build rule of MTS and MCTS related tests in order to enable
module individual MTS/MCTS test suites to be ran.

Ignore-AOSP-First: MCTS will be tested internally first
Bug: 316484945
Test: m mcts, m mcts-<module>
Change-Id: I3c0dd561a7456e3139e493974072207d188d7348
2024-01-11 07:13:55 +00:00
Tongbo Liu
5bdb4e37d0 Merge "Enable building whole MCTS and partial MCTS test suites." into main 2024-01-05 05:54:35 +00:00
Tongbo Liu
e1052fd939 Enable building whole MCTS and partial MCTS test suites.
Bug: 318608673
Test: m mcts
Change-Id: I2af74e319c40b0e36d8a71e1da3c6934f66a51be
2024-01-04 16:51:03 +08:00
Colin Cross
b9859d0dd8 Merge "Support Soong-generated module-info.json entries" into main am: 7f91599457 am: 99edf49d08 am: 350450c7a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2881408

Change-Id: Iaf98172011497671efcf457aaf0394dec091dcc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-03 18:31:03 +00:00