Commit Graph

35251 Commits

Author SHA1 Message Date
Yi Kong
171c509cb9 Merge "Fix toc.sh, llvm-nm does not recognise '-f P' option" am: 15f5d688d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663144

Change-Id: I27e1f231813a350a3eabfc17aba6ae172546710b
2021-04-03 04:46:41 +00:00
Yi Kong
15f5d688d0 Merge "Fix toc.sh, llvm-nm does not recognise '-f P' option" 2021-04-03 03:59:26 +00:00
Rupert Shuttleworth
523b14d5c4 Merge "Allow Bazel actions to see the SHELL variable." am: 176cf46f40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663462

Change-Id: I26595f770e8db4b3ffa8b45f74414aaed3bad81e
2021-04-03 03:41:36 +00:00
Rupert Shuttleworth
176cf46f40 Merge "Allow Bazel actions to see the SHELL variable." 2021-04-03 03:07:36 +00:00
Treehugger Robot
c7a2bd6b6e Merge "Remove unused cquery requests." am: 100d5d6732
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663379

Change-Id: I06feaf98a951e271916dbd26bc07da0e5ec4ad08
2021-04-02 22:30:48 +00:00
Treehugger Robot
100d5d6732 Merge "Remove unused cquery requests." 2021-04-02 21:50:40 +00:00
Rupert Shuttleworth
bf94d2fdba Allow Bazel actions to see the SHELL variable.
Test: TH
Change-Id: I97ffe7ad84dfb8d58d0e6d022f73d97a73778129
2021-04-02 20:09:51 +00:00
Yi Kong
6f43f54264 Fix toc.sh, llvm-nm does not recognise '-f P' option
llvm-nm only accepts full name for format option, or just '-P' alias.

Test: build
Bug: 184360305
Change-Id: Ie25f5410403f4dbca564430149a5753e0d48d60d
2021-04-03 03:21:24 +08:00
Liz Kammer
cf58a4d272 Merge "Add depfile handling for bazel_handler." am: 5ad66aaf41
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1653143

Change-Id: I67cc14fe31353fd449587cab6d056d8500b8b881
2021-04-02 17:14:07 +00:00
Liz Kammer
5ad66aaf41 Merge "Add depfile handling for bazel_handler." 2021-04-02 17:06:07 +00:00
Steven Moreland
3f34589233 Merge "Export header check allows WholeStaticLibs" am: f42daa716c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1662670

Change-Id: I701cd70f484d45c3e5755e56692b8cd4ddf3d8a2
2021-04-02 16:58:12 +00:00
Jaewoong Jung
f7c8d8a746 Merge "Revert "Revert "Add min_sdk_version to java_import.""" am: d0afefa4b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663082

Change-Id: I3c9fb749aa4584e158696f16a43eb2ef0f712568
2021-04-02 16:27:17 +00:00
Colin Cross
107c6aaef5 Merge "Silence kotlinc JDK9 warnings" am: 2fbc234fd6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1656462

Change-Id: If91250912aec76e676ae4c0180f69e9c1c4a6e36
2021-04-02 16:10:51 +00:00
Steven Moreland
f42daa716c Merge "Export header check allows WholeStaticLibs" 2021-04-02 16:03:59 +00:00
Jaewoong Jung
d0afefa4b1 Merge "Revert "Revert "Add min_sdk_version to java_import.""" 2021-04-02 15:49:58 +00:00
Colin Cross
2fbc234fd6 Merge "Silence kotlinc JDK9 warnings" 2021-04-02 15:39:13 +00:00
Liz Kammer
09f9231e91 Remove unused cquery requests.
Test: go test soong tests
Change-Id: Ie7a72bc73ccf4d9b8aa2a0b20c1674d3a5b499de
2021-04-02 11:03:15 -04:00
Jaewoong Jung
56e12dbbaf Revert "Revert "Add min_sdk_version to java_import.""
This reverts commit 5ab6508008.

Reason for revert: Resubmitting Ie255f74d40432f4bdd0092d618705a7d17235e58 after fixing the broken targets.

