StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,289 Commits 1 Branch 0 Tags
b22fb3598107e8ec8851f901b03404f24e812d3a
Commit Graph

80289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yu Liu
3d9c6e9169 Merge "Remove the code for bazel when reading ReleaseAconfigValueSets." into main am: 65287d5dc2 am: 1a91da57f8 am: bac244d6cb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864661

Change-Id: Ie6a3fe572b010c918dcb75a2d12d50a56daa3c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 23:17:17 +00:00
Colin Cross
8c11256574 Merge "Remove bp2build and bazel from soong_ui" into main am: e51c6e4109 am: b5943280a7 am: 029533e94f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864662

Change-Id: I7a9f1ee6eb7f8f68d3ea286f07fed1488b45d3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 23:17:04 +00:00
Yu Liu
bac244d6cb Merge "Remove the code for bazel when reading ReleaseAconfigValueSets." into main am: 65287d5dc2 am: 1a91da57f8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864661

Change-Id: I47474287285a9fefa630b79ada5623fae56c20ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 22:45:33 +00:00
Colin Cross
029533e94f Merge "Remove bp2build and bazel from soong_ui" into main am: e51c6e4109 am: b5943280a7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864662

Change-Id: Ia621b7f0053f4702decf86e06ff12168ac0a78a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 22:45:15 +00:00
Yu Liu
1a91da57f8 Merge "Remove the code for bazel when reading ReleaseAconfigValueSets." into main am: 65287d5dc2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864661

Change-Id: I10fdda8cc2adfdeb8006310197fb5f1a5f4d1d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 22:15:18 +00:00
Colin Cross
b5943280a7 Merge "Remove bp2build and bazel from soong_ui" into main am: e51c6e4109 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864662

Change-Id: Ib5f67be4d01ba331b8c01c262a43891ea09b769c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 22:15:04 +00:00
Yu Liu
65287d5dc2 Merge "Remove the code for bazel when reading ReleaseAconfigValueSets." into main 2023-12-08 21:52:59 +00:00
Colin Cross
8ff105860d Remove ConvertWithBp2build implementations 
Remove the ConvertWithBp2build implementations from all the module
types, along with the related code.

Bug: 315353489
Test: m blueprint_tests
Change-Id: I212672286686a318893bc7348ddd5a5ec51e77a7
 2023-12-08 13:51:05 -08:00
Colin Cross
e51c6e4109 Merge "Remove bp2build and bazel from soong_ui" into main 2023-12-08 21:43:26 +00:00
Xin Li
41968c6c20 Merge Android 14 QPR1 
Merged-In: Ide278450fa058b6dc565bff395f541dc7b574905
Bug: 315507370
Change-Id: I1831ca9b459f19974b0030cb019157e803031511
 2023-12-08 13:13:06 -08:00
Treehugger Robot
de6103b9eb Merge "rust: add aconfig_flag support" into main am: 5ada6c2738 am: f73da3ef78 am: 83e89e81a9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2863750

Change-Id: I8448e1488bec1169befdc76158a625fcb9b14be3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 21:10:53 +00:00
Treehugger Robot
83e89e81a9 Merge "rust: add aconfig_flag support" into main am: 5ada6c2738 am: f73da3ef78 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2863750

Change-Id: I91daf177cc106edd6c36e11b9721c36db5c425ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 20:36:35 +00:00
Cole Faust
df1efd7251 Add compile_data for android apps 
Compile_data is a property on rust rules to declare extra files
that are used by the compiler. In rust's case this happens commonly
with `include_str!()`.

Other compilers like javac or aapt2 don't often reach out to other
files, so it's not as neccessary. But they will follow symlinks.
We're making a change to only include symlinks themselves in sbox
sandboxes, and the targets of the symlinks must be listed
explicitly. For this, we need compile_data to list the targets
of symlinks.

Bug: 307824623
Test: m out/soong/.intermediates/frameworks/base/tools/aapt2/integration-tests/SymlinkTest/AaptSymlinkTest/android_common/lint/lint-baseline.xml with the symlink change
Change-Id: I33eb9cbe4b6eb25e3f33ea0ac9dade88c3d4a624
 2023-12-08 12:34:42 -08:00
Treehugger Robot
f73da3ef78 Merge "rust: add aconfig_flag support" into main am: 5ada6c2738 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2863750

Change-Id: Ide278450fa058b6dc565bff395f541dc7b574905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 20:05:49 +00:00
Treehugger Robot
5ada6c2738 Merge "rust: add aconfig_flag support" into main 2023-12-08 19:35:28 +00:00
Cole Faust
a8ac7bd53f Merge "Fix typo in the comment" into main am: 2237d24894 am: 558e2bd19c am: e0be8911de 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865414

Change-Id: I0c0b71ed63a2f1fb142209c86da25baeb9956448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 19:10:50 +00:00
Cole Faust
bcfc299575 Remove art/test from genrule allowlist 
go/android-busy-beavers-sandboxing

