StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,207 Commits 1 Branch 0 Tags
ab202d1aa28571ba11985f10d199509d826bde3c
Commit Graph

72207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
ab202d1aa2 Merge "Add assets property for Android apps." into main am: c82e844121 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786252

Change-Id: Ic0e687b01f8bee574b415db0e0a57c6ea8070ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 21:15:21 +00:00
Treehugger Robot
c82e844121 Merge "Add assets property for Android apps." into main 2023-10-16 21:01:44 +00:00
Vinh Tran
4b4dc551b0 Merge "Remove restriction on android config in generated rust_library targets" into main am: 59aa97a594 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786780

Change-Id: I6aecfe176cb2ac17d0d4509d731fd81b0a1d63cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 19:35:04 +00:00
Vinh Tran
59aa97a594 Merge "Remove restriction on android config in generated rust_library targets" into main 2023-10-16 19:08:35 +00:00
Jiakai Zhang
ba82e28d5d Add assets property for Android apps. 
This property is similar to `asset_dirs`, but for individual files. This
is especially useful when the user wants to pack generated asset files
into the APK.

Bug: 257532944
Test: m nothing
Change-Id: If3062124e9dedb41315dcaf5d379803e5419b8cd
 2023-10-16 18:53:30 +01:00
Jihoon Kang
8a31dfb8fd Merge changes from topic "stub_validation" into main am: bc98b4151d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640275

Change-Id: Ia73f054b8190789fcaa58c300e4b70e5cf244085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 16:38:56 +00:00
Jihoon Kang
7292538264 Disable full_api_surface_stubs for some java_api_library modules am: d30ac8a32a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2769782

Change-Id: I75cf340b882d0951f961a04d80f5da174311b049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 16:38:52 +00:00
Jihoon Kang
bc98b4151d Merge changes from topic "stub_validation" into main 
* changes:
  Add current api check as validation for from-text stub generation
  Disable full_api_surface_stubs for some java_api_library modules
 2023-10-16 16:34:41 +00:00
Jingwen Chen
9bffe77269 Allowlist //system/linkerconfig am: aea8ba3534 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786164

Change-Id: Idb3aac2e1c07f88e0298682e3a304887f9402b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 07:17:13 +00:00
Jingwen Chen
aea8ba3534 Allowlist //system/linkerconfig 
Test: b test //system/linkerconfig/...
Change-Id: I907524bd412fd6312f9c9478f3635ebbd8c27ce0
 2023-10-16 06:52:41 +00:00
Yu Liu
81b7edc4ae Merge "Handle the case where the release value set is a list." into main am: f613da45db 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787773

Change-Id: I27cb0bd27e2845ef46e69fbfd0b97f61a6ef1cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-14 04:01:46 +00:00
Yu Liu
f613da45db Merge "Handle the case where the release value set is a list." into main 2023-10-14 03:27:30 +00:00
Yu Liu
de1e9982f8 Merge "Allowlist fake_device_config in order to build some java_aconfig_library for host." into main am: 281288177e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2788313

Change-Id: Ic8b18dd7b6d1b7fc16896038ea35465b28c5b77a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-14 00:44:41 +00:00
Yu Liu
281288177e Merge "Allowlist fake_device_config in order to build some java_aconfig_library for host." into main 2023-10-14 00:06:40 +00:00
Yu Liu
eebb259356 Handle the case where the release value set is a list. 
Bug: 304814040
Test: CI, unit test,
b build build/make/tools/aconfig:aconfig.test.cpp
b test build/make/tools/aconfig:AconfigJavaHostTest

Change-Id: I9ca939348a063c39e9528f24e788f9757458d30c
 2023-10-13 16:45:51 -07:00
Treehugger Robot
cb96b84741 Merge "Fix manifest_check.py for generated manifests that have no application tag" into main am: f27f020528 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777931

Change-Id: I3f75673603b96e8ce70e33b5aae84d39fc44eb50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 23:05:38 +00:00
Treehugger Robot
f27f020528 Merge "Fix manifest_check.py for generated manifests that have no application tag" into main 2023-10-13 22:34:46 +00:00
Chris Wailes
72fd3d4e86 Merge "Set incremental or codegen-units, not both" into main am: ed75eef953 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786923

Change-Id: I74bd240aa9c0e0ba0d44c1c4ccfa0ba51e675f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 21:59:30 +00:00
Chris Wailes
ed75eef953 Merge "Set incremental or codegen-units, not both" into main 2023-10-13 21:19:17 +00:00
Vinh Tran
886403712f Merge "Allowlist toolchain/pgo-profiles" into main am: 37f26b9c6e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2783269