Bug: 183695497
Test: https://android-build.googleplex.com/builds/forrest/run/L58600000849810513
Change-Id: I5f072f396002ca3a45bd530ad9be987efa732833
2021-04-02 04:55:27 +00:00
Julien Desprez
d27a7fad3f Merge "Remove tradefed static_lib heuristic" am: cb05715e9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638101

Change-Id: I75312967ceead525d02c9171480b8c78e2d41a88
2021-04-02 04:22:25 +00:00
Julien Desprez
cb05715e9e Merge "Remove tradefed static_lib heuristic" 2021-04-02 03:47:13 +00:00
Yi Kong
115fc28122 Merge "Move toc.sh to use LLVM binutils" am: 948205699b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661823

Change-Id: I4a1a0741560a9122e2656cefa8624fd28a07859f
2021-04-02 03:23:57 +00:00
Yi Kong
948205699b Merge "Move toc.sh to use LLVM binutils" 2021-04-02 02:38:16 +00:00
Jaewoong Jung
7644361eef Merge "Revert "Add min_sdk_version to java_import."" am: 37a5d5ebd8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663080

Change-Id: Ie97a1b3bd0d2bbcd6feb64c3aa9018a431157007
2021-04-02 01:14:07 +00:00
Jaewoong Jung
37a5d5ebd8 Merge "Revert "Add min_sdk_version to java_import."" 2021-04-02 00:34:06 +00:00
Jaewoong Jung
5ab6508008 Revert "Add min_sdk_version to java_import."
This reverts commit 6d15d63556.

Reason for revert: Broke git_sc-mainline-prod on test_suites_x86_64

Fixes: 184305592
Change-Id: I4b2e2675e0dd9e2e84966f545a52f45d5b731bab
2021-04-02 00:17:59 +00:00
Steven Moreland
ba407c8afa Export header check allows WholeStaticLibs
cc/linker.go code assumes that export_static_lib_headers can apply
regardless of whether a library is a regular or 'whole' static lib.
However, this check prevents that code from working.

Bug: 183654927
Test: use export_static_lib_headers like this
Change-Id: I680f90514e41224a7077630167ab4e481909d89c
2021-04-02 00:03:44 +00:00
Ryan Prichard
a9cf131c22 Merge "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" am: 252831b03a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661300

Change-Id: I5b330c63f7ac37ed479cc776d6f642f1419de5b5
2021-04-01 23:19:45 +00:00
Ryan Prichard
252831b03a Merge "Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"" 2021-04-01 22:42:33 +00:00
Treehugger Robot
2b4fc842c3 Merge "bp2build: don't generate a WORKSPACE." am: acabe1b625
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661819

Change-Id: Id8613659c572d8bbdffbd107a5536ed540ca90eb
2021-04-01 21:34:32 +00:00
Treehugger Robot
acabe1b625 Merge "bp2build: don't generate a WORKSPACE." 2021-04-01 20:59:01 +00:00
Jaewoong Jung
e37f90021f Merge "Add min_sdk_version to java_import." am: 51a0d85ebc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660819

Change-Id: I3910928b88293464faa18d4a6c1a0b1e6d1871a9
2021-04-01 20:12:41 +00:00
Jaewoong Jung
51a0d85ebc Merge "Add min_sdk_version to java_import." 2021-04-01 19:45:53 +00:00
Lukács T. Berki
ae5bf80c7c Merge "Reorganize soong_build/main.go ." am: c5b3a1722c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1662203

Change-Id: I822eed4dbe069298e929114ef0f37b4c0ca459f6
2021-04-01 19:13:21 +00:00
Paul Duffin
cdc1757b07 Merge "Convert remaining rust tests to use test fixtures" am: e6165d0f46
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658074

Change-Id: Iee307b1ed305c2c253177303a83da5adef64e54f
2021-04-01 19:07:51 +00:00
Lukács T. Berki
c5b3a1722c Merge "Reorganize soong_build/main.go ." 2021-04-01 19:05:31 +00:00
Paul Duffin
e6165d0f46 Merge "Convert remaining rust tests to use test fixtures" 2021-04-01 18:13:23 +00:00
Lukacs T. Berki
6790ebcc59 Reorganize soong_build/main.go .
This makes it more easy to see what's happening under which modes. Modes
are:

- Regular builds
- Mixed mode builds
- bp2build
- soong_docs

Test: Presubmit + bootstrap_test.sh
Change-Id: I06e3fcb84986b919be1cd9eb456531259ede1183
2021-04-01 18:01:14 +02:00
Paul Duffin
35bc45ceb4 Merge changes Idc01d3cc,I644db99c am: 379f36b6e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660144

Change-Id: I174a0e255bb43f98f2c23571e5f8a73549ab2278
2021-04-01 15:05:33 +00:00
Nikita Ioffe
72d1c2f38e Merge "Revert "Allow dependencies from platform variants to APEX modules."" am: 6f77314381
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660243

Change-Id: I5632ea7d16b0efec256bfdf094946051f9221e58
2021-04-01 15:03:24 +00:00
Paul Duffin
379f36b6e5 Merge changes Idc01d3cc,I644db99c
* changes:
  Remove FixturePreparer.Extend()
  Remove FixtureFactory
2021-04-01 14:34:02 +00:00
Nikita Ioffe
6f77314381 Merge "Revert "Allow dependencies from platform variants to APEX modules."" 2021-04-01 14:22:53 +00:00
Jingwen Chen
6c309cd0ac bp2build: don't generate a WORKSPACE.
bp2build doesn't need to generate a WORKSPACE file.

Also cleanup conversion_test.go.

Test: TH
Change-Id: Iba2f4b2f71d72ccf8b148cd11d78c190f93560c4
2021-04-01 11:50:27 +00:00
Nikita Ioffe
d64139f8e5 Revert "Allow dependencies from platform variants to APEX modules."
Revert submission 1658000

Reason for revert: Breaks full-eng build: b/184239856
Reverted Changes:
I4f8ead785:Avoid internal APEX stubs for libsigchain and clea...
I68affdf69:Allow dependencies from platform variants to APEX ...
I54b33784e:Rename libdexfile_external_static to libdexfile_st...
Id68ae9438:libdexfile_external is being replaced by libdexfil...
I12ac84eb4:libdexfile_external is replaced by libdexfile.
If05dbffc8:Rename libdexfile_external_static to libdexfile_st...
Ia011fa3a8:Merge libdexfile_external into libdexfile.

Change-Id: If494dc5385042a4620a76a9eadc1613ae0eb1655
2021-04-01 10:58:24 +00:00
Paul Duffin
4ec4ca02bd Merge "Remove apexFixtureFactory" am: abc89cf86b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660142

Change-Id: I9e0a781c0f3a41fb0a122a51eae59514b929fc48
2021-04-01 10:49:48 +00:00
Paul Duffin
abc89cf86b Merge "Remove apexFixtureFactory" 2021-04-01 10:26:15 +00:00
Ulyana Trafimovich
5517ed23b7 Merge "Emit a better error message in manifest_check.py." am: 400a1b1309
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660140

Change-Id: I05d88e641f2c23fa630a456a9623a7aa1ccd8d93
2021-04-01 10:10:18 +00:00
Paul Duffin
4d662d84bd Merge "Add a new platform_bootclasspath module type" am: 920e205e9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655612

Change-Id: Ib048f843f7e29cdd87db1016b993d2028d5e8da3
2021-04-01 10:10:09 +00:00
Rupert Shuttleworth
b094dbf747 Merge "Annotate bp2buildModuleDoNotConvertList with reasons for modules being blocked." am: 97c4304ca9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1661719

Change-Id: I31f7c3460595c2f87dc5bc43fb5cdb2db75ac84c
2021-04-01 10:03:11 +00:00
Ulyana Trafimovich
400a1b1309 Merge "Emit a better error message in manifest_check.py." 2021-04-01 09:58:15 +00:00
Yi Kong
4ad44e713b Move toc.sh to use LLVM binutils
Test: build
Change-Id: Ib965b6ea3fba6ae007135ac7e167cc50f0f6e3de
2021-04-01 17:45:42 +08:00