StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,034 Commits 1 Branch 0 Tags
e9f86b6b0bb73e6562b1472baadfaac201358ef4
Commit Graph

79034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Spandan Das
e9f86b6b0b Merge changes from topic "apex_contributions_build_flags" into main am: c31b24977e am: e48000d86f am: 874d391f63 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808754

Change-Id: Iea3c3e3ac6b9ae49c2b54bf78831495b19637df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 03:17:22 +00:00
Spandan Das
874d391f63 Merge changes from topic "apex_contributions_build_flags" into main am: c31b24977e am: e48000d86f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808754

Change-Id: Id30048a37cbfb05ba63e6e53d8c3db4fbc5debe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 02:32:06 +00:00
Spandan Das
e48000d86f Merge changes from topic "apex_contributions_build_flags" into main am: c31b24977e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2808754

Change-Id: Ia7b7a22e9be58e37db8d188eff8cda2a8dc408e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-09 01:58:15 +00:00
Spandan Das
c31b24977e Merge changes from topic "apex_contributions_build_flags" into main 
* changes:
  Special-case java_sdk_library in source vs prebuilt selection
  Use `all_apex_contributions` for source/prebuilts selection
  Create a singleton all_apex_contributions module type
 2023-11-09 01:31:57 +00:00
Treehugger Robot
45f75418a7 Merge "Assign default bug component to targets in this directory." into main am: 38ec22a816 am: e87abab404 am: 30e9ae858d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817577

Change-Id: I19d394950c7b4876faa072fe5b2d150730dd87b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 21:00:11 +00:00
Dan Willemsen
92a4828515 Merge "Update the minimum macos deployment version to 10.14" into main am: f051ec6de2 am: e97d96782b am: 60b48e5c35 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2821057

Change-Id: I2f661ce4ca37517688cb24119c6d49dc68dd1e17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 20:58:07 +00:00
Treehugger Robot
93fc1fcd62 Merge "Assign default bug component to targets in this directory." into main am: 38ec22a816 am: 46621bbae6 am: 5a601e937d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817577

Change-Id: I26a609edd57fdacd56ed1a72e7bf6692463d5e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 20:57:55 +00:00
Dan Willemsen
d200c7b512 Merge "Update the minimum macos deployment version to 10.14" into main am: f051ec6de2 am: 651c415b72 am: 20d91d8647 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2821057

Change-Id: Ib4c8f37f060afe38368c199dc152ee0d92fcfc3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 20:56:58 +00:00
Treehugger Robot
30e9ae858d Merge "Assign default bug component to targets in this directory." into main am: 38ec22a816 am: e87abab404 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817577

Change-Id: Ia9d269d056336915166589b6273f9b919091a812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 20:20:51 +00:00
Dan Willemsen
60b48e5c35 Merge "Update the minimum macos deployment version to 10.14" into main am: f051ec6de2 am: e97d96782b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2821057

Change-Id: I646bb01d596f15c07da7f7b1b467940881b40888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 20:19:00 +00:00
Treehugger Robot
5a601e937d Merge "Assign default bug component to targets in this directory." into main am: 38ec22a816 am: 46621bbae6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817577

Change-Id: I54f54cf3137b87f39043a0a879e7c9922803b398
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 20:15:15 +00:00
Dan Willemsen
20d91d8647 Merge "Update the minimum macos deployment version to 10.14" into main am: f051ec6de2 am: 651c415b72 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2821057

Change-Id: I24848e09db769d747041d50c0fbcddfe4ddc0596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 20:13:54 +00:00
Treehugger Robot
e87abab404 Merge "Assign default bug component to targets in this directory." into main am: 38ec22a816 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817577

Change-Id: I4d9ef63ddd254a560589e1537c4e7272e291d3d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 19:33:31 +00:00
Dan Willemsen
e97d96782b Merge "Update the minimum macos deployment version to 10.14" into main am: f051ec6de2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2821057

Change-Id: Ia9dd5c2e109135bc20f24e8af1af7f90d37d6481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 19:32:58 +00:00
Treehugger Robot
46621bbae6 Merge "Assign default bug component to targets in this directory." into main am: 38ec22a816 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817577

Change-Id: I464fdf85936f3a82942e320286b309eac104a140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 19:31:27 +00:00
Dan Willemsen
651c415b72 Merge "Update the minimum macos deployment version to 10.14" into main am: f051ec6de2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2821057

Change-Id: I79c5910160383ffb10fee7cf893f7e126bfbc5fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 19:24:45 +00:00
Treehugger Robot
38ec22a816 Merge "Assign default bug component to targets in this directory." into main 2023-11-08 18:52:32 +00:00
Dan Willemsen
f051ec6de2 Merge "Update the minimum macos deployment version to 10.14" into main 2023-11-08 18:46:51 +00:00
Spandan Das
fc12d2f494 Special-case java_sdk_library in source vs prebuilt selection 
If a java_sdk_library is listed in `contents`, then restrict the source
vs prebuilt selection superseding to only the internal stub libraries.

