StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,023 Commits 1 Branch 0 Tags
7050fe819b061ba156a99a49fca5ac7451f53b51
Commit Graph

3788 Commits

Author SHA1 Message Date
Treehugger Robot
0821b3bff7 Merge "Add android_sdk_repo_host to build platform-tools&build-tools" am: adf2b3e68f am: e89cd9f2b5 am: 57fbf57305 am: 4dc404e3bc am: de46f5cc11 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828170

Change-Id: I36da12f89cd704d3f3174490ee7f74da2c6fd959
 2021-10-15 03:39:17 +00:00
Treehugger Robot
de46f5cc11 Merge "Add android_sdk_repo_host to build platform-tools&build-tools" am: adf2b3e68f am: e89cd9f2b5 am: 57fbf57305 am: 4dc404e3bc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1828170

Change-Id: Iaa79cf78e10016a5fec86aadbd2f4e61e6ac87fc
 2021-10-15 03:22:22 +00:00
Treehugger Robot
adf2b3e68f Merge "Add android_sdk_repo_host to build platform-tools&build-tools" 2021-10-15 02:04:45 +00:00
Liz Kammer
6a2be9d6c9 Merge "Add missing directories to bp2build." am: 47a6c59819 am: 183628579e am: 74f79ad88f am: 7e7dc00983 am: 1cb3a4d9cc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856736

Change-Id: I19935fd086649dcd2a80c7bcff038e731985b0c1
 2021-10-14 15:11:56 +00:00
Liz Kammer
1cb3a4d9cc Merge "Add missing directories to bp2build." am: 47a6c59819 am: 183628579e am: 74f79ad88f am: 7e7dc00983 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1856736

Change-Id: I95fc6a6a38a12101f087d7b0d42c98241a23fb58
 2021-10-14 14:57:52 +00:00
Liz Kammer
2fc348986c Add missing directories to bp2build. 
Added directories with deps of adbd that were not converted and added
them to be converted via bp2build.

Test: bp2build.sh
Test: mixed_droid.sh
Change-Id: Iacb634b23e1fdc2767a0923882b71f482ebca53d
 2021-10-13 17:07:41 -04:00
Lev Rumyantsev
da391cd0b4 Merge "Support 64-bit arm_on_x86_64" am: 1eda2bd946 am: 524b468a25 am: 2b9c2fce9a am: 4c005364c3 am: ee83159194 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1854069

Change-Id: I4b5e686e47d900624b7cdf04702f309520ee285f
 2021-10-13 21:01:54 +00:00
Lev Rumyantsev
ee83159194 Merge "Support 64-bit arm_on_x86_64" am: 1eda2bd946 am: 524b468a25 am: 2b9c2fce9a am: 4c005364c3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1854069

Change-Id: I7c938b95a343db131f12a2a62aa24e78a45062ac
 2021-10-13 20:49:57 +00:00
Lev Rumyantsev
1eda2bd946 Merge "Support 64-bit arm_on_x86_64" 2021-10-13 19:42:49 +00:00
Treehugger Robot
a4a3a5ba42 Merge "bp2build: Add special arch-variant targets." am: 3bc7a1ba47 am: 1f211a9b88 am: 3796dae3e1 am: ebb0afdb18 am: 00e5c25973 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853859

Change-Id: Id5d02ce87557eeb5310aff74d53c5410cb4bb084
 2021-10-13 18:56:28 +00:00
Treehugger Robot
00e5c25973 Merge "bp2build: Add special arch-variant targets." am: 3bc7a1ba47 am: 1f211a9b88 am: 3796dae3e1 am: ebb0afdb18 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1853859

Change-Id: I438581f0541ed6dc4236f9e350bde092dc4353d1
 2021-10-13 18:32:05 +00:00
Lev Rumyantsev
34581212a4 Support 64-bit arm_on_x86_64 
hasArmAndroidArch only checked for 32-bit arm target and thus didn't
work properly on 64-bit only systems.

Test: CtsRsCppTestCases 64-bit only arm on x86
Bug: 194800662
Change-Id: I87332d793dcdd4859766c9067b9fd53f9e4c2516
 2021-10-13 09:55:10 -07:00
