tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
77406 commits 1 branch 0 tags 115 MiB
Commit graph

77406 commits

This branch
This branch
All branches
Author SHA1 Message Date
Søren Gjesse
b06eeb51fc Merge "Remove setting com.android.tools.r8.emitRecordAnnotationsExInDex" into main am: c97dfe42b9 am: fa139b17f9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2881155

Change-Id: I1711a56fa1b4078a9c81fc484ad165eeffae4c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-21 10:57:42 +00:00
Søren Gjesse
fa139b17f9 Merge "Remove setting com.android.tools.r8.emitRecordAnnotationsExInDex" into main am: c97dfe42b9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2881155

Change-Id: I3edce9779893e039c78c2e410d7de7cf1bdd9b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-21 10:28:51 +00:00
Søren Gjesse
c97dfe42b9 Merge "Remove setting com.android.tools.r8.emitRecordAnnotationsExInDex" into main 2023-12-21 09:47:47 +00:00
Mårten Kongstad
424913c372 Merge "Replace aconfig dump --format=bool with explicit format string" into main am: 26d2c67339 am: ee05861ce3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2882369

Change-Id: Ib6a89c0a4178a518cad068fc54806dd8e1719f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-21 08:13:52 +00:00
Mårten Kongstad
ee05861ce3 Merge "Replace aconfig dump --format=bool with explicit format string" into main am: 26d2c67339 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2882369

Change-Id: Ic601a9f8e8ad4c49bcbb850e7eecace98e4e501f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-21 07:43:16 +00:00
Mårten Kongstad
26d2c67339 Merge "Replace aconfig dump --format=bool with explicit format string" into main 2023-12-21 07:03:38 +00:00
Spandan Das
4cf8303b55 Merge "Use the correct bootjars when multiple prebuilt apexes exist" into main am: 412b33a6e7 am: ec7918d041 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876756

Change-Id: I536ad98aab77a8c93dea5cf907befe2be7aa24e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 19:33:02 +00:00
Cole Faust
01f5a51d30 Merge "Sandbox chre_atoms_log.h" into main am: 9734cff08c am: 35555ba1df 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2880464

Change-Id: I33db83d4f63c414ad22f8c14a40a7b60f30486b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 19:32:43 +00:00
Spandan Das
ec7918d041 Merge "Use the correct bootjars when multiple prebuilt apexes exist" into main am: 412b33a6e7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876756

Change-Id: If24b610990f7fdd198d4668a94a818301362eb55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 19:18:47 +00:00
Cole Faust
35555ba1df Merge "Sandbox chre_atoms_log.h" into main am: 9734cff08c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2880464

Change-Id: I8054c675ef38c294b19d35e1d8ac1e68f7344144
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 19:02:09 +00:00
Spandan Das
412b33a6e7 Merge "Use the correct bootjars when multiple prebuilt apexes exist" into main 2023-12-20 19:00:49 +00:00
Cole Faust
9734cff08c Merge "Sandbox chre_atoms_log.h" into main 2023-12-20 18:43:12 +00:00
Spandan Das
5be6333692 Use the correct bootjars when multiple prebuilt apexes exist 
hiddenapi and dexpreopt require boot and system server jars from apexes.
When building with prebuilts, this comes via
java_import/java_sdk_library_import, which acts as a hook for
prebuilt_apex/apex_set. If we have multiple apexes in the tree, this
hook becomes 1:many. This CL prepares dex_bootjars to select the right
deapexerd .jar files when mutliple prebuilts exist.

Implementation details
- Update prebuilt module types (prebuilt_apex/apex_set) and source
  apexes to set a map of
  library name to dex jar path on host.
- dex_bootjars will access the path of the .dex jar on host via the
  provider. These then
  copied/installed to the right locations.

This CL does not drop the old mechanism to get the dex file (i.e. by
creating a dep on java_library). Once all mainline
modules have been flagged using apex_contributions, the old mechanism
will be dropped

Bug: 308790457
Test: git_master-art-host:art-gtest https://android-build.corp.google.com/builds/abtd/run/L21500030000926533
Test: git_main:art_standalone_dexpreopt_tests https://android-build.corp.google.com/builds/abtd/run/L99000030000891212
Test: Added a unit test that checks that the right .jar is selected
when multiple prebuilts exists

Change-Id: I6ef94135b9303a35135810930af4b641df13a583
 2023-12-20 16:43:01 +00:00
David Srbecky
1c35415ae1 Merge "Revert^6 "Enable dex container (DEX v41) for the whole system"" into main am: f01e2f7308 am: 209834dd38 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2878966

Change-Id: Ie3be38bb2adc78992e343896a8acdecf2c591ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 02:28:42 +00:00
Cole Faust
5d75893692 Merge changes I8b352305,Iadf9e324 into main am: 30e32f67fc am: 9c2308ba03 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2883010

Change-Id: Ieb0c232324c6ab4424d2bed0bfa53340ba824bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 02:27:40 +00:00
David Srbecky
209834dd38 Merge "Revert^6 "Enable dex container (DEX v41) for the whole system"" into main am: f01e2f7308 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2878966