Defer the source vs prebuilt selection mechanism of the top-level
library to the existing mechanisms for now. This is necessary because
this top-level library acts as a hook for
- hiddenapi: boot jars are deapxed from the prebuilt apex
- dexpreopt: system server jars are deapexed from the prebuilt apex and
  installed via required

If `next` uses `framework-foo` and `service-foo` as the top-level
library instead of the prebuilt equivalents, then the bootjars installed
in out/soong/dexpreopt_x86_64/apex_bootjars will come from source. And
the *.odex files of the system server jars will come from source.

Bug: 308174768
Test: Added a java_sdk_library unit test to assert that the new
mechanism supersedes the `prefer` flag

Change-Id: Ib43198a3b547c58b54f1f0966e95584215096d32
 2023-11-08 18:37:24 +00:00
Spandan Das
1c4d94dccf Use all_apex_contributions for source/prebuilts selection 
This flattened singleton module explicitly lists by module name whether source or
prebuilt version of a module should be used. If a module appears in this
metadata module, it supersedes all other source vs prebuilts selection
mechanism

Implementation details
- Update the module dep chain from <source> --> <prebuilt> to <source>
  --> <prebuilt> --> all_apex_contributions
- all_apex_contributions sets a provider which is bubbled up
  to the source module. This requires changing `prebuilt_select` to a
  bottom up mutator
- Update `usePrebuilt` to consult the new provider before falling back
  to existing source vs selection mechanisms. If (foo|prebuilt_foo) is
  listed in the selected `apex_contributions` modules, it
  will be used superseding any other selection mechanisms.
- Update this depTag to IsMetaDepTag so that bootclasspath_fragment's
  validation ignores this new dependency.

Test: Added unit tests to assert that this new mechanism supersedes
`use_source_config_var`

Bug: 308174768
Change-Id: I39a85639642711f3c96b6f18b94d626b55e80c66
 2023-11-08 18:37:24 +00:00
Spandan Das
e3fcb41ff7 Create a singleton all_apex_contributions module type 
This will be a container for the the apex_contributions
selected using build flags. This module will be used to query the state of
selected apex contributions instead of a global that can be mutated by
anyone.

It will set a provider containing metadata for source vs prebuilts
selection. To reduce the overhead of a new mutator, this will be done in
the existing `prebuilt_select` mutator.

It will validate that there are no dups (`foo` and `prebuilt_foo` cannot
be both selected)

Bug: 308174923

Test: go test ./android

Change-Id: Ie42999a71f35d70e0e977f5ab07ce451608d9f35
 2023-11-08 18:37:18 +00:00
Ronish Kalia
7e30bf00e2 Assign default bug component to targets in this directory. 
This CL is being created to improve the test attribution in android. It has
been found that the tests owned by this OWNERS are not not being attributed
to a buganiser component.
This is part of a bigger effort to attribute all of the aosp code. 

If you think that the buganiser component is not correct please update
this CL with correct component and drop a +2. We will use the updated component and merge the CL

Bug: 309090038
Change-Id: Ia9dbd8ada1fc9c3ab358c8992d804925f6719f3c
Test: N/A
 2023-11-08 16:19:51 +00:00
Jiakai Zhang
c88a04b0f0 Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d5443 am: b39cf8346f am: c627efa675 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816578

Change-Id: Ie9772c0dd2ff2109c319bb13f7d9dbba13a05c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 12:09:15 +00:00
Jiakai Zhang
77d4619b1b Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d5443 am: f3c1e6f8fe am: 7dbbbd43ba 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816578

Change-Id: I437d8e0f093fb79778c82507ba2207d3888e994a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 12:07:32 +00:00
Anton Hansson
ab748699a2 Merge "Stop suppressing the ChangedDefault error" into main am: d69b5ff1b2 am: 45114303f5 am: 6db55ca70f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818838

Change-Id: I05b3422d48c8ccf3b40524ebe513a291056b1cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 12:06:09 +00:00
Anton Hansson
1d9c31c701 Merge "Stop suppressing the ChangedDefault error" into main am: d69b5ff1b2 am: ca3bfaba87 am: b079b4c261 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818838

Change-Id: If594ee3a8250f12f847f7c8a6c3a407547dd28b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 12:05:52 +00:00
Jiakai Zhang
c627efa675 Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d5443 am: b39cf8346f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816578

Change-Id: I845ec912f57cb4a5eb4b02174eaff733a783c210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 12:00:46 +00:00
Jiakai Zhang
7dbbbd43ba Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d5443 am: f3c1e6f8fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816578

Change-Id: I0e1d12c50b9c2c67ba5a55b89eb97ffe6ec5b84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 11:58:28 +00:00
Jiakai Zhang
b39cf8346f Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d5443 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816578

Change-Id: I2c25896a1495fb64709dc51f4bd253ed7fc59e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 11:28:53 +00:00
Jiakai Zhang
f3c1e6f8fe Merge "Use the correct mainline BCP jars for app dexpreopt." into main am: 04445d5443 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2816578

Change-Id: I533792e84af2417c260b5f9afcc6387f78eb16b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 11:26:01 +00:00
Anton Hansson
6db55ca70f Merge "Stop suppressing the ChangedDefault error" into main am: d69b5ff1b2 am: 45114303f5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818838