Liz Kammer
fdd72e6351 bp2build: Add special arch-variant targets. 
Soong supports additional arch-variant targets based on arch/os aside
from strictly arch/os names. Handle the unconverted cases based solely
on arch/os.

Test: build/bazel/ci/bp2build.sh
Change-Id: I8dc987b1aa4a4ea646dd5b03a94b84297ba6113a
 2021-10-13 09:01:56 -04:00
Dan Willemsen
9fe1410213 Add android_sdk_repo_host to build platform-tools&build-tools 
The Android SDK has been built with Make up until now, monolithically,
then split up into several sdk-repo zip files for different purposes.
The Mac and Windows SDKs really only need to contain the platform-tools
and build-tools pieces, but due to this monolithic sdk zip, we had to
build the whole SDK first.

This adds an `android_sdk_repo_host` module that can build these
platform-tools and build-tools zips.

Bug: 187222815
Change-Id: I55809e1d7447dd65e22461f921b2b8abb6d5f822
 2021-10-13 01:25:02 -07:00
Jay Aliomer
778582f415 Added src and exclude_src to debuggable builds 
Fixes: 200976245
Test: manually tested
Change-Id: I68b6230f30aa2c15e6a80010cd639ea453b4b29e
Merged-In: I68b6230f30aa2c15e6a80010cd639ea453b4b29e
(cherry picked from commit 85a8afa9e7)
 2021-10-12 19:26:04 +00:00
Liz Kammer
94ee9f9be7 Merge "Restrict mixed build cquery to deps of depth 2." am: 8cdd6f007d am: 1f93d920c2 am: fc1726a6f4 am: db5a142e1c am: 117fd8a2c6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1849693

Change-Id: I6e568f62e049beb91d3f7c0a29d64784d839d415
 2021-10-08 18:12:13 +00:00
Liz Kammer
8cdd6f007d Merge "Restrict mixed build cquery to deps of depth 2." 2021-10-08 17:04:02 +00:00
Xin Li
800112b97f Merge "Merge Android 12" 2021-10-07 23:50:21 +00:00
Jingwen Chen
69039e452d Stop relying on target.kind in mixed builds. am: 8f22274297 am: ad5acd94de am: ab55d27fc9 am: 9eb4b706a8 am: 9958aa9aab 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1849359

Change-Id: I859c5816875ba1fa6190ab1c36ed08770cd39c3b
 2021-10-07 21:07:32 +00:00
Jingwen Chen
ad5acd94de Stop relying on target.kind in mixed builds. am: 8f22274297 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1849359

Change-Id: Iabf3aaea4cec22e1bc46dc8677bed5e6a57e0a20
 2021-10-07 19:49:33 +00:00
Jingwen Chen
8f22274297 Stop relying on target.kind in mixed builds. 
target.kind was a field that existed for only a few months, and have
been removed from Bazel. This is needed to update to a newer Bazel version.

Also, this reverts filegroups to be queried for a specific arch again,
but leaving file targets in the common arch (which is correct, anyway).

Fixes: b/199363072
Test: mixed_libc
Test: presubmits
Change-Id: I3b8e5c43a39516d977d327a44a75750b2f251be3
 2021-10-07 14:04:38 +00:00
Liz Kammer
c19d5cdcff Restrict mixed build cquery to deps of depth 2. 
This will be the list of targets directly being requested + additional
targets necessary for mixed_root. This reduces the size of the cquery
file by ~300Kb. Additionally, it removes unnecessary targets, making it
ever so slightly easier to find what one is looking for in cquery.out
for debugging purposes.

Test: build/bazel/ci/mixed_droid.sh
Change-Id: I6d0e337c9ab7c13388459dee16415be0ab3c0506
 2021-10-06 18:16:58 -04:00
Pedro Loureiro
d9ab7aadf7 Merge "Perform validation of shared library attributes" 2021-10-05 10:15:50 +00:00
Christopher Parsons
1d269bfdac Merge "Remove more out-of-date items from denylist" am: b19d4cda2e am: f5a385f171 am: 800a24facb am: 1035608bbd am: dd6f9548f0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1844513

Change-Id: I5e7c755a83334bb2043a9223fbe4ccc71f582824
 2021-10-04 20:43:14 +00:00