Change-Id: I0cb9c5da2845178eb68d70f96b1188e689249e79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 20:54:40 +00:00
Aditya Kumar
6eb5e6aded Merge "Enable hot cold split" into main am: 511bd4207d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2684987

Change-Id: Ia27fad1c688d9d8ea1b2555f9d69ca6bd9e13619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 20:54:06 +00:00
Treehugger Robot
42ed0ff7d7 Merge "Allowlist more frameworks" into main am: 8ec32beb07 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2759607

Change-Id: I467022ae257cd3e10957aadf5552261b585a4876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 20:53:47 +00:00
Yu Liu
873ad35f87 Allowlist fake_device_config in order to build some java_aconfig_library for host. 
Bug: 305255550
Test: CI
Change-Id: Ic073a5fef0acccb7fcbbacb93c9f42ea80e8e154
 2023-10-13 20:50:56 +00:00
Vinh Tran
37f26b9c6e Merge "Allowlist toolchain/pgo-profiles" into main 2023-10-13 20:34:03 +00:00
Aditya Kumar
511bd4207d Merge "Enable hot cold split" into main 2023-10-13 20:30:46 +00:00
Treehugger Robot
8ec32beb07 Merge "Allowlist more frameworks" into main 2023-10-13 20:19:58 +00:00
Colin Cross
a43251d771 Merge "Put shared library R.jar files in the classpath" into main am: 149f6f6f78 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787024

Change-Id: If13a7adfb78ddf43cf1caea012930c47dd305ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 18:42:40 +00:00
Jihoon Kang
063ec003f9 Add current api check as validation for from-text stub generation 
Currently, there is no build action ensuring that the API text files are
up to date, unless a user runs `m checkapi` or `m update-api`. This
means that the user must run `m update-api` after making a change that
modifies api surface(s), so that the API text file reflects the local
change. This adds additional layer of action to developers, and it is
not guaranteed that the developer will always run `m update-api` after
making an api surface-affecting changes.

To prevent such mistake, this change adds droidstub-level api check as
validation for from-text stub generation. With this change, the build
will fail if the API text file is not up to date and the user must run
`m update-api` when making api surface-affecting local changes.

The validation is done by adding all droidstubs modules associated with
the java_api_contributions passed to java_api_library via
`api_contributions` as dependency and setting the current api timestamp
files as the validations for the from-text stubs generating build rule.

The full api surface libraries will not run the validations to avoid
circular dependency. However, all java_sdk_library generated
java_api_library modules will run validations, mapped to the droidstubs
in the same api domaion.

If the user sets the environment variable `DISABLE_STUB_VALIDATION=true`, validation
actions are not run. Validation actions run by default.

Test: m nothing --build-from-text-stub and run ninja query to verify `check_current_api.timestamp`s are listed as validation \
      DISABLE_STUB_VALIDATION=true m nothing --build-from-text-stub and run ninja query to verify that validation actions are not added
Bug: 288624417
Change-Id: I329e6438fe8f3ac30d8c6a971d57853ed6b0d150
 2023-10-13 18:24:41 +00:00
Colin Cross
149f6f6f78 Merge "Put shared library R.jar files in the classpath" into main 2023-10-13 18:08:04 +00:00
Vinh Tran
fb8c5a54ea Remove restriction on android config in generated rust_library targets 
Bug: b/290790800
Test: b build //external/rust/crates/... --config=android
Change-Id: Id06dc94f8bff519c09de7a0de0f1999cf310f599
 2023-10-13 11:51:18 -04:00
AdityaK
4e28d0eda2 Enable hot cold split 
Change-Id: I6752ee000bc72c488ab197f6671514c9e5faa2bd
 2023-10-13 15:35:26 +00:00
Liz Kammer
90bfe3a669 Allowlist more frameworks 
Test: bp2build.sh
Change-Id: If471b5024e077fe2cf12413549103897718036f6
 2023-10-13 08:47:02 -04:00
Jingwen Chen
79526bd72f Merge "Allowlist mainline_modules_sdks_test" into main am: a51d0d7d5c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786179

Change-Id: I21ad1027ffc724a27062cc837c09d7979d86114c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 07:40:00 +00:00
Yike Zhang
d314e6ecbd Merge "Enable pyfakefs in bp2build" into main am: 95a2901e52 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2785347

