StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,740 Commits 1 Branch 0 Tags
13b9d25ed402e7b16de5d954019f2aaa064d80bd
Commit Graph

36740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lukács T. Berki
6b3fb3a12a Merge "Reenable test_glob_noop_incremental." 2021-04-21 14:28:52 +00:00
Paul Duffin
cfc5529a40 Merge "Rename propertyAccessor to propertyValueReader" am: 9a26f8cf2a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682432

Change-Id: Ia3c13c9a473d76729d978913200deb3be168f2a8
 2021-04-21 14:17:55 +00:00
Paul Duffin
9a26f8cf2a Merge "Rename propertyAccessor to propertyValueReader" 2021-04-21 13:51:35 +00:00
Liz Kammer
286c9fafa6 Fix bazel_handler_test.go 
Test: go test soong tests
Bug: 185963707
Change-Id: I738fead29c7054e9deaf03fd3e37d6862309885e
 2021-04-21 08:46:34 -04:00
Paul Duffin
894546d301 Skip initHiddenAPI check of prebuilt's boot dex jar for APEX modules 
There is a check in initHiddenAPI that makes sure that if the source
module has been replaced by a prebuilt the prebuilt provides a boot dex
jar. The check was added to try and detect an issue with hidden API
processing early at build time rather than at runtime.

That check relies on the source module having a PrebuiltDepTag
dependency on the prebuilt module that is preferred and will be used by
hidden API processing. That is true for modules that are not in an APEX
but doesn't work for modules that are in an APEX.

The issue is that an APEX variant of a source module depends on the
non-APEX variant of the corresponding prebuilt module. However, that
variant of the prebuilt is not the one that will be used by hidden API
processing; it will use the APEX variant of the prebuilt module which
is the one that has access to the boot dex jar.

That results in the initHiddenAPI check giving a false negative as it
states that the boot dex jar is not available when it may be.

This change simply skips the check is the source module is an APEX
variant. This is a temporary work around as the hidden API processing
is being modularized for each APEX at which point initHiddenAPI will
either be removed entirely or just skipped for APEXes altogether.

Bug: 179354495
Bug: 185828824
Test: m nothing
Change-Id: I2dc3654c9aa476541855b3f0f243a181ddf8d723
 2021-04-21 12:53:58 +01:00
Lukacs T. Berki
8d5b9e5ced Make symlink_forest.go prefer generated files. am: b21166e236 am: 53694b57ae 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682092

Change-Id: Iced763e7df3fe27a551a7f94b3cfc1c766a562ce
 2021-04-21 11:16:16 +00:00
Rupert Shuttleworth
2a4fc3ecdc Generate BUILD files for every directory that has an Android.bp file. 
Test: Added an integration test
Test: bazel build --package_path=out/soong/workspace //bionic/...

Change-Id: Ie34bd23ab3c5428e6c9c9919e5fb6fcb4e709adc
 2021-04-21 07:15:50 -04:00
Lukacs T. Berki
53694b57ae Make symlink_forest.go prefer generated files. am: b21166e236 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1682092

Change-Id: Ib343d340b6f862dfb45f8441e8445f263764609c
 2021-04-21 10:50:51 +00:00
Lukacs T. Berki
b21166e236 Make symlink_forest.go prefer generated files. 
Now, if the same file exists in the generated tree and the source tree,
it symlinks in the generated file instead of failing outright.

Drive-by fix: print errors for all conflicts instead of bailing out on
the first one.

Test: Presubmits (including the two new tests)
Change-Id: Ifb5b3fc89b5454d231966bfa4e61c22cd69834f3
 2021-04-21 12:24:27 +02:00
Lukacs T. Berki
69ed2a2b9e Reenable test_glob_noop_incremental. 
It accidentally got disabled in aosp/1676621 due to a merging mishap.

Test: Presubmits.
Change-Id: I10a090480008c72c2a8390fe30c64f666a177ea3
 2021-04-21 12:05:08 +02:00
Paul Duffin
64715ba9a4 Add PrepareForDebug_DO_NOT_SUBMIT 
Simplifies the process of debugging failing tests by making it easy for
the test fixture to produce debug output on a case by case basis.

Bug: 181070625
Test: m nothing
Change-Id: I22620a1bfb1737cffd017bdf7bbbfb609b60468c
 2021-04-21 10:16:31 +01:00
Paul Duffin
cc17bfe7de Rename propertyAccessor to propertyValueReader 
Bug: 179354495
Test: m nothing
Change-Id: I956e93fdbe43e09b5460337d2eb72084440f14be
 2021-04-21 10:14:02 +01:00
Lukács T. Berki
1242ae347d Merge "Rename cryptic symbols in symlink_forest.go ." am: c7985f6c92 am: 06f8e389f8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679775

Change-Id: I286406283471b654d833c1d64ac9d9591505936c
 2021-04-21 08:24:35 +00:00
