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

5750 Commits

Author SHA1 Message Date
Ioana Alexandru
554eaf913c Merge "Revert "Export non-apex variants of modules to make"" am: 54fb18d43b am: aebbc670a6 am: 18fed433ff 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2497035

Change-Id: I4daebc840cadd17d66a48886b59e3fe3f8fec05c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 12:53:50 +00:00
Ioana Alexandru
54fb18d43b Merge "Revert "Export non-apex variants of modules to make"" 2023-03-20 11:08:55 +00:00
Jingwen Chen
8ac7d7d01d Revert "Export non-apex variants of modules to make" 
This reverts commit 502da3987a.

Reason for revert: b/274195633

```
In file included from out/soong/installs-aosp_cf_x86_pasan.mk:134984:
In file included from out/soong/Android-aosp_cf_x86_pasan.mk:981696:
In file included from build/make/core/soong_cc_rust_prebuilt.mk:76:
build/make/core/base_rules.mk:342: error: packages/modules/Uwb/service/uci/jni: MODULE.TARGET.SHARED_LIBRARIES.libuwb_uci_jni_rust already defined by packages/modules/Uwb/service/uci/jni.
```

Change-Id: Ic1ea6969e54c23a7d126eb0fb47ab6f2e44ee965
 2023-03-20 11:05:16 +00:00
Treehugger Robot
5104cd6974 Merge "Remove --extra_toolchains flag from aquery runner" am: 9ba1ddd355 am: 23eadd1aab am: 19fa849f45 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2496175

Change-Id: Iee30425ed50efbe33b38e0320203e393719450e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-19 00:53:21 +00:00
Treehugger Robot
9ba1ddd355 Merge "Remove --extra_toolchains flag from aquery runner" 2023-03-18 22:56:50 +00:00
Romain Jobredeaux
e926a0ea76 Merge "Exclude jdk17 from bp2build instead of jdk11" am: b1559e9901 am: 7e28dca791 am: 78f32e270a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494981

Change-Id: I922b6066ba91080daf67d6f9828b6a692a5e7b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 22:28:08 +00:00
Romain Jobredeaux
b1559e9901 Merge "Exclude jdk17 from bp2build instead of jdk11" 2023-03-17 20:43:33 +00:00
Vinh Tran
cbee4e3f2e Remove --extra_toolchains flag from aquery runner 
When specifying --extra_toolchains=//prebuilts/clang/host/linux-x86:all, there is no control over the sort order of toolchains, which can result in a more generic toolchain being used rather than the most specific (and correct) toolchain.

Apparently, this flag is causing Bazel to drop some flags from CppCompile actions. This causes mixed-build's outputs different from Soong build. The mixed-build also generates different from Bazel build because we don't use the flag when using `b` to build the targets.

Test: Inspect differences in CppCompile actions from Soong's Bazel aquery handler and b aquery
Bug: 273995121
Change-Id: Id9e32c0cd12ab8577cd5b223ca9e19c982f3ae1f
 2023-03-17 15:34:37 -04:00
Cole Faust
b5edb1a0e4 Merge "Export non-apex variants of modules to make" am: bebe607db4 am: 09f4a08f55 am: 59a02182c0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486355

Change-Id: I2e614d603aea40bd1bacbda919e9ad1daf58f876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 19:04:28 +00:00
Cole Faust
bebe607db4 Merge "Export non-apex variants of modules to make" 2023-03-17 17:20:19 +00:00
Sam Delmerico
cdfbf10019 Merge "bp2build allowlist libimapper, bufferpools deps" am: 9ac38d7e4e am: f69d879621 am: e77830c49d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494315

Change-Id: I47e4786063f7bca47492693ec9702fdedf501ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 15:55:02 +00:00
Romain Jobredeaux
d4e1a1569e Exclude jdk17 from bp2build instead of jdk11 
This is part of the changes needed to switch to jdk17 as the default.

Test: presubmits
Bug: 215230098
Change-Id: I4dad9f576c88bdc98f329a35fb8a1eb1527b1366
 2023-03-17 11:06:02 -04:00
