StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,610 Commits 1 Branch 0 Tags
33cc80eb1f84d607da1a70b76d8dc0370b51a89a
Commit Graph

5570 Commits

Author SHA1 Message Date
Kelvin Zhang
991caa3576 Merge "Revert "Target Java 17"" am: d60722c204 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2419659

Change-Id: Ibdffdd1d3b1198884113e5800d311fbc52dd330b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-02 21:36:59 +00:00
Dennis Shen
0c9fc6fb7d Merge "Add soong unit test for trimmed apex build" am: a928c8dae1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2412712

Change-Id: I2a849c536e409fda1573b7086febfa99c0a11348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-02 21:35:52 +00:00
Sam Delmerico
9f257daf53 Merge "clean up CL for androidmk variables" am: 1978fdf9b2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2406216

Change-Id: Icf5772f6fd93f1430e8a5902283849646f93ebfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-02 21:31:58 +00:00
Sorin Basca
024f16c2f8 Merge "Target Java 17" am: ac9938dddc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2243015

Change-Id: I330481f3f67039db34bcf82ea716b80c6f29a256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-02 21:09:54 +00:00
Yu Liu
2d2c3c4564 Merge "Denylist libunwindstack for now until later." am: 249998d290 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2400013

Change-Id: I19d8fa30e313ed657f1be701ccec555fc17fe7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-02 20:52:39 +00:00
Kelvin Zhang
d60722c204 Merge "Revert "Target Java 17"" 2023-02-02 18:51:26 +00:00
Sorin Basca
384250c7c4 Revert "Target Java 17" 
This reverts commit d6be9e51ca.

Reason for revert: b/267608166.

Change-Id: Ie07caa5ace3bcb290829e6fa476c5e1d47b975ba
Fixed: 267608166
 2023-02-02 17:56:19 +00:00
Dennis Shen
a928c8dae1 Merge "Add soong unit test for trimmed apex build" 2023-02-02 14:39:53 +00:00
Sam Delmerico
1978fdf9b2 Merge "clean up CL for androidmk variables" 2023-02-02 14:11:12 +00:00
Sorin Basca
ac9938dddc Merge "Target Java 17" 2023-02-02 11:38:32 +00:00
Yu Liu
249998d290 Merge "Denylist libunwindstack for now until later." 2023-02-02 07:07:40 +00:00
Yu Liu
828c4065e1 Denylist libunwindstack for now until later. 
Bug: 266446882
Test: b and m build tzdata and adbd
Change-Id: Idb931c37b082743251aae0e633fd7e51ca651a9b
 2023-02-01 20:40:42 +00:00
Dennis Shen
d4f5d932a1 Add soong unit test for trimmed apex build 
BUG: b/259381334
TEST: m nothing
Change-Id: I49e5d31a6f5c4f9a72a6a4b3b2ab7114b996adbc
 2023-02-01 20:23:46 +00:00
Treehugger Robot
1921fb2454 Merge "Rename API surface provided to mainline modules" am: 9bedfd0d4b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2400022

Change-Id: Iadf6eba8f3e90c075c1d67bb14e8b4741dc6a995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-30 23:44:58 +00:00
Treehugger Robot
9bedfd0d4b Merge "Rename API surface provided to mainline modules" 2023-01-30 23:06:22 +00:00
Usta (Tsering) Shrestha
9e130a27da Merge "prune out empty bazel depsets" am: e136efdcfa 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2404275

Change-Id: If6f62a507931557dd72c8d263d4a574fb5cfc533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-30 21:41:47 +00:00
Usta (Tsering) Shrestha
6a144eddcb Merge "soong_build cmline args validation" am: 28b5ac6db5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2366952

Change-Id: I569526044d3787f1235be41e30e90699e8b18140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-30 21:40:22 +00:00
Usta (Tsering) Shrestha
e136efdcfa Merge "prune out empty bazel depsets" 2023-01-30 21:04:08 +00:00
Usta (Tsering) Shrestha
28b5ac6db5 Merge "soong_build cmline args validation" 2023-01-30 20:50:44 +00:00
Usta Shrestha
13fd5aead7 prune out empty bazel depsets 
Instead of using a sentinel file that was created under bazel_workspace
prune them out. The sentinel file was being created under bazel_workspace,
which would be deleted and thus rendered useless from the perspective of
not retriggering a build.