Lukács T. Berki
06f8e389f8 Merge "Rename cryptic symbols in symlink_forest.go ." am: c7985f6c92 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679775

Change-Id: I18b857a8987aa3559432247d43cd8f9c5d74692c
 2021-04-21 08:05:03 +00:00
Lukács T. Berki
c7985f6c92 Merge "Rename cryptic symbols in symlink_forest.go ." 2021-04-21 07:44:30 +00:00
Jiyong Park
6038c75c3c Merge "android_system_image that generates linker.config.pb" am: 08bd0dd8c5 am: f8fa18e066 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679107

Change-Id: Ia70845331a8866e7d71e9e685d7a8450086a6cd2
 2021-04-21 05:41:38 +00:00
Jiyong Park
f8fa18e066 Merge "android_system_image that generates linker.config.pb" am: 08bd0dd8c5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679107

Change-Id: I7731388b1d0eee0a1319fe00c05d6b6c18870835
 2021-04-21 05:20:48 +00:00
Jiyong Park
08bd0dd8c5 Merge "android_system_image that generates linker.config.pb" 2021-04-21 04:57:49 +00:00
Julien Desprez
4a3cfbf167 Merge "Mark par_test as not unit tests" am: 1c79f990c2 am: c04158fa2d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1681347

Change-Id: Ief6ef82ce33d88a7687403fefefe83570cc87157
 2021-04-21 02:23:32 +00:00
Julien Desprez
c04158fa2d Merge "Mark par_test as not unit tests" am: 1c79f990c2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1681347

Change-Id: Ibc08ed5e6eff1f848c0fb4d24e2b0125b4dd4a77
 2021-04-21 02:04:21 +00:00
Julien Desprez
1c79f990c2 Merge "Mark par_test as not unit tests" 2021-04-21 01:39:49 +00:00
Treehugger Robot
71463ffb3a Merge "Do not output two trailing newlines in generated bp files." am: 1cd2357dd3 am: d9cffc9db5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1681267

Change-Id: I3c0fcdae47f0957af5ec0c86d8d9ccaa0e270de1
 2021-04-21 00:28:12 +00:00
Christopher Parsons
55c46a83f9 Merge "Subsume INTEGRATED_BP2BUILD into other env modes" am: 4e78814200 am: 2e95f06193 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1681805

Change-Id: I45e72a7227b77320d707d474234fe82fbf725b55
 2021-04-21 00:28:01 +00:00
Jiyong Park
fa616137a2 android_system_image that generates linker.config.pb 
android_system_image module type is a specialization of the
android_filesystem module type. Currently, it adds a build rule for
creating linker.config.pb from the information about all the other files
in the filesystem and includes linker.config.pb to the filesystem as
well.

To do so, the filesystem module now provides a function pointer which
subtype modules like android_system_image can implement to pass extra
files that they want to package in the filesystem.

In addition, the linkerconfig package is revised to make it possible to
build linker.config.pb file outside of the package.

Bug: 185391776
Test: m microdroid and inspect etc/linker.config.pb in it.

Change-Id: Id89c40b519213062860d7306029b8413d8d36a2d
 2021-04-21 09:11:21 +09:00
Treehugger Robot
d9cffc9db5 Merge "Do not output two trailing newlines in generated bp files." am: 1cd2357dd3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1681267

Change-Id: I23bf462006367d496fadeabd00b47a56cb0aff92
 2021-04-20 23:53:35 +00:00
Christopher Parsons
2e95f06193 Merge "Subsume INTEGRATED_BP2BUILD into other env modes" am: 4e78814200 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1681805

Change-Id: I20e818a730e7c4834069a12fc82e62b0eebbe077
 2021-04-20 23:52:09 +00:00
Treehugger Robot
1cd2357dd3 Merge "Do not output two trailing newlines in generated bp files." 2021-04-20 23:41:00 +00:00
Christopher Parsons
4e78814200 Merge "Subsume INTEGRATED_BP2BUILD into other env modes" 2021-04-20 23:33:40 +00:00
Jaewoong Jung
51d2ef5cf1 Merge changes Ibdeb2e5a,I520a5af4,I0db32bec,Id3ab0f3b am: cbb3825d86 am: 2c44af282d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1681228

Change-Id: Iddf5ae3c76e73e123342f0e2e2a3d8bd3b7c25cb
 2021-04-20 23:29:46 +00:00
Paul Duffin
714ecad749 Merge "Remove unused boot_images property and rename tag" am: d353f20179 am: 0d5f158d87 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679776

Change-Id: Ice59e5d27c38c1e1d41f14a3066196ddb2b872c8
 2021-04-20 23:29:38 +00:00
Chris Parsons
ec1a3dc6f8 Subsume INTEGRATED_BP2BUILD into other env modes 
This refactors bazel-build mode determination logic in soong_ui so it's
clearer which of three possible modes are being used in a given
invocation (NO_BAZEL, GENERATE_BUILD_FILES, or MIXED_BUILDS).