Change-Id: I6d28bdd97dd499d6cfd1a490bdd7a38dc0a92194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 02:00:12 +00:00
Cole Faust
9c2308ba03 Merge changes I8b352305,Iadf9e324 into main am: 30e32f67fc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2883010

Change-Id: I0d6b0212a87797d6334f55319263044e03b4d685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 01:59:54 +00:00
David Srbecky
f01e2f7308 Merge "Revert^6 "Enable dex container (DEX v41) for the whole system"" into main 2023-12-20 01:37:06 +00:00
Cole Faust
30e32f67fc Merge changes I8b352305,Iadf9e324 into main 
* changes:
  Sandbox CtsApkVerityTestDebugFiles
  Include "soong" in sandboxed out paths
 2023-12-20 01:35:40 +00:00
Colin Cross
cb6304b4ef Merge "Revert "Remove non-generic provider APIs"" into main am: a4cca85eea am: fde5a49cef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2882901

Change-Id: I1126b5c8c7dcaf2082f1925c337534fdfa38f845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 01:23:57 +00:00
Colin Cross
fbf7038826 Merge "Remove non-generic provider APIs" into main am: e87e278086 am: a6c0da77a5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876768

Change-Id: I5fa5fd147dd3cbba4e95ba3d054dc825dd7f7438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 01:23:43 +00:00
Spandan Das
99387a794b Merge "Use the correct prof file when multiple prebuilt apexes exist" into main am: 96feedc555 am: 5c71da429d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876755

Change-Id: Ie6d447b6daa26d41f3b7ff72e1b0088790d53dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 01:23:06 +00:00
Colin Cross
fde5a49cef Merge "Revert "Remove non-generic provider APIs"" into main am: a4cca85eea 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2882901

Change-Id: I9cb2418bfdc50805b1f35f2c218f7ecf63d5de52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 01:08:06 +00:00
Colin Cross
a4cca85eea Merge "Revert "Remove non-generic provider APIs"" into main 2023-12-20 01:00:27 +00:00
Colin Cross
84b68c90ae Revert "Remove non-generic provider APIs" 
This reverts commit ad50aca6ab.

Reason for revert: Broke builds when combined with aosp/2876755

Change-Id: I3bfbcb05d8c695b9315b7e8e3f63c6bd5c9dbe36
 2023-12-20 00:59:28 +00:00
Colin Cross
a6c0da77a5 Merge "Remove non-generic provider APIs" into main am: e87e278086 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876768

Change-Id: I5db83c34fcd80548a377c5a8fd738d80d4e34bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 00:53:04 +00:00
Spandan Das
5c71da429d Merge "Use the correct prof file when multiple prebuilt apexes exist" into main am: 96feedc555 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876755

Change-Id: I4183eca0358a9b88912d10c9404b3a407f79e12a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 00:52:25 +00:00
Colin Cross
e87e278086 Merge "Remove non-generic provider APIs" into main 2023-12-20 00:42:38 +00:00
Colin Cross
b16e2f84d8 Merge "Remove cc.moduleContext override of android.ModuleContext.*Specific" into main am: 225ad7e8b2 am: 66fe8f6171 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2880494

Change-Id: I862779449093bfb6d5444d7ec9fdcdc3988d0c1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 00:34:34 +00:00
LaMont Jones
46d4218fd0 Merge "move CollectDependencyAconfigFiles to android" into main am: 4daed5a026 am: d4efb42433 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2883008

Change-Id: Ie1afa1c155f1750c41b387e65d2c9da1cd081c39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-20 00:33:55 +00:00
Spandan Das
96feedc555 Merge "Use the correct prof file when multiple prebuilt apexes exist" into main 2023-12-20 00:02:20 +00:00
Colin Cross
66fe8f6171 Merge "Remove cc.moduleContext override of android.ModuleContext.*Specific" into main am: 225ad7e8b2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2880494

Change-Id: Ifac4117922327f7f0efadb39185e6f0d2a2fb611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-19 23:48:22 +00:00
LaMont Jones
d4efb42433 Merge "move CollectDependencyAconfigFiles to android" into main am: 4daed5a026 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2883008

Change-Id: I4b1bda253715ce3d8e48c0f4fd7537f09eeb2605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-19 23:47:42 +00:00
Colin Cross
225ad7e8b2 Merge "Remove cc.moduleContext override of android.ModuleContext.*Specific" into main 2023-12-19 23:39:54 +00:00
Cole Faust
81f2ac35f1 Sandbox CtsApkVerityTestDebugFiles 
go/android-busy-beavers-sandboxing

It still has a diff in the generule_sandbox_test, but it's just the
addition of "./" in front of all the paths, which is fine.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py CtsApkVerityTestDebugFiles
Change-Id: I8b352305cfb339bc5a09a2305e10a187723d754d
 2023-12-19 15:35:02 -08:00
LaMont Jones
4daed5a026 Merge "move CollectDependencyAconfigFiles to android" into main 2023-12-19 23:07:50 +00:00
Spandan Das
da739a30a6 Use the correct prof file when multiple prebuilt apexes exist 
Generating boot image requires a .prof file provided by the ART apex.
When building with prebuilts, this comes via the
prebuilt_bootclasspath_fragment module, which acts as a shim for
prebuilt_apex/apex_set. If we have multiple prebuilt apexes in the tree,
this shim becomes 1:many. This CL prepares dex_bootjars to select the
right .prof file when multiple prebuilts exist.

