StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,639 Commits 1 Branch 0 Tags
789a53f28c300860fa82b29deb38a8e4d475b51a
Commit Graph

8274 Commits

Author SHA1 Message Date
Cole Faust
99bec75197 Create EXTRA_INSTALL_ZIPS variable 
Make needs to know about the "extra" zip files that are extracted
to the staging directories so that it can track all the installed files
correctly.

Also add a utility tool for listing the contents of relevant zips.

Bug: 337869220
Test: m droid and checked the contents of file_list.txt when adding an android_app_set locally
Change-Id: Idc5dd785b03c05f7972c66620d4e6359892b3863
 2024-05-09 14:20:11 -07:00
Colin Cross
d7b2a45d47 Revert "Convert overrides to a TransitionMutator" 
This reverts commit 49be24b833.

Reason for revert: b/338643193
Bug: 319288033
Bug: 338643193

Change-Id: I7106e779e52ffc943bdcf7ee3b7c7b65fe34122e
 2024-05-09 20:18:49 +00:00
Pedro Loureiro
57b1b6802f Add RELEASE_APEX_CONTRIBUTIONS_PRIMARY_LIBS build flag 
Bug: 339132327

Test: m out/soong/prebuilt_info.json
Test: manually inspect that json file
Change-Id: Ib20164c82316fe02fe04a52461e344f1dfb03b90
 2024-05-09 16:11:05 +00:00
Treehugger Robot
1ee43f66ef Merge "Revert^2 "Remove compilation actions from java sdk library"" into main am: 7eaf503cfd am: b2923453b8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3079425

Change-Id: I0b7ae717b6af9df90420ec87acaf20932cdc7fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-08 23:10:55 +00:00
Treehugger Robot
7eaf503cfd Merge "Revert^2 "Remove compilation actions from java sdk library"" into main 2024-05-08 22:28:05 +00:00
Jihoon Kang
a3a05460b4 Revert^2 "Remove compilation actions from java sdk library" 
This change modifies the build actions of java_sdk_library module type
so that it does not perform any compilation actions (i.e. does not
create the top level java_sdk_library jar file). Instead, it delegates
the build actions the top level jar file was performing to the
dynamically created ".impl"-suffixed java library module. The build
actions that are delegated to the impl library module include hiddenapi
processing, dexing, and dexpreopt.

This change relands https://r.android.com/3035972. Implementation
changes from the original change:
- "all_apex_contributions" is added as a dependecy to the implementation
  library modules where the parent sdk_library module has a prebuilt
  equivalent. This allows the source apex variant to be hidden from make
  when the prebuilt is active.

Test: patch in internal main, lunch barbet-ap2a-userdebug && m nothing
Test: m nothing --no-skip-soong-tests
Bug: 332785297
Change-Id: I017938e5567aef82e428e7ceb557d9c9090e0257
 2024-05-08 17:46:31 +00:00
Cole Faust
3f01580c04 Merge "Make the enabled property configurable" into main 2024-05-07 17:49:10 +00:00
Jooyung Han
c1f40229a1 Merge ".capex is a container" into main am: 197b56f58b am: 8cd447857f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3074023

Change-Id: I7fb80b37bd6a430b30d5bbc8e0b926737235f400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-07 02:23:14 +00:00
Jooyung Han
8cd447857f Merge ".capex is a container" into main am: 197b56f58b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3074023

Change-Id: I65a3cc52c45e1dae4dbc6de644f3f1ec2bfe571f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-07 01:55:50 +00:00
Jooyung Han
197b56f58b Merge ".capex is a container" into main 2024-05-07 01:36:41 +00:00
Jihoon Kang
4a309b5eac Merge "Revert "Remove compilation actions from java sdk library"" into main am: 5284ad3b33 am: 87296e35d3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3074636

Change-Id: I96f97fef6e4dd7dd43ec3c1f65a29541c748a84c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-07 01:02:28 +00:00
Jihoon Kang
87296e35d3 Merge "Revert "Remove compilation actions from java sdk library"" into main am: 5284ad3b33 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3074636

Change-Id: If4a161286b3f03bcbdc1f387487fba72701787ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-07 00:24:51 +00:00
Jihoon Kang
5284ad3b33 Merge "Revert "Remove compilation actions from java sdk library"" into main 2024-05-07 00:03:05 +00:00
Jihoon Kang
8f25d296b5 Revert "Remove compilation actions from java sdk library" 
Revert submission 3070882-sdk_lib_remove_compilation

Reason for revert: Potential culprit for build breakage of barbet-ap2a-userdebug in git_main

Reverted changes: /q/submissionid:3070882-sdk_lib_remove_compilation

Change-Id: I5135760e13e0152480c68fe91a3c88564e9bc7cb
 2024-05-06 22:40:22 +00:00
Treehugger Robot
a4b92f490d Merge "Remove compilation actions from java sdk library" into main am: f91daab1ab am: e5011d8f23 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3035972

