StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,003 Commits 1 Branch 0 Tags
c398be808e6da8b76b7e8efb92f49ba555fd6117
Commit Graph

67003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cole Faust
c398be808e Promote NewApi to an error again 
Now that issues have been baselined.

Bug: 268261262
Test: Presubmits
Change-Id: I3a1591d650fc46f67426d0f64162d261a24aa6eb
 2023-03-10 11:58:39 -08:00
Iván Budnik
03613bbe9a Merge "Revert "Export non-apex variants of modules to make"" am: ff8c95b610 am: 85b9f6e7b2 am: e36c6c1c37 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2481059

Change-Id: Ib05486f8c8934cd530a6f08f02c6901f2a0907bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 18:17:23 +00:00
Spandan Das
99d868dac6 Merge changes I1ff171b9,Id64085d6 am: 5625e2214e am: 9415d14b9a am: e73e99a282 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2481576

Change-Id: I2785614c20025844e6081d54ed0d78593d5f63a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 18:17:03 +00:00
Iván Budnik
e36c6c1c37 Merge "Revert "Export non-apex variants of modules to make"" am: ff8c95b610 am: 85b9f6e7b2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2481059

Change-Id: Ia758832a084d3c53d7c484150b274b159ff1bac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 17:23:18 +00:00
Spandan Das
e73e99a282 Merge changes I1ff171b9,Id64085d6 am: 5625e2214e am: 9415d14b9a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2481576

Change-Id: Ia4706cdb2b937b63a736d707f0d7485321acaaba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 17:23:00 +00:00
Iván Budnik
85b9f6e7b2 Merge "Revert "Export non-apex variants of modules to make"" am: ff8c95b610 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2481059

Change-Id: I9ac9ed805315c80175e038b6f7298a183d6874eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 16:47:30 +00:00
Spandan Das
9415d14b9a Merge changes I1ff171b9,Id64085d6 am: 5625e2214e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2481576

Change-Id: I71b6b46c091000baf78f252204d8dac841bfbec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 16:47:01 +00:00
Iván Budnik
ff8c95b610 Merge "Revert "Export non-apex variants of modules to make"" 2023-03-10 16:30:32 +00:00
Iván Budnik
295da16b95 Revert "Export non-apex variants of modules to make" 
Revert submission 2462194-androidmk_for_apex_dependencies

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=full-eng&lkgb=9723453&lkbb=9724944&fkbb=9723508, bug b/272663333.

Reverted changes: /q/submissionid:2462194-androidmk_for_apex_dependencies

Bug: 272663333
Change-Id: I847fa910a8d54de19954f56fe92a80a9bcd0ee18
 2023-03-10 16:11:26 +00:00
Spandan Das
5625e2214e Merge changes I1ff171b9,Id64085d6 
* changes:
  Add an integration test for API export from another bazel package
  Generate a BUILD file for every Android.bp file in api_bp2build workspace.
 2023-03-10 16:01:23 +00:00
Liz Kammer
20b1d32731 Merge "Allowlist missing dependency" am: 58f85e328b am: f92b583027 am: ebec2b8785 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2480298

Change-Id: I590f47e9fde2cca7cb4d3877dbe608eb613f512f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 15:36:10 +00:00
Liz Kammer
ebec2b8785 Merge "Allowlist missing dependency" am: 58f85e328b am: f92b583027 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2480298

Change-Id: I2095bf31b1fa9158b022f5a0b903303d6a05252e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 15:02:06 +00:00
Liz Kammer
f92b583027 Merge "Allowlist missing dependency" am: 58f85e328b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2480298

Change-Id: I16aa00f734919507576ffe9940d92b3ecbd1bbbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 14:25:30 +00:00
Liz Kammer
58f85e328b Merge "Allowlist missing dependency" 2023-03-10 13:58:43 +00:00
Wei Li
8339ea1a9f Merge "Revert "Add integration test for testing generated SBOM with .im..."" am: aacfacd967 am: 22174e2736 am: f0b74ef468 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2480154

Change-Id: I8950a9b775149bc5a2882c6455356c4cbc6698f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:48:50 +00:00
Cole Faust
398a63fcad Merge "Make using python 2 an error" am: 944053e52d am: 6167240026 am: ab467fe4ef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2212957

Change-Id: Ic8bef95f6d9d4b08876891cd86ad4044b4f2d619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:48:31 +00:00
Cole Faust
57129350e0 Merge "Export non-apex variants of modules to make" am: f42c21d5f8 am: f183fc5413 am: 578aa6c684 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462194