Implementation details
- Update deps mutator of dex_bootjars to create a dep on
  all_apex_contributions. The latter contains information about which
  apex is selected in a specific release configuration. dex_bootjars
  will create a dependency on the selected apex in a postdeps phase
  mutator.
- All apex module types (apex, prebuilt_apex and apex_set) will set a
  provider that contains info about the location of the .prof file on
  host
- dex_bootjars will access the provider of the selected apex to get the
  location of the .prof file

This CL does not drop the old mechanism to get the .prof file (i.e. by
creating a dep on {prebuilt_}bootclasspath_fragment). Once all mainline
modules have been flagged using apex_contributions, the old mechanism
will be dropped

Bug: 308790457
Test: Added a unit test that checks that the right .prof is selected
when multiple prebuilts exists

Change-Id: I40fdb21416c46bed32f6ff187ce5153711ec2c69
 2023-12-19 22:37:29 +00:00
Victor Chang
becc7a90de Merge "Avoid circular dependency for the aconfig usage in libcore" into main am: a9d3293bf4 am: 8f7e78f8bb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2880848

Change-Id: I2fda8082a09a6eee3e737259b6770913ea5484b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-19 21:05:43 +00:00
Victor Chang
8f7e78f8bb Merge "Avoid circular dependency for the aconfig usage in libcore" into main am: a9d3293bf4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2880848

Change-Id: I9e12749d85104b28d322c63c67fb8b1e65d679d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-19 20:46:38 +00:00
Victor Chang
a9d3293bf4 Merge "Avoid circular dependency for the aconfig usage in libcore" into main 2023-12-19 20:39:03 +00:00
Cole Faust
e8561c6108 Include "soong" in sandboxed out paths 
Previously, the path to built files in the sandbox would be
out/.intermediates/... instead of out/soong/.intermediates/....

After this cl, it will be out/soong/.intermediates/.... This makes
it more consistent with the non-sandboxed paths, which is easier for
developers.

CtsApkVerityTestDebugFiles is a genrule that's used to find the paths
to other modules. Developers were expected to build it, then copy all
the files listed in its output file to a temporary directory. Those
paths would be wrong before this change.

Bug: 307824623
Test: ./build/soong/tests/genrule_sandbox_test.py CtsApkVerityTestDebugFiles
Change-Id: Iadf9e3240a2c828567e46b6b02cc14004f30e8bf
 2023-12-19 12:14:01 -08:00
LaMont Jones
aa005ae080 move CollectDependencyAconfigFiles to android 
This needs to be called by some modules in android.

Bug: 308625757
Test: manual
Change-Id: I389fcfd88a3f4bd85a9218fdd4dd66d8a239bb67
 2023-12-19 19:34:00 +00:00
Spandan Das
a173731d29 Merge changes I3323d993,I01cea895 into main am: 349ef87505 am: 2c5f3c7fc1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876754

Change-Id: Ib096242d10e90818fcf1e37e17ac98190a9922c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-19 19:21:45 +00:00
Spandan Das
2c5f3c7fc1 Merge changes I3323d993,I01cea895 into main am: 349ef87505 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2876754

Change-Id: I96ccee0a2833651e4c99c6031e9924c7fef4da7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-19 18:49:55 +00:00
Spandan Das
349ef87505 Merge changes I3323d993,I01cea895 into main 
* changes:
  Move validation from FindDeapexerProviderForModule to rdeps
  Move dexpreopt processing from java_*_import to prebuilt_apex
 2023-12-19 18:08:19 +00:00
Treehugger Robot
2adf708ecd Merge "Revert "Show ETA only if it is smart status"" into main am: 2fd4783584 am: b8e45d8431 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2881848

Change-Id: I355a195eede3f35db7c9a5e21599c13bb8b964d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-19 17:26:11 +00:00
Treehugger Robot
b8e45d8431 Merge "Revert "Show ETA only if it is smart status"" into main am: 2fd4783584 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2881848

Change-Id: I83564c841dde7fc3d8ca1b5524d411a04820aa91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-19 16:53:44 +00:00
Mårten Kongstad
b3fa1cfca9 Replace aconfig dump --format=bool with explicit format string 
aconfig will remove its support for format aliases in an attempt to make
future maintenance easier. Update soong accordingly.

Bug: 317044915
Test: m
Change-Id: I20157ea8c7b441d4e416967d29fc7768c917e688
 2023-12-19 16:55:32 +01:00
Treehugger Robot
2fd4783584 Merge "Revert "Show ETA only if it is smart status"" into main 2023-12-19 15:49:57 +00:00
Victor Chang
bf0175ee6a Avoid circular dependency for the aconfig usage in libcore 
Bug: 316554963
Test: m droid
Change-Id: I6f45e585b8b656ef7ce1d51bbde0a44898198907
 2023-12-19 14:22:07 +00:00