Change-Id: Ic2e4a177ab3022f50d3a3fd8aac99eeca6703601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 11:22:59 +00:00
Anton Hansson
b079b4c261 Merge "Stop suppressing the ChangedDefault error" into main am: d69b5ff1b2 am: ca3bfaba87 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818838

Change-Id: Iefc2441f429fc3db6b648b48deb58a4d1fe488f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 11:21:04 +00:00
Jiakai Zhang
04445d5443 Merge "Use the correct mainline BCP jars for app dexpreopt." into main 2023-11-08 10:56:58 +00:00
Anton Hansson
45114303f5 Merge "Stop suppressing the ChangedDefault error" into main am: d69b5ff1b2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818838

Change-Id: I4d668824a55df53562943c2066274cdda7c5cbaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 10:52:19 +00:00
Anton Hansson
ca3bfaba87 Merge "Stop suppressing the ChangedDefault error" into main am: d69b5ff1b2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2818838

Change-Id: I28b3f68058d8f5e4951ef2e845906dbbe873bbfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 10:49:28 +00:00
Anton Hansson
d69b5ff1b2 Merge "Stop suppressing the ChangedDefault error" into main 2023-11-08 10:23:42 +00:00
Treehugger Robot
26cd4d7914 Merge "Export build flags to soong." into main am: 2ab031f467 am: d238b06572 am: bc5347bca2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2803674

Change-Id: I7577ba0fc380b4b626ca8404050c3f9325a043af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 05:58:38 +00:00
Treehugger Robot
8f14181875 Merge "Export build flags to soong." into main am: 2ab031f467 am: 1d6e69cda7 am: 5ef54931f0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2803674

Change-Id: I52af4213a59f60378f0c1679ae19f00a3dea4c34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 05:57:57 +00:00
Treehugger Robot
bc5347bca2 Merge "Export build flags to soong." into main am: 2ab031f467 am: d238b06572 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2803674

Change-Id: Ieaca2910d7861622cf3ddbb9735943af9107365e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 05:16:56 +00:00
Treehugger Robot
5ef54931f0 Merge "Export build flags to soong." into main am: 2ab031f467 am: 1d6e69cda7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2803674

Change-Id: I461eb37e742ea0dd6116af5501832582033c5e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 05:14:44 +00:00
Treehugger Robot
d238b06572 Merge "Export build flags to soong." into main am: 2ab031f467 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2803674

Change-Id: I45035f8c9fb8a57c62cf7d3ef9e141c7bdb0ca37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 04:46:57 +00:00
Treehugger Robot
91ed5f5fd9 Merge "Only enable MLGO for ARM64 ThinLTO targets" into main am: 6a8eb37d90 am: 3b84cba0fb am: 46ebc03e61 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817703

Change-Id: If4d18e0cdb8c60af7556711c81095e7704c764eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 04:46:23 +00:00
Treehugger Robot
690b7c89f5 Merge "Only enable MLGO for ARM64 ThinLTO targets" into main am: 6a8eb37d90 am: 9865ce419b am: 7875d9753c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817703

Change-Id: I969cbb827f82aea8c3bd8d0d760ea3a0864ecc35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 04:45:15 +00:00
Treehugger Robot
1d6e69cda7 Merge "Export build flags to soong." into main am: 2ab031f467 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2803674

Change-Id: I4904c9cd21307c4d690f683b3c9c1ecdbc600052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 04:44:06 +00:00
Treehugger Robot
2ab031f467 Merge "Export build flags to soong." into main 2023-11-08 04:15:17 +00:00
Treehugger Robot
46ebc03e61 Merge "Only enable MLGO for ARM64 ThinLTO targets" into main am: 6a8eb37d90 am: 3b84cba0fb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817703

Change-Id: I965821051173e27a4af156ef07c2255caeebd6eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 04:04:50 +00:00
Treehugger Robot
7875d9753c Merge "Only enable MLGO for ARM64 ThinLTO targets" into main am: 6a8eb37d90 am: 9865ce419b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817703

Change-Id: Ie4af786ed8fd1bf752a937d1e1aaad643c2bd9c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 04:02:24 +00:00
Inseob Kim
e4e85d5f9f Export build flags to soong. 
This exports a map of build flags used in this release config to Soong.

Bug: 302514918
Test: manual
Change-Id: Id95c03e14cfbb91c0cb9c8c37a065b8387733317
 2023-11-08 04:01:38 +00:00
Treehugger Robot
3b84cba0fb Merge "Only enable MLGO for ARM64 ThinLTO targets" into main am: 6a8eb37d90 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817703

Change-Id: I617e829686e4efd049c7ef7e818b4265588f17d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 03:35:00 +00:00
Treehugger Robot
f6bd625f40 Merge changes from topic "apex-elf-checker" into main am: a19c9141aa am: 492abae6c7 am: 8e8fe1607f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2817254

Change-Id: I1693ebf59b59b56d228cc3d822116f296935b5e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-08 03:34:52 +00:00