Change-Id: Ic27c6ed62af76d18b3df3f8357c96d9419403f6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:48:13 +00:00
Wei Li
f0b74ef468 Merge "Revert "Add integration test for testing generated SBOM with .im..."" am: aacfacd967 am: 22174e2736 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2480154

Change-Id: I40df41f007c81b06463940b244ec9a71cc668d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:28:40 +00:00
Cole Faust
ab467fe4ef Merge "Make using python 2 an error" am: 944053e52d am: 6167240026 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2212957

Change-Id: I2b454c3ac55e55688176683e780061cc80d84f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:28:19 +00:00
Cole Faust
578aa6c684 Merge "Export non-apex variants of modules to make" am: f42c21d5f8 am: f183fc5413 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462194

Change-Id: I9cd48e57935fcf3c1f59f33e06d6d1e48f72ecf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:27:58 +00:00
Wei Li
22174e2736 Merge "Revert "Add integration test for testing generated SBOM with .im..."" am: aacfacd967 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2480154

Change-Id: I990c345e8557c4c1fc2f2dac18bd1d3cb1f4cef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:04:34 +00:00
Cole Faust
6167240026 Merge "Make using python 2 an error" am: 944053e52d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2212957

Change-Id: I5a475da6231b8e43aa188592d7977390ae916be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:04:02 +00:00
Cole Faust
f183fc5413 Merge "Export non-apex variants of modules to make" am: f42c21d5f8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2462194

Change-Id: I9e0170a7c44dd1cd966132948c23ecd16a7a45aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:03:35 +00:00
Wei Li
aacfacd967 Merge "Revert "Add integration test for testing generated SBOM with .im..."" 2023-03-10 06:40:54 +00:00
Cole Faust
944053e52d Merge "Make using python 2 an error" 2023-03-10 06:37:24 +00:00
Cole Faust
f42c21d5f8 Merge "Export non-apex variants of modules to make" 2023-03-10 06:36:03 +00:00
Android Culprit Assistant
68101fad40 Revert "Add integration test for testing generated SBOM with .im..." 
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/5b65d203-d364-4ade-aabb-1330fe45236a).

Change-Id: I10231bc624a15a2ba477712b3a5950f5fc9113e8
 2023-03-10 06:18:01 +00:00
Wei Li
35cc6d91b6 Merge "Add integration test for testing generated SBOM with .img files." am: d48644177a am: 48a9563f77 am: 15a5321f62 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453072

Change-Id: I088b2587114e36a1128a511cce4c2c59fe965d4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 05:50:58 +00:00
Wei Li
15a5321f62 Merge "Add integration test for testing generated SBOM with .img files." am: d48644177a am: 48a9563f77 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453072

Change-Id: I4ad80115547aacaf418764abc3d384ac8ae860bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 05:22:45 +00:00
Wei Li
48a9563f77 Merge "Add integration test for testing generated SBOM with .img files." am: d48644177a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2453072

Change-Id: I5ab2d43deb9486d40ab541d2573d105a93f417db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 04:59:41 +00:00
Wei Li
d48644177a Merge "Add integration test for testing generated SBOM with .img files." 2023-03-10 04:47:47 +00:00
Spandan Das
91fdd51ee3 Merge "Convert filegroups in api_bp2build" am: 3b965d4bb0 am: 80ec5d3fb6 am: 861f5743b5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2481335

Change-Id: Ie8f47a543b788976552fc25c5861c54b6459741b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 04:14:45 +00:00
Jooyung Han
ac57751f4f Merge changes I0de79b6e,Idc482f94 am: f1214133ce am: ebd9c5907c am: 49e62aef0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2479496

Change-Id: I0e129c5b4f7f4fe11869c7405cfc9e78572ac7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 04:14:18 +00:00
Spandan Das
861f5743b5 Merge "Convert filegroups in api_bp2build" am: 3b965d4bb0 am: 80ec5d3fb6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2481335

Change-Id: I00bcf8a14d06d03538e616d653e8dbec77ebe5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 03:48:01 +00:00
Jooyung Han
49e62aef0e Merge changes I0de79b6e,Idc482f94 am: f1214133ce am: ebd9c5907c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2479496

Change-Id: I0107973f1787322c6c5dbb65cffb71a5a2b48b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 03:47:50 +00:00
Spandan Das
80ec5d3fb6 Merge "Convert filegroups in api_bp2build" am: 3b965d4bb0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2481335

Change-Id: Ia28da77f7582b02b3203b05fc878edeeea134c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 03:03:37 +00:00
Jooyung Han
ebd9c5907c Merge changes I0de79b6e,Idc482f94 am: f1214133ce 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2479496