Sam Delmerico
9ac38d7e4e Merge "bp2build allowlist libimapper, bufferpools deps" 2023-03-17 14:07:29 +00:00
Jingwen Chen
e2680b51f2 Merge "Populate apexBundle#filesInfo using bazel info." am: bb37c196a3 am: 21a852f8df am: 98661ab60b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486498

Change-Id: If551cb9d523b1f055875065170add06189410214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 08:28:02 +00:00
Jingwen Chen
bb37c196a3 Merge "Populate apexBundle#filesInfo using bazel info." 2023-03-17 06:42:04 +00:00
Sam Delmerico
9d71a84e55 bp2build allowlist libimapper, bufferpools deps 
These are used to build com.android.neuralnetworks and
com.android.media.swcodec.

Bug: 273927900
Test: b build --config=android //frameworks/av/apex:com.android.media.swcodec
Test: b build --config=android
  //packages/modules/NeuralNetworks/apex:com.android.neuralnetworks
Change-Id: Ia36d6e3419fb5034f1dbf410da738fcbf98d6874
 2023-03-16 16:55:47 -04:00
Cole Faust
502da3987a 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: Ib971981559f3b642ce6be8890679e994e1b44be0
 2023-03-16 11:13:23 -07:00
Jingwen Chen
2d37b641c5 Populate apexBundle#filesInfo using bazel info. 
This CL adds a few things:

1) Populate the filesInfo struct with cquery'd information from an
apex's ApexMkInfo provider. This filesInfo is then used in
apex/androidmk.go to generate Make modules (soong_cc_rust_prebuilt.mk),
which are then used in packaging to generate zip files of symbols in $PRODUCT_OUT.
2) Make a list of dicts of primitives JSON-encodable.
3) Tests.

Bug: 271423316
Bug: 271423062
Test: presubmits
Change-Id: Iaa34f51044de310510e580d9cf1fe60bbef801c1
 2023-03-16 18:09:27 +00:00
Treehugger Robot
b254e4dca8 Merge "Add --multitree-build flag" am: da4a78bf40 am: 634d176540 am: 968ccb4c57 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2488599

Change-Id: I7de14cbbd7f19d797c082f74ff987426593f456e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 04:29:03 +00:00
Treehugger Robot
da4a78bf40 Merge "Add --multitree-build flag" 2023-03-16 02:34:22 +00:00
Treehugger Robot
a314535e6e Merge "Add external/escapevelocity to allowlist" am: eabe937355 am: c8bd4070b4 am: 660ff3ef43 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2490499

Change-Id: I18952bcbed8db046d08a642e366fad9663aca19a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 01:44:52 +00:00
LaMont Jones
52a7243387 Add --multitree-build flag 
Add a flag that enables logic specific to multitree-build builds.

Bug: b/266730267
Test: treehugger, manual
Change-Id: Ia6f392525faa9d66bb6e0692b2a2e9c3b8493b0d
 2023-03-15 23:08:34 +00:00
Usta Shrestha
d66f2ce93d Add external/escapevelocity to allowlist 
Test: build/bazel/ci/bp2build.sh
Bug: 273739117
Change-Id: Iee11cc6029d1bce5a426a4467dd661630c8c3e9a
 2023-03-15 15:04:59 -04:00
Treehugger Robot
da9ca30f95 Merge "Respect Clang version override env vars." am: f214f12014 am: ddc63642f9 am: 5c9b65183b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2477644

Change-Id: Ie27241778dbb31015ec5ee5ca9a11190e8eb125a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:01:11 +00:00
Xin Li
a0ede28632 Merge "Merge Android 13 QPR2" 2023-03-14 21:40:45 +00:00
Treehugger Robot
ddc63642f9 Merge "Respect Clang version override env vars." am: f214f12014 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2477644

Change-Id: I64fbd555478f3db41a26c2a1be44be17c3fda6a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 21:23:00 +00:00
Treehugger Robot
f214f12014 Merge "Respect Clang version override env vars." 2023-03-14 20:25:58 +00:00
Alix Espino
7a8eb6a09f Merge "bp2build kotlinCFlags" am: d184706daa am: 54bfcc938f am: ea66e1bd5d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486117

