Commit Graph

1202 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
Colin Cross
3b89c6532a Support Soong-generated module-info.json entries
Allow Soong modules to generate their own module-info.json entries
by merging Soong's module-info.json file into the one generated in
Make.

Skip collecting unnecessary ALL_MODULES.$(my_register_name).*
that are only used for module-info.json if the module was already
handled by Soong via the LOCAL_SOONG_MODULE_INFO_JSON property.

Bug: 309006256
Test: Compare module-info.json
Change-Id: I2c9db3c7c7bae7bd6cb889d7ebc2e383c278c82d
2024-01-02 17:21:22 -08:00
Colin Cross
23a54e11ab Merge "Simplify module-info.json by leaving out optional fields" into main am: 8bb8482755 am: 78c9696aea am: 84035d9743
Original change: https://android-review.googlesource.com/c/platform/build/+/2835094

Change-Id: Id7f1e3dd8f568cf1cd173cde59d8cb7a558535e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 02:15:45 +00:00
Colin Cross
4ea5e85143 Simplify module-info.json by leaving out optional fields
Every field in module-info.json has at least "[]".  Add functions to
only write the values when they are non-empty to reduce the size
and ease comparison when module-info.json is written by Soong.

Bug: 309006256
Test: atest --host toybox-gtests --test-timeout=120000
Change-Id: I200e8c8fd9727b4cffa9b82318f4433fd630e933
2023-11-29 10:18:52 -08:00
Colin Cross
8c10c1abc3 Merge "Store ALL_DEPS under my_register_name" into main am: 6b35685744 am: a9b72f9311 am: b62c7d7a49
Original change: https://android-review.googlesource.com/c/platform/build/+/2835092

Change-Id: Ib4294dc19ebea2bb3ef94321995e44636119e1d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-17 22:47:33 +00:00
Colin Cross
9cb51b7446 Store ALL_DEPS under my_register_name
ALL_DEPS was original stored in ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS for
use by the old licensing code.  That has been removed, and it is now
only used by module-info.json.  Storing it with $(LOCAL_MODULE) causes
_32 entries in module-info.json to be missing dependencies, and causes
the dependencies from _32 variants to be squashed into the normal
variants.  Replace ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS with
ALL_MODULES.$(my_register_name).ALL_DEPS.

Test: builds
Change-Id: Ieddfcddd8547b61bd938ae051beb738268aac5af
2023-11-16 11:46:40 -08:00
Colin Cross
b874694de5 Merge changes I2ca9e674,I7e0db3c0,I7e1b6268,I0fa6a46e,I04e8178a into main am: b5ec156b32 am: 6281ca70d0 am: 4354a51b61
Original change: https://android-review.googlesource.com/c/platform/build/+/2815683

Change-Id: Ief41c26347b063163bf45d3cd0a39468fdb0f650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-03 17:01:05 +00:00
Colin Cross
1b7f072505 Remove obsolete ide.mk and related code
The code to generate an eclipse classpath is obsolete, remove it and
related code.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I7e1b6268b98ecbb7be88db8945dd7b30acc695ba
2023-11-02 10:16:57 -07:00
Jeff Hamilton
426a9f8f02 Move most version variable out to relase configs.
This allows finer control of the version variables
per release config, and removes a lot of computed
logic in favor of just directly setting the values.

Bug: 306702353
Test: lunch <device>-next-userdebug && m -j98
Change-Id: I9edc7171d124f0cfa540fea6f0e06ba877910444
Ignore-AOSP-First: Changes in internal projects first.
Merged-In: I9edc7171d124f0cfa540fea6f0e06ba877910444
2023-10-24 16:41:58 +00:00
Baligh Uddin
186888303d Revert^2 "Move most version variable out to relase configs."
69b38b52b6

Change-Id: I67c9ac7869fcad54f3b0b93a04e9dda5f97861d6
Bug: 306702353
Test: TH and local
2023-10-24 14:19:52 +00:00