Change-Id: I88d9dd8c3dabea01588455c92d8a734e93206e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-06 21:39:08 +00:00
Treehugger Robot
e5011d8f23 Merge "Remove compilation actions from java sdk library" into main am: f91daab1ab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3035972

Change-Id: I2df9d4940eb12bb8d8cb46d05bfef05d2666ae8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-06 21:24:03 +00:00
Treehugger Robot
f91daab1ab Merge "Remove compilation actions from java sdk library" into main 2024-05-06 21:06:54 +00:00
Christopher Ferris
a5684b4155 Merge "Replace Malloc_not_svelte with Malloc_low_memory." into main am: be83e748d4 am: e50baa56c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3064403

Change-Id: I6042e05ac18bb2d2e021345c2799c0502a0dd333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-06 20:15:42 +00:00
Christopher Ferris
e50baa56c6 Merge "Replace Malloc_not_svelte with Malloc_low_memory." into main am: be83e748d4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3064403

Change-Id: I01a7b7f206e72b22cea1764b9cac358bda121471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-06 19:59:40 +00:00
Christopher Ferris
be83e748d4 Merge "Replace Malloc_not_svelte with Malloc_low_memory." into main 2024-05-06 19:45:05 +00:00
Jiyong Park
b4bf62eb48 Merge changes from topic "revert-3069323-revert-3066748-duplicate_entry_fs-CIBDJQYRHU-FVLDIVWUZV" into main am: 7c9ab4f5b1 am: 321db03358 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069326

Change-Id: I643aaef5642ea926c7ba057f3e6994788a58fe0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-04 04:31:08 +00:00
Jiyong Park
321db03358 Merge changes from topic "revert-3069323-revert-3066748-duplicate_entry_fs-CIBDJQYRHU-FVLDIVWUZV" into main am: 7c9ab4f5b1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069326

Change-Id: I0b816b90f97b7a1ae1cb10afa3dc0115b25a83ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-04 04:09:02 +00:00
Jiyong Park
7c9ab4f5b1 Merge changes from topic "revert-3069323-revert-3066748-duplicate_entry_fs-CIBDJQYRHU-FVLDIVWUZV" into main 
* changes:
  Revert^2 "Filesystem modules follow the installation semantic"
  Revert "Revert "Prevent multiple PackagingSpecs having same inst..."
 2024-05-04 03:56:55 +00:00
Treehugger Robot
44d8589920 Merge "Correct the order of the SdkKinds" into main am: b92fc67f50 am: c6d2c47381 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3074864

Change-Id: If0424ebb71c278ffb36dab796f3545e0ef3ce0e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-04 02:08:40 +00:00
Treehugger Robot
c6d2c47381 Merge "Correct the order of the SdkKinds" into main am: b92fc67f50 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3074864

Change-Id: I28c96738139b0da7cb598ed14b9f5370e97ad150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-04 01:46:48 +00:00
Treehugger Robot
b92fc67f50 Merge "Correct the order of the SdkKinds" into main 2024-05-04 01:17:19 +00:00
Jihoon Kang
248cc0072c Correct the order of the SdkKinds 
Currently, all sdkKind enums are ordered from the narrower api surface to
the wider api surface, with the exception of the toolchain api surface.
This change corrects the order of the toolchain api surface so that the
enum entries are sorted in the correct order.

Test: m nothing --no-skip-soong-tests
Bug: 338660802
Change-Id: Iad4205c9ce1a83be2f7d80647366fba78e9805ca
 2024-05-04 00:06:59 +00:00
Jihoon Kang
d831af4267 Remove compilation actions from java sdk library 
This change modifies the build actions of java_sdk_library module type
so that it does not perform any compilation actions (i.e. does not
create the top level java_sdk_library jar file). Instead, it delegates
the build actions the top level jar file was performing to the
dynamically created ".impl"-suffixed java library module. The build
actions that are delegated to the impl library module include hiddenapi
processing, dexing, and dexpreopt.

Test: m nothing --no-skip-soong-tests
Bug: 332785297
Change-Id: I7534f9eaacf6d9f72fbf8d540b1e26af84106c20
 2024-05-03 20:51:11 +00:00
Colin Cross
c1f18c9905 Merge "Convert overrides to a TransitionMutator" into main am: 5694d3f290 am: 1c15c15d96 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070707

Change-Id: I1ed999f46f5a487fce46c51d9662b1ef5377ebeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-03 18:17:14 +00:00
Colin Cross
1c15c15d96 Merge "Convert overrides to a TransitionMutator" into main am: 5694d3f290 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070707

Change-Id: If6a4185805383ea12e8b217fd37c698cbe519a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-03 17:59:02 +00:00
Colin Cross
5694d3f290 Merge "Convert overrides to a TransitionMutator" into main 2024-05-03 17:54:51 +00:00
Treehugger Robot
894873fa71 Merge "Use no_full_install: true instead of installable: false" into main am: baaa1b1eeb am: 5e9bb5ac70 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069502

Change-Id: If40a5db218f734d21438d5c1c2542aebd49255bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-03 15:51:10 +00:00
Treehugger Robot
5e9bb5ac70 Merge "Use no_full_install: true instead of installable: false" into main am: baaa1b1eeb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069502