Change-Id: Iecf554834e09c97103b054c8726d63715e42395e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 20:02:17 +00:00
Treehugger Robot
c4dbbd6aad Merge "Omit linux_bionic in mixed builds." am: 261bc29678 am: b6c1361030 am: f4a5b8247b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2487575

Change-Id: Ie3ea97752a4c6167ad76dc531970ab95a84e91e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 20:01:55 +00:00
Alix Espino
54bfcc938f Merge "bp2build kotlinCFlags" am: d184706daa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486117

Change-Id: I8a547e02ba2a874b7986e41470482daeb4262621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 18:44:41 +00:00
Treehugger Robot
b6c1361030 Merge "Omit linux_bionic in mixed builds." am: 261bc29678 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2487575

Change-Id: Ib81922cfc45b24cac82f60d429ea70c186221e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 18:43:38 +00:00
Alix Espino
d184706daa Merge "bp2build kotlinCFlags" 2023-03-14 18:35:15 +00:00
Treehugger Robot
261bc29678 Merge "Omit linux_bionic in mixed builds." 2023-03-14 18:07:17 +00:00
Liz Kammer
11ec91f652 Omit linux_bionic in mixed builds. 
We do not have toolchains set up for linux bionic at this time.

Bug: 273425275
Test: CI
Change-Id: I72760eabeb7be28f176eaaf4c6b9954dfdca1e42
 2023-03-14 10:03:38 -04:00
Alix
f848bf8225 bp2build kotlinCFlags 
for java_library, java_binary, android_app & android_library

Change-Id: Ia8dec7e7d497eb41b2d8dcd8c44c3090d1d3b4bd
Bug: 271265771
Test: go test ./bp2build
 2023-03-14 13:57:22 +00:00
Anton Hansson
467fee3520 Merge "Add filegroup_defaults module" am: a8c1cacaf9 am: 03c2e249ee am: bde188be81 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470485

Change-Id: Iacf5b384c2ff3f148487989867415300dff287eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 13:50:52 +00:00
Anton Hansson
03c2e249ee Merge "Add filegroup_defaults module" am: a8c1cacaf9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470485

Change-Id: I5a821648fdc3245af62c16b2731a17a53303f2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 12:37:37 +00:00
Anton Hansson
049034953d Merge "Add filegroup_test.go to sources" am: eaab87405c am: 51f92dc397 am: 9d897c130a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470484

Change-Id: I0e1017176f6d0a3401678de06c330ec421cd1a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 09:51:51 +00:00
Anton Hansson
51f92dc397 Merge "Add filegroup_test.go to sources" am: eaab87405c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470484

Change-Id: I6ea42556a0af0819f7579b3fd3de598fafa8c842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 08:40:24 +00:00
Anton Hansson
7d6dd8bb33 Add filegroup_defaults module 
Allows specifying shared filegroup attributes in a central place.

Test: filegroup_test.go
Change-Id: I82feac37ae6998313a0004f8af58f3decf7a514e
 2023-03-13 16:02:06 +00:00
Anton Hansson
7a444cec60 Add filegroup_test.go to sources 
I don't think it was running before.

Test: yes
Change-Id: Ia3bf53ddcc1ddefd7a236122256594ba764ee8e5
 2023-03-13 15:24:17 +00:00
Treehugger Robot
e65c2c848c Merge "Revert "Add protected_properties support in defaults modules"" am: cb301ccdca am: 6235f58040 am: b713af17e8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2482517

Change-Id: I54bde6ac3a4e85d8ee4a22fb1ef929ac2b9e0169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 07:58:09 +00:00
Treehugger Robot
6235f58040 Merge "Revert "Add protected_properties support in defaults modules"" am: cb301ccdca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2482517

Change-Id: Ib6cb459e7ace2e4d31e9c254ad2b674f98e1214a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 06:13:28 +00:00
Treehugger Robot
cb301ccdca Merge "Revert "Add protected_properties support in defaults modules"" 2023-03-13 05:34:58 +00:00
Liz Kammer
eeeb952b27 Revert "Add protected_properties support in defaults modules" 
This reverts commit 799962789a.

Test: m nothing
Change-Id: Ia43c2ee216dc42ae5cf3e4d138aa9d0e05a9ee60
 2023-03-10 18:53:59 -05: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
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
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
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