Bug: 307824623
Test: mm in art/test
Change-Id: Ic37343ad873f71461db984b030f6beda5279207c
 2023-12-08 10:57:27 -08:00
Cole Faust
ce74a59bb2 individually escape results of $(locations) 
proptools.ShellEscape escapes mostly by surrounding the string in
quotes. This makes all the files from a $(locations) be passed as
one shell argument if escaping was needed. Escape them individually
so that they're still passed as separate arguments.

Bug: 307824623
Test: running art tests with aosp/2860435
Change-Id: I9940941f4a7bb4d29d9388e4d57f8cbd732b6d32
 2023-12-08 10:53:59 -08:00
Cole Faust
e0be8911de Merge "Fix typo in the comment" into main am: 2237d24894 am: 558e2bd19c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865414

Change-Id: I70335a0c98f91598bf9241052cc9e38d9b2adba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 18:39:04 +00:00
Cole Faust
558e2bd19c Merge "Fix typo in the comment" into main am: 2237d24894 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865414

Change-Id: I6ecf98ae6cd00dc10518716673acea89f7114f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 18:09:10 +00:00
Cole Faust
2237d24894 Merge "Fix typo in the comment" into main 2023-12-08 17:32:43 +00:00
Tor Norbye
cabafdeee0 303434307: Enable flagged API checking 
Also downgrade the new UseSdkSuppress check from error to warning.
And temporarily downgrades FlaggedApi from error to warning until
existing violations are resolved.

Test: The build
Bug: 303434307
Change-Id: Id7802621d567815470dee1aeb815abe214f098cd
 2023-12-08 15:44:20 +00:00
Jihoon Kang
59bb904d6c Merge changes from topic "aconfig_dump_map" into main am: 25c187cc7d am: 1ed5d5ca20 am: 1befeeb5e8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854663

Change-Id: I18069b9fa74f1c72527bff397c61bc5510e7a684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 11:31:22 +00:00
Jihoon Kang
1befeeb5e8 Merge changes from topic "aconfig_dump_map" into main am: 25c187cc7d am: 1ed5d5ca20 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854663

Change-Id: Iacd72283671593f0914420024451a347d9125c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 10:57:22 +00:00
Jihoon Kang
1ed5d5ca20 Merge changes from topic "aconfig_dump_map" into main am: 25c187cc7d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854663

Change-Id: I0d9212e36959c7964e6cbff7228b5ff5dabad32a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 10:27:20 +00:00
Jihoon Kang
25c187cc7d Merge changes from topic "aconfig_dump_map" into main 
* changes:
  Add aconfig flag support for android_app
  Add aconfig flag value text file in aconfig_declarations provider
 2023-12-08 09:48:13 +00:00
Yuichiro Hanada
e42ac1c79b Fix typo in the comment 
Bug: None
Test: m soong_docs and check the generated soong_build.html

Change-Id: I72dd87915f8f5225600365d8ef3f6b9c337a5dbc
 2023-12-08 12:23:15 +09:00
Cole Faust
8172cfb509 Merge "Revert "Handle symlinks in sbox"" into main am: 25861686fe am: 08f46ee8d4 am: ce96639b98 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864655

Change-Id: Ib41661f946ae317dd05c1381dea74b0fc2b682d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 02:28:56 +00:00
Cole Faust
ce96639b98 Merge "Revert "Handle symlinks in sbox"" into main am: 25861686fe am: 08f46ee8d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864655

Change-Id: Iee7203f3f75195524bd606b6c74a1ac5e75334d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 01:55:32 +00:00
Cole Faust
08f46ee8d4 Merge "Revert "Handle symlinks in sbox"" into main am: 25861686fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864655

Change-Id: Ic479fd4e9d4f0fec49ba0e11a52370d2cc4a8d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 01:24:48 +00:00
Colin Cross
8d411ff8f8 Remove bp2build and bazel from soong_ui 
Bug: 315353489
Test: m blueprint_tests
Change-Id: I9df31b18caaae24e3cf2994e56bb90b50523f11e
 2023-12-07 17:14:27 -08:00
Cole Faust
25861686fe Merge "Revert "Handle symlinks in sbox"" into main 2023-12-08 00:43:17 +00:00
Yu Liu
95572ff2da Remove the code for bazel when reading ReleaseAconfigValueSets. 
Bug: 315353489
Test: CI
Change-Id: I652f78df6d9256cdb35b8b498e20bcb76f1437b3
 2023-12-07 16:38:45 -08:00
Colin Cross
7e4ce3aea0 Merge aconfig files per-module am: d788b3e6cb am: 48adf4a040 am: 11e76784fc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860765

Change-Id: Ib36c36ac471d9eea51e4bf8d498006197ffa6eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-07 23:44:32 +00:00
Colin Cross
e8ce5531a4 Merge aconfig files per-module am: d788b3e6cb am: 4c803a0355 am: 09e464d510 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860765