Test: `touch Android.bp` then `NINJA_ARGS="-d explain" m --bazel-mode-staging adbd_test`
Bug: 265155778
Change-Id: If5d8f0ea7f3b8828fda0646faafd1a621f0cb27c
 2023-01-30 11:37:04 -05:00
Sam Delmerico
7832824f43 Merge "add androidmk cc-related variables to androidmk" am: 78aca80710 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2393585

Change-Id: Ideba553c98c11c09d4c7074a5ae236f8f71c788c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-27 21:39:15 +00:00
Sam Delmerico
78aca80710 Merge "add androidmk cc-related variables to androidmk" 2023-01-27 21:04:29 +00:00
Sam Delmerico
5fb794ae37 clean up CL for androidmk variables 
Change-Id: If14d1925bea78f467740f8395f1d529db00b618c
 2023-01-27 16:01:37 -05:00
Treehugger Robot
d6e0551c23 Merge "Read ApexMkInfo for modules to be installed." am: 6e7441edde 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2402832

Change-Id: I5d7e9a9e4287a9f1d8e0536f74680b66abae2917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-27 20:23:43 +00:00
Dennis Shen
8a28b319c1 Merge "Support trimmed variant build in soong" am: 0c79be54b6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2384492

Change-Id: Id290d10c8814fa511eb30b486563ff6db4d3cca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-27 20:22:10 +00:00
Treehugger Robot
6e7441edde Merge "Read ApexMkInfo for modules to be installed." 2023-01-27 15:45:08 +00:00
Dennis Shen
0c79be54b6 Merge "Support trimmed variant build in soong" 2023-01-27 13:11:50 +00:00
Jingwen Chen
29743c8423 Read ApexMkInfo for modules to be installed. 
This piggybacks onto the ApexInfo cquery handler, so we're issuing a
single bazel query call that reads two providers in the starlark expr.

Also rename requiredDeps to makeModulesToInstall to differentiate it from
APEX's required/provided libs in the apex manifest.

Test: unit test
Test: mkdiff
Fixes: 263123189
Change-Id: Ib7e43f1586f29864eee8627dba3631bfaff27afa
 2023-01-27 04:02:45 +00:00
Spandan Das
627fc3e436 Rename API surface provided to mainline modules 
This API surface is provided by platform and mainline modules to other
mainline modules. Rename it to module-lib API surface to align it with
the terminology in go/android-api-types

Test: go test ./bp2build
Test: go test ./cc
Change-Id: Ieb9f3214e66366fc2ceb6f47e2d6623acb537827
 2023-01-26 23:02:53 +00:00
Usta Shrestha
cae3bfa702 soong_build cmline args validation 
Bug: NA
Test: +ve: `m bp2build`, `m libc` etc. -ve: `m --bazel-mode-dev --bazel-mode-staging libc`, `m bp2build libc` etc
Change-Id: Idc6f3cc7b96c49a5a5e00f203c8d00a4777880c9
 2023-01-26 18:22:18 +00:00
Dennis Shen
e2ed70c61a Support trimmed variant build in soong 
variable.go:
add a new product variable TrimmedApex which is controlled by
environment variable PRODUCT_TRIMMED_APEX

config.go:
all config to check if trimmed build is turned on or not

apex.go:
add overridable apex module property:
use_DCLA: <DCLA apex module>

"use_DCLA" allows user to just use the lib list in DCLA to determine
which native shared libraries to trim. This property is no-op if
TrimApexEnabled is set to false.

builder.go
1, if it is to produce a trimmed variant, fix the default version code
by making the last variant digit to 2. this is only useful in local
build. in production build, there is apex manifest injection by
coastguard that determines the actual version code.

2, create a new apex rule called: "TrimmedApexRule", this rule invokes
an apexer wrapper called apexer_with_trim_preprocessing which will
properly trim the target libs.

BUG: b/259381334
TEST: adbd banchan build for both static and trimmed variant
Change-Id: I38a91cdef86a3c9185d00610ab3dd7acd07fd90a
 2023-01-26 15:57:21 +00:00
Sam Delmerico
4e115cc90d add androidmk cc-related variables to androidmk 
The adbd_test androidmk definition is missing some cc-related variables
for cc_test in mixed builds. These variables should be populated from
information from Bazel.

Bug: 265758350
Change-Id: I59d017e2eb2f139188ba3383c457cc0055372b61
 2023-01-25 15:14:03 -05:00
Sam Delmerico
9a84ff206d Merge "add error handling to cquery in MockBazelContext" am: 9202bb01de 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2400093