Treehugger Robot
28f9c8d9d9 Merge "Bp2Build common properties auto-handling" am: d905146590 am: 3e745e63f3 am: 98f0fd07ca am: 6aaaea1740 am: 37ba2d3f8d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1815376

Change-Id: I110e0ec8b35ab3f86164e7cbd4db47aa01b65601
 2021-10-04 20:15:38 +00:00
Christopher Parsons
f5a385f171 Merge "Remove more out-of-date items from denylist" am: b19d4cda2e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1844513

Change-Id: Ic7a0cebac496ca1d07145b4cd28439b4fd373e70
 2021-10-04 19:44:07 +00:00
Treehugger Robot
28b1f9785e Merge "Make RuleBuilder fail fast when passed a nil Path" am: b5e3a79358 am: 70e2b79d9c am: 8361d2a052 am: 965c83d2d5 am: 244ea08777 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1844300

Change-Id: Ic3b165df2b1b9b4b97ecb78fb9e56f2a761fb18d
 2021-10-04 19:34:31 +00:00
Christopher Parsons
b19d4cda2e Merge "Remove more out-of-date items from denylist" 2021-10-04 19:31:36 +00:00
Treehugger Robot
3e745e63f3 Merge "Bp2Build common properties auto-handling" am: d905146590 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1815376

Change-Id: I38f1063302ea90583a51e625076e6232b4364ab7
 2021-10-04 19:20:28 +00:00
Treehugger Robot
d905146590 Merge "Bp2Build common properties auto-handling" 2021-10-04 19:02:07 +00:00
Treehugger Robot
70e2b79d9c Merge "Make RuleBuilder fail fast when passed a nil Path" am: b5e3a79358 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1844300

Change-Id: I6fe77f48ff5fd9b225bf577bc20821a05633067f
 2021-10-04 18:25:44 +00:00
Treehugger Robot
b5e3a79358 Merge "Make RuleBuilder fail fast when passed a nil Path" 2021-10-04 18:12:04 +00:00
Chris Parsons
b97a817fdb Remove more out-of-date items from denylist 
Test: mixed_droid CI
Change-Id: Ifc5bb10328860a5d979eb627a5347d8c23203155
 2021-10-04 12:48:29 -04:00
Christopher Parsons
c6ce40830a Merge "Remove out-of-date items from bp2build denylist" am: 9c03ef7790 am: 349f4963df am: d799253307 am: 997c0e9813 am: 3ac60f6165 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1843716

Change-Id: I297c40410ae06000e965bf1bb22f2a848fbecfb1
 2021-10-04 15:38:24 +00:00
Christopher Parsons
349f4963df Merge "Remove out-of-date items from bp2build denylist" am: 9c03ef7790 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1843716

Change-Id: I611dc8b307b7ac38e97f84a3bf4139e1260e1bd3
 2021-10-04 14:45:06 +00:00