Change-Id: Id5995e6db249c477c8c9fe3b9d07d7ceee0bcc16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 07:39:42 +00:00
Jingwen Chen
a51d0d7d5c Merge "Allowlist mainline_modules_sdks_test" into main 2023-10-13 07:11:08 +00:00
Yike Zhang
95a2901e52 Merge "Enable pyfakefs in bp2build" into main 2023-10-13 07:08:44 +00:00
Treehugger Robot
7c80f4eb32 Merge "Revert "Add out/partitions_were_clean_at_start_of_build.txt"" into main am: d278e522f9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2787169

Change-Id: I5ee3e32b97221564e74980458b044e7d5a9a7ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-13 06:16:30 +00:00
Treehugger Robot
d278e522f9 Merge "Revert "Add out/partitions_were_clean_at_start_of_build.txt"" into main 2023-10-13 05:32:55 +00:00
yike
bae0b4c761 Enable pyfakefs in bp2build 
`//tools/asuite/atest:java-test-filter-generator-test` requires this
dependency.

Test: presubmit
Bug: 301180123
Change-Id: I9ed0d1a89b34a985c671960546914c039e4e4556
 2023-10-13 03:43:52 +00:00
Cole Faust
e842a6c874 Revert "Add out/partitions_were_clean_at_start_of_build.txt" 
Revert submission 2773149-partition_file_list_check

Reason for revert: b/305103467, b/305103783, b/305103468
Reverted changes: /q/submissionid:2773149-partition_file_list_check

Change-Id: I4116fe908cc914f41dc1bf7e950acb32bc546995
 2023-10-13 02:51:08 +00:00
Vinh Tran
3ce3a959ce Merge "Export rust flags for arm, x86, and x86_64 to Bazel" into main am: 47f0894ceb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775509

Change-Id: I522de441b5952ef1b1c10eb3c21f34a364f8af4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 23:38:12 +00:00
Vinh Tran
47f0894ceb Merge "Export rust flags for arm, x86, and x86_64 to Bazel" into main 2023-10-12 23:10:41 +00:00
Jihoon Kang
d30ac8a32a Disable full_api_surface_stubs for some java_api_library modules 
java_api_library modules generated from java_sdk_library get
full_api_surface_stubs corresponding to the api surface that the module
contributes to. However, modules generated from java_sdk_library where
sdk_version is none should not depend on the full api surface stub jar.

Test: m --build-from-text-stub
Bug: 288624417
Change-Id: I7edda3e6a40f739e805e8719b8d366da765a6933
 2023-10-12 23:05:27 +00:00
Colin Cross
8676c8cba5 Put shared library R.jar files in the classpath 
When building with use_resource_processor: true R.jar files from
shared andoid_library dependencies need to be added to the classpath
so that the generated R classes can be referenced.

Bug: 294256649
Test: m DocumentsUIPerfTests
Change-Id: I30a6bddc3f378ecf58f142f94049e67ba33a47e3
 2023-10-12 16:01:04 -07:00
Liz Kammer
cd432e7a93 Merge "Handle java_resources as deps" into main am: b5c3b018d9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778708

Change-Id: I8d16b122bc785a5cc2c1e34e4a326cd4198d7aca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 21:41:35 +00:00
Liz Kammer
b5c3b018d9 Merge "Handle java_resources as deps" into main 2023-10-12 21:10:37 +00:00
Liz Kammer
b29d829e6b Merge "Change openjdk9 specific props in bp2build/Soong" into main am: c723757dd7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776469

Change-Id: I8a7442b9c93d2888c0f4cf3c99ffd817a3cce305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 20:22:38 +00:00
Liz Kammer
c723757dd7 Merge "Change openjdk9 specific props in bp2build/Soong" into main 2023-10-12 19:47:38 +00:00
Vinh Tran
308096475b Export rust flags for arm, x86, and x86_64 to Bazel 
Test: b build //build/bazel/examples/rust:all --config=android
Bug: 295918553
Change-Id: I53d393f4cc5cd99ccd17d37e32211adaaba5bd0a
 2023-10-12 14:59:50 -04:00
Cole Faust
871d783c17 Merge "Fix TestPrebuiltRootHostWithWildCardInSrc" into main am: ad35c57288 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2786922

Change-Id: I4cb283439c1e2b1ed35018f8d958c49d87ad56fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-12 18:54:55 +00:00