Change-Id: Ic2d398cccb0c7136fa0b8f9e4ce1ea58cc57deca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 03:03:15 +00:00
Spandan Das
3b965d4bb0 Merge "Convert filegroups in api_bp2build" 2023-03-10 02:45:12 +00:00
Spandan Das
68bcbb588a Add an integration test for API export from another bazel package 
This test ensures that API export works ok if the api file exists in a
different directory (precisely, package) than the *_api_contribution
target.

Test: tests/run_integration_tests.sh
Change-Id: I1ff171b93773b514a9a081f962606f4c28abe42e
 2023-03-10 02:32:18 +00:00
Jooyung Han
f1214133ce Merge changes I0de79b6e,Idc482f94 
* changes:
  Add tests for conv_linker_config
  Fix conv_linker_config with multiple input json files
 2023-03-10 02:26:59 +00:00
Spandan Das
98cb85624c Generate a BUILD file for every Android.bp file in api_bp2build 
workspace.

This is necessary to solve bazel package boundary issues where the api
file might exist in a different directory

Test: m api_bp2build && build/bazel/bin/bazel build --config=android
--config=api_bp2build //build/orchestrator/apis:system
Test: multitree_build system/nothing (in multitree)

Change-Id: Id64085d65a1943bdb394ea80c875db96ca373839
 2023-03-09 23:15:34 +00:00
Spandan Das
bd52ea9ecf Convert filegroups in api_bp2build 
api providing modules (droidstubs, cc_library etc.) can refer to the api
file via a separate filegroup module. Therefore these modules should be
generated in the api_bp2build workspace as well

Test: m api_bp2build && build/bazel/bin/bazel build
--config=api_bp2build --config=android //build/orchestrator/apis:*

Change-Id: I77371bd94a2794770b01b98aaf84b1bc42810841
 2023-03-09 23:03:07 +00:00
Liz Kammer
ad1d8cb1d6 Allowlist missing dependency 
Test: b build --config=android
//frameworks/av/media/audioaidlconversion/...
Fixes: 272576906
Change-Id: I8f60e6d84995db46be95a091bba45c1abdc97b47
 2023-03-09 22:09:08 +00:00
Zi Wang
6fd189aa0a Merge "Sort expectTargets and actualTargets by name in bp2build test" am: 5c12bdfdd3 am: fccda10b92 am: a204832f3c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2476196

Change-Id: I3d7124586292118d5a683860a6a9ac9609fabda3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 20:14:44 +00:00
Spandan Das
965ca33903 Merge changes Ib004c2c3,I6b63d9d0 am: d14a70d7ed am: dc3f27f7b6 am: 7ca3d83e45 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2475621

Change-Id: Ic13d8d175a671d7dacd86aa6ad25be0e5abe920b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 20:14:29 +00:00
Cole Faust
edc4c505f9 Make using python 2 an error 
Except if BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES is set, and except for
some core py2 modules that can't be removed until python2 is fully gone.

Bug: 203436762
Test: m nothing
Change-Id: I62ccb6f5687eab1e79c372ffc234a90ca5b566ac
 2023-03-09 11:56:04 -08:00
Zi Wang
a204832f3c Merge "Sort expectTargets and actualTargets by name in bp2build test" am: 5c12bdfdd3 am: fccda10b92 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2476196

Change-Id: I30df5bf43d14cfe544a265afae2c782c21423dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 19:35:49 +00:00
Spandan Das
7ca3d83e45 Merge changes Ib004c2c3,I6b63d9d0 am: d14a70d7ed am: dc3f27f7b6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2475621

Change-Id: Ic6154c94d7f95d9dcab33861807741db114b1951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 19:35:13 +00:00
Cole Faust
ad222f271a Export non-apex variants of modules to make 
Currently, non-apex variants of modules that are in apexes are not
exported to make unless they're apex_available to the platform. This
means that you can't `m` those modules directly.

However, there is a workaround in the apex androidmk implementation that
emits make rules for the removed modules, but just redirects them to
build the apex itself. We want to remove that, but one of the problems
with doing so is that you can no longer `m` many modules afterwards.

To fix that, unhide the apex's dependencies from make. To ensure they're
not installed, call SkipInstall() on them, and update SkipInstall() to
be more strict by setting `LOCAL_UNINSTALLABLE_MODULE := true`.

Bug: 254205429
Test: Presubmits
Change-Id: Ib094feb2c437ad50d8319c58caa997759e7ce32f
 2023-03-09 11:20:10 -08:00
Zi Wang
fccda10b92 Merge "Sort expectTargets and actualTargets by name in bp2build test" am: 5c12bdfdd3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2476196

Change-Id: I77bdcb2fa61d806c87244be2ecccfd0f972fc7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-09 18:55:33 +00:00