Change-Id: I4ae32cc61dabd1359d493f52d3200f4f07ce917b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-03 15:32:34 +00:00
Treehugger Robot
baaa1b1eeb Merge "Use no_full_install: true instead of installable: false" into main 2024-05-03 15:15:23 +00:00
Inseob Kim
52827e13e4 Merge "Merge logtags from cc modules too" into main am: 364740b4a4 am: e33423dfc2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3064842

Change-Id: I0cb2c9ead316144372522a94654516614255cdfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-03 05:53:44 +00:00
Inseob Kim
e33423dfc2 Merge "Merge logtags from cc modules too" into main am: 364740b4a4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3064842

Change-Id: Ieddffdcc945c279ed06f9475db034854cf057702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-03 05:31:46 +00:00
Inseob Kim
364740b4a4 Merge "Merge logtags from cc modules too" into main 2024-05-03 05:10:22 +00:00
Jooyung Han
4191da7292 .capex is a container 
.capex should be handled as a container when generating NOTICE.

Bug: n/a
Test: Presubmits
Change-Id: Ief4b0a8d18d52ff6510521e0a2b1f4588e259a75
 2024-05-03 11:41:11 +09:00
Colin Cross
c13ac146b8 Merge changes from topic "replace_dependencies" into main am: 814e80038b am: c5216a798a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070706

Change-Id: Ic07d3891564b9ca1a52f50226152b1d927a5d596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-02 23:37:11 +00:00
Colin Cross
d08c7fdf16 Update docs for ReplaceDependencies[If] am: 86771326fe am: 6e2dde355a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070705

Change-Id: I839b1b9fdb2e1f0ea35758d202071d33f4af788b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-02 23:37:07 +00:00
Colin Cross
c5216a798a Merge changes from topic "replace_dependencies" into main am: 814e80038b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070706

Change-Id: I559771ff5278db17095967f8bd582bb0fa906413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-02 23:16:16 +00:00
Colin Cross
6e2dde355a Update docs for ReplaceDependencies[If] am: 86771326fe 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070705

Change-Id: I89b7a338eb20eff2034d3b4acc698bbbb21aa299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-02 23:16:13 +00:00
Colin Cross
814e80038b Merge changes from topic "replace_dependencies" into main 
* changes:
  Only update DebugMutator and DebugVariation for non-empty transition variations
  Update docs for ReplaceDependencies[If]
  Raise test timeout when running soong tests with race detector
 2024-05-02 22:50:28 +00:00
Cole Faust
a963b94cde Make the enabled property configurable 
This allows using select statements with it.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I6f3efaaa3d82505e38a91ee4ba0e18e404360191
Merged-In: If355d24506e3f117d27b21442a6c02bca3402dc7
 2024-05-02 15:41:24 -07:00
Colin Cross
49be24b833 Convert overrides to a TransitionMutator 
Replace the performOverrideMutator with a TransitionMutator.

Bug: 319288033
Flag: NONE
Test: all soong tests pass
Test: no change to build.ninja
Change-Id: I358f260f1bcd894d7803036ce77ba666c0429355
 2024-05-02 15:31:58 -07:00
Colin Cross
86771326fe Update docs for ReplaceDependencies[If] 
Update docs for ReplaceDependencies[If] to match changes in blueprint.

Bug: 319288033
Flag: NONE
Test: all soong tests pass
Change-Id: I7c79d3ac8dd80946760eb89b6577dc9965cb1541
 2024-05-02 14:39:40 -07:00
Colin Cross
888046f053 Only update DebugMutator and DebugVariation for non-empty transition variations 
Non-transition mutators that don't create a variant for a given module
cause no change to DebugMutator and DebugVariation.  TransitionMutators
don't have a concept of skipping a module, so Mutate is called on
every module.  This causes extra entries in DebugMutator and DebugVariation,
which will confuse error message around missing variations, and require
updating variant strings in some tests.

Skip updating DebugMutator and DebugVariation for empty transition
mutator variations.  This isn't entirely correct, but transition mutators
don't currently have a concept of an unaffected module.

Bug: 319288033
Test: all soong tests pass
Flag: NONE
Change-Id: Ia4e659b1e90ffe4320074c9b49528d00fa302c6a
 2024-05-02 14:39:40 -07:00
Cole Faust
850469195e Merge "Reapply "Make the enabled property configurable"" into aosp-main-future am: 6c87a53771 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27185858

Change-Id: I3d2aebc83b476195888476364ce9b15325e6d84c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-02 21:16:39 +00:00
Cole Faust
6c87a53771 Merge "Reapply "Make the enabled property configurable"" into aosp-main-future 2024-05-02 20:57:30 +00:00
Aditya Kumar
214802ef28 Merge "IsEnvTrue and IsEnvFalse should take True and False as valid values respectively." into main am: c9b4d4c584 am: caaf53d286 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070703

Change-Id: Idc4c14a8e12483006c59af77f2922226bb1e217d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-02 18:49:59 +00:00