Test: bootstrap tests
Change-Id: I41d2baebf8d560c2cc42db8daa8b936101d453e3
 2021-04-20 19:25:48 -04:00
Jaewoong Jung
2c44af282d Merge changes Ibdeb2e5a,I520a5af4,I0db32bec,Id3ab0f3b am: cbb3825d86 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1681228

Change-Id: Icfe1271d734fe8bff532e311fe4a88882991e248
 2021-04-20 23:09:45 +00:00
Paul Duffin
0d5f158d87 Merge "Remove unused boot_images property and rename tag" am: d353f20179 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679776

Change-Id: I2cc2046eecf5b243b470c35325cc96226eb94183
 2021-04-20 23:08:31 +00:00
Jaewoong Jung
cbb3825d86 Merge changes Ibdeb2e5a,I520a5af4,I0db32bec,Id3ab0f3b 
* changes:
  Add lint_project_xml_test.py
  Rename lint-project-xml.py to remove dashes.
  Lint baseline file check in lint-project-xml
  Extract getBaselineFilepath method.
 2021-04-20 22:59:38 +00:00
Paul Duffin
d353f20179 Merge "Remove unused boot_images property and rename tag" 2021-04-20 22:53:08 +00:00
Jingwen Chen
ad581e3a8a Merge "Rename Label.Bp_text to OriginalModuleName." am: eff37d79bd am: d6d30b2e43 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679065

Change-Id: I3877064bfdaca0e670c8fac2381260f9b3b0c5ee
 2021-04-20 22:12:46 +00:00
Elliott Hughes
110617e984 Merge "Move builder.go over to llvm-objcopy." am: 2cb4cfc593 am: 9584abf7a3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1680365

Change-Id: Ib60466cd954bac4e0ba10aa9c22b1a90d33d37ae
 2021-04-20 22:12:39 +00:00
Jingwen Chen
d6d30b2e43 Merge "Rename Label.Bp_text to OriginalModuleName." am: eff37d79bd 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679065

Change-Id: I74166d4f34b889f6865bdbfd828371d9def97b22
 2021-04-20 21:50:43 +00:00
Elliott Hughes
9584abf7a3 Merge "Move builder.go over to llvm-objcopy." am: 2cb4cfc593 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1680365

Change-Id: I3502f16fc1013d6626f56ac8cdf54f8ada8ffdd4
 2021-04-20 21:49:58 +00:00
Jingwen Chen
eff37d79bd Merge "Rename Label.Bp_text to OriginalModuleName." 2021-04-20 21:45:18 +00:00
Elliott Hughes
2cb4cfc593 Merge "Move builder.go over to llvm-objcopy." 2021-04-20 21:30:58 +00:00
Treehugger Robot
8c41aa78f6 Merge "Incorporate filegroups into mixed builds." am: 61d83e90b1 am: 6067592100 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679689

Change-Id: Ibd4eae6be125daf3494023210cb6265ea01ff2b4
 2021-04-20 20:55:11 +00:00
Treehugger Robot
6067592100 Merge "Incorporate filegroups into mixed builds." am: 61d83e90b1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679689

Change-Id: Ie790e663530d07626db72c280abd53393ddf5297
 2021-04-20 20:28:38 +00:00
Treehugger Robot
61d83e90b1 Merge "Incorporate filegroups into mixed builds." 2021-04-20 18:53:03 +00:00
Jaewoong Jung
7b93908d2e Add lint_project_xml_test.py 
Test: lint_project_xml_test.py
Bug: 182349282
Change-Id: Ibdeb2e5aaf9dcdb02c5d30214e5ea89665145eb3
 2021-04-20 11:04:51 -07:00
Colin Cross
50db016173 Merge "Update for sharded globs" am: 14d09018eb am: e5af8f5c6b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1673775

Change-Id: Ib6b0dc0ff2a2cbeabf5598aa9cc8f8da4ad91b5a
 2021-04-20 16:51:28 +00:00
Lukács T. Berki
71e3b0894b Merge "Call mixed mode Bazel in the symlink forest." am: b8ea9f3cc8 am: e0496ed844 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679774

Change-Id: I0dd3453af8a62a9450ab7007bc787fa38e256c65
 2021-04-20 16:50:49 +00:00
Colin Cross
e5af8f5c6b Merge "Update for sharded globs" am: 14d09018eb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1673775

Change-Id: I344d7c64cdf22fc827a66bda3703d2ab23a0f14c
 2021-04-20 16:27:29 +00:00
Lukács T. Berki
e0496ed844 Merge "Call mixed mode Bazel in the symlink forest." am: b8ea9f3cc8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1679774

Change-Id: I8a9e87f07a215d7420236dd856bbb277dc74f2c6
 2021-04-20 16:24:10 +00:00
Colin Cross
14d09018eb Merge "Update for sharded globs" 2021-04-20 16:16:40 +00:00