Alex Márquez Pérez Muñíz Díaz Púras Thaureaux
447f6c99c9 Bp2Build common properties auto-handling 
Introduce `commonAttributes` & `fillCommonBp2BuildModuleAttrs used in
CreateBazelTargetModule

Adapt `bp2BuildInfo` to use `commonAttrs` instead of `Name`.
And thus also all downstream users of `CreateBazelTargetModule`.

As initial user, the Soong `required` property will be
translated to Bazel's `data`.

Bug: 198146582, 196091467
Test: build_converstion_test.go:TestCommonBp2BuildModuleAttrs
Test: go test
Test: mixed_{libc,droid}.sh
Change-Id: Ib500e40f7e2cb48c459f1ebe3188962fc41ec124
 2021-10-04 14:43:04 +00:00
Pedro Loureiro
f9e584dd20 Perform validation of shared library attributes 
Perform consistency checks as per http://go/updatable-shared-libraries

These include:
  * no attribute can specified can be less than T
  * max-device-sdk can't be less than min-device-sdk
  * min and max-device-sdk need to be at least the module's
  min_sdk_version
  * using on-bootclasspath-before implies that the module's
  min_sdk_version is at least T or the library has min-device-sdk of at
  least T

Test: m nothing

Bug: 191978330

Change-Id: Iaca5cf23fb0bc7e65effb3529c8e829560894c2e
 2021-10-04 14:42:34 +00:00
Paul Duffin
3866b89d15 Make RuleBuilder fail fast when passed a nil Path 
Previously, the RuleBuilder would add all supplied Paths directly to
one of its lists of Paths without checking to make sure it was not nil
only to panic somewhere in its Build() method when it attempted to
convert it to a string. Deferring the failure made it harder to debug.
This change fails fast by checking every Path when it is passed to the
RuleBuilder.

Test: m nothing
Change-Id: I06b35da02101f6dfab80d2daaf3d8e44ded8b6be
 2021-10-04 12:56:10 +01:00
Christopher Parsons
f9eafb70e1 Merge "bp2build: Handle target.linux" am: d6558d15bc am: 86a0c43017 am: 22fadd81f2 am: f2c70d1080 am: 35aec8151f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1843713

Change-Id: Ic352b43624f721158a7e47e13cc7dbf302be9b71
 2021-10-01 23:12:34 +00:00
Christopher Parsons
86a0c43017 Merge "bp2build: Handle target.linux" am: d6558d15bc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1843713

Change-Id: I89c7a1211cd22141b42333ad2c55e24b5caa6584
 2021-10-01 22:08:28 +00:00
Chris Parsons
c39f63358b Remove out-of-date items from bp2build denylist 
Test: mixed_droid CI
Change-Id: Ic51cf7ed193641882dbe0018818d8e3bcab53507
 2021-10-01 18:01:11 -04:00
Chris Parsons
2dde0cb3de bp2build: Handle target.linux 
Also refactor target.bionic to be handled not as its own configuration
axis, but instead to be grouped into os selects handling.

This allows us to remove libbase and its dependencies from the bp2build
denylist.

Test: mixed_droid.sh CI
Change-Id: I92f30074d286306207653fe37589835ae3db16c4
 2021-10-01 14:56:39 -04:00
Liz Kammer
78ccce1210 Correct path for removing old bazel artifacts am: d7d5b72e4e am: 55f82b0f02 am: b5f64253fd am: 1208d88009 am: 245b0f594c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1842591

Change-Id: Ib9e889a6603b2e288ae1c95526d114c3bf4d1fe3
 2021-10-01 16:31:51 +00:00
Liz Kammer
55f82b0f02 Correct path for removing old bazel artifacts am: d7d5b72e4e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1842591

Change-Id: I62f4c92912921fd0c372d8ce3eb5520561eec77e
 2021-10-01 15:36:37 +00:00
Liz Kammer
d7d5b72e4e Correct path for removing old bazel artifacts 
Test: mixed_libc.sh
Bug: 201767767
Change-Id: Ie34ac3a583dbefb6c4b79ea0756acef623116af7
 2021-10-01 10:33:12 -04:00
Ulyana Trafimovich
dcca138240 Merge "Remove unused variable SKIP_BOOT_JARS_CHECK." am: 1b5262bd69 am: ab70bc55c5 am: 9620d3392d am: 1cb2bf3b7e am: 93fc6b9067 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1841576

Change-Id: I09bbaebe1866e3682b67526475c64a6ceb67b66c
 2021-10-01 08:32:47 +00:00
Ulyana Trafimovich
ab70bc55c5 Merge "Remove unused variable SKIP_BOOT_JARS_CHECK." am: 1b5262bd69 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1841576

Change-Id: Ice0247fa07797d12f2c1911bee3569cffed5dee1
 2021-10-01 07:34:21 +00:00
Ulyana Trafimovich
1b5262bd69 Merge "Remove unused variable SKIP_BOOT_JARS_CHECK." 2021-10-01 07:21:39 +00:00
Chris Parsons
b578cde497 Temporarily disable libbase am: b1f405e66d am: c4f917591c am: fb3c2a191a am: 96f5b42702 am: ec24d753d6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1842754

Change-Id: I893a19f0874025a5ad6a1a0cf3c1957d82616cf1
 2021-09-30 23:10:30 +00:00
Chris Parsons
c4f917591c Temporarily disable libbase am: b1f405e66d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1842754

Change-Id: I154119390d6bfb641f2fd44040e6f658134f815c
 2021-09-30 22:12:37 +00:00