Change-Id: Ia3a57a6a55728fff0d076d6028380549cb2718b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 18:17:05 +00:00
Sam Delmerico
9202bb01de Merge "add error handling to cquery in MockBazelContext" 2023-01-25 17:08:12 +00:00
Treehugger Robot
8ec5a6bd66 Merge "bp2build support .kt in android_library" am: 7c30b6bad7 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2395474

Change-Id: I748160d43eeb6777bc020d3f94b092ca1370611c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 16:28:05 +00:00
Treehugger Robot
7c30b6bad7 Merge "bp2build support .kt in android_library" 2023-01-25 15:47:49 +00:00
Treehugger Robot
bc7d701416 Merge "Add additional adbd related tests to mixed staging" am: 8153bc40bb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2401284

Change-Id: I87dd748399f00a724c67a6e083ba6589152b73b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-25 14:00:52 +00:00
Liz Kammer
9c667416de Add additional adbd related tests to mixed staging 
Test: CI
Change-Id: I724e854dbbc67a1a37109e19935b28627066acc8
 2023-01-24 10:47:18 -05:00
Sam Delmerico
ce39f83538 add error handling to cquery in MockBazelContext 
Change-Id: Ia01072b6528caff2f3ceaca67cdba8b900924fe5
 2023-01-24 10:39:07 -05:00
Alix
36795a74dc bp2build support .kt in android_library 
Bug: 258690851
Test: bp2build tests and built target renderscript_toolkit
Change-Id: I43ddf5637c97e4849b63abd2423f29519d44c28f
 2023-01-24 14:53:44 +00:00
Xin Li
aa7f6f103e Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master 2023-01-13 07:32:55 +00:00
Treehugger Robot
a458ac0ede Merge "Optimize isAncestor" 2023-01-12 22:14:46 +00:00
Treehugger Robot
26248cf580 Merge changes I48426a8e,Ic991e3ae,I9768241f 
* changes:
  bp2build apex min_sdk_version w/ soong config var
  Handle soong config vars for string attrs
  bp2build correctly handle empty soong_config_var
 2023-01-12 19:11:27 +00:00
Cole Faust
3ac7db80f1 Optimize isAncestor 
Remove string copies.

Test: go test (there are existing visibility tests)
Change-Id: I575dcd8497527da03f88003ff0805f3d1271983e
 2023-01-12 11:00:40 -08:00
Alix Espino
ed2491cf20 Merge "java_binary with kotlin sources" 2023-01-12 14:40:46 +00:00
Xin Li
2391a2c527 Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 
Bug: 264720040
Merged-In: I70802042e5665baa471a3e9e0bc27efaf7a97944
Change-Id: If7ed30b5104e479d61245a768507715c249ec583
 2023-01-11 22:46:06 -08:00
Liz Kammer
f3963f8b9c bp2build correctly handle empty soong_config_var 
Previously in cases where a variable value was set but empty in a bp
file we ignored the value in bp2build; however, the correct behavior is
to take the empty value for each case. The tests for soong config vars
with empty_prop_for_string_var and unused_string_var:
https://cs.android.com/android/platform/superproject/+/master:build/soong/android/soong_config_modules_test.go;l=243-283;drc=72beb34609217f3c98623fb6795b6417c7f0fc65
highlight the difference in when conditions default should be used or
not.

Test: go test bp2build tests
Change-Id: I9768241f013a1a1bc8fa23657a066b5b3f52f09b
 2023-01-11 22:01:01 -08:00
Sasha Smundak
39a301c963 Clean up mixed builds module names filtering 
* Remove `Bp2buildCcLibraryStaticOnlyList` it is never set
* Remove the rest of the sutff related to it
* Streamline MixedBuildsEnabled
* Rename BazelContext.BazelAllowlisted to BazelContext.NameFilter
  to reflect its action
* Rename bazelContext to mixedBuildBazelContext
* Fix minor warnings from Go static analyzer

Test: treehugger
Change-Id: Ie245c992f94bbfd5c7c23dd06917026200a28263
 2023-01-12 00:32:45 +00:00
Jason Wu
c69b26311b Merge "Delete the noisy error message" 2023-01-11 21:21:32 +00:00
Sorin Basca
d6be9e51ca Target Java 17 
Bug: 233029164
Test: TH
Change-Id: I750b866565c264eb4f4ac14ebc88be6fc9b1b458
 2023-01-11 12:47:10 +00:00