Change-Id: I51631e841ccab5b061199fe03247394a451853af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-07 23:42:56 +00:00
Colin Cross
11e76784fc Merge aconfig files per-module am: d788b3e6cb am: 48adf4a040 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860765

Change-Id: Ifd5b70064b0af0ed9510ff58255a62749839de6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-07 23:10:06 +00:00
Colin Cross
09e464d510 Merge aconfig files per-module am: d788b3e6cb am: 4c803a0355 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860765

Change-Id: I507b5b10db90f2b39be425cfd32d6ebe0f98b957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-07 23:08:30 +00:00
Jihoon Kang
84b2589e6d Add aconfig flag support for android_app 
This change adds an overrideable property flags_packages to android_app,
which is used to list the aconfig_declarations module names that the app
depends on. The build action of android_app is modified to pass all
flags text file provided by the aconfig_declarations to aapt2 link as
--feature-flags arguments.

Test: m nothing --no-skip-soong-tests
Bug: 306024510
Change-Id: I4924f88b9954950cc1936a472cd7ac70f41add5d
 2023-12-07 23:01:26 +00:00
Colin Cross
48adf4a040 Merge aconfig files per-module am: d788b3e6cb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860765

Change-Id: I9eb9134c343f2a3f28422a4f7d51d169b58faa5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-07 22:37:32 +00:00
Colin Cross
4c803a0355 Merge aconfig files per-module am: d788b3e6cb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860765

Change-Id: Ie43ca8826156ff580618cdeda0337db270a82e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-07 22:37:13 +00:00
Jihoon Kang
cca3e0c4b5 Add aconfig flag value text file in aconfig_declarations provider 
Alongside with the generated proto file, the aconfig_declaration now
also outputs a text file that lists aconfig flags and values of its
corresponding proto file, in the format as shown below:
```
my.flag1=true
my.flag2=false
...
```

To prevent confusion between the preexisting proto file and the newly
introduced text file, the change also renames the variables of the proto
file from `intermediatePath` to `intermediateCacheOutputPath` and
likewise.

The utilization of the generated text file will be done in the child
changes.

Test: m out/soong/.intermediates/build/make/tools/aconfig/aconfig.test.flags/intermediate.txt && inspect output
Bug: 306024510
Change-Id: Iee16ad57bb87e992a477fc96502f79e971d01233
 2023-12-07 22:36:08 +00:00
LaMont Jones
0c97185450 rust: add aconfig_flag support 
Bug: b/308625757
Test: manual
Change-Id: Ifd98cd0ad4e2525b08f5766e9332991c049162ea
 2023-12-07 21:56:59 +00:00
Cole Faust
69b5a5f0bf Revert "Handle symlinks in sbox" 
This reverts commit dd9529050d.

Reason for revert: There are at least b/315337725 and b/315036698 issues, reverting this cl while I fix them.

Change-Id: I644bbbe594b9dd53a99a3b6513fbcba68afe0b4a
 2023-12-07 21:40:08 +00:00
Colin Cross
d788b3e6cb Merge aconfig files per-module 
Passing the list of all transitive aconfig files to Make causes extra
Kati analysis runs when dependencies are changed in Android.bp files.
Since Make is going to merge them anyways, merge them per-module and
pass a single aconfig file to Make for each module.

Fixes: 313698230
Test: m out/target/product/vsoc_x86_64/system/etc/aconfig_flags.pb
Change-Id: Ifde4826bc93bc06e40338f72b4cb39eed26ca08d
 2023-12-07 04:17:37 +00:00
LaMont Jones
62f77ac189 Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main am: 7dcbf427f9 am: 78c3daf391 am: 2b1960e9b7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860706

Change-Id: Ic4335fc9379e1b5388371189eafa73368503d854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-06 20:10:36 +00:00
LaMont Jones
0ec3dd4b54 Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main am: 7dcbf427f9 am: b2f6d071a4 am: 7f291b6947 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860706

Change-Id: I6a19370bf54e4fd2c18bc94dc566302e2c57bd3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-06 20:09:03 +00:00
LaMont Jones
2b1960e9b7 Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main am: 7dcbf427f9 am: 78c3daf391 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860706

Change-Id: Ia040751667d67e8aaa2716ac17c56119420ca483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-06 19:47:56 +00:00
LaMont Jones
7f291b6947 Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main am: 7dcbf427f9 am: b2f6d071a4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860706

Change-Id: Icacbee1e62799075f9a82bfbf091abae71ce221e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-06 19:33:03 +00:00
LaMont Jones
78c3daf391 Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main am: 7dcbf427f9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860706

Change-Id: Ibe4edfa6bd523d8f4d7850e7935a435734c2c2f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-06 19:16:59 +00:00
LaMont Jones
b2f6d071a4 Merge "cc: export LOCAL_ACONFIG_FILES for printflags" into main am: 7dcbf427f9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860706

Change-Id: I106ba9459c56890290f515fe2ccc617e9101cc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-06 18:59:50 +00:00