Commit graph

1424 commits

Author SHA1 Message Date
Dan Willemsen
18dd77d8a9 Merge remote-tracking branch 'aosp/upstream' am: d877dde242 am: bc3c09c88d am: ae72f8c943 am: 69f1c17e4a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1349285

Change-Id: I6da02ab7475c0968ea8e1bc7c978b3135198130a
2020-06-25 01:41:53 +00:00
Dan Willemsen
69f1c17e4a Merge remote-tracking branch 'aosp/upstream' am: d877dde242 am: bc3c09c88d am: ae72f8c943
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1349285

Change-Id: I86a6cc569f0566c95a92d5db0842edf17ffae28d
2020-06-25 01:27:04 +00:00
Dan Willemsen
ae72f8c943 Merge remote-tracking branch 'aosp/upstream' am: d877dde242 am: bc3c09c88d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1349285

Change-Id: I279abc2a2c2a088e7fee4e573ff6447b009678b5
2020-06-25 01:09:56 +00:00
Dan Willemsen
bc3c09c88d Merge remote-tracking branch 'aosp/upstream' am: d877dde242
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1349285

Change-Id: I5847b94560a809797bee3b7cbff9de1c87a8b1a8
2020-06-25 00:54:17 +00:00
Dan Willemsen
d877dde242 Merge remote-tracking branch 'aosp/upstream'
* aosp/upstream:
  Stop writing depfiles from Glob singleton

Bug: 159845846
Test: manually check that changes to directories cause glob re-execution
Test: second build after a clean does not rerun soong_build
Change-Id: I1f257f3f11f70cb407397854fd85292dd0d0b08e
2020-06-24 16:22:27 -07:00
Dan Willemsen
fe13954f3c
Merge pull request #306 from danw/globs
Stop writing depfiles from Glob singleton
2020-06-24 14:35:11 -07:00
Dan Willemsen
55252655d2 Stop writing depfiles from Glob singleton
This makes a minimal difference on my AOSP tree (which is on a fast NVME
drive), but it saves ~10-15% of the time in our primary builder
(soong_build) on larger trees on slower drives.

We're always going to run the glob tool at least once outside of the
primary builder, and ninja only loads depfiles created after running the
tool, so this should be a no-op change.

We still need to write the list file (if it has changed), since that's
the file we're adding as a dependency of the primary builder, so the
effective timestamp must be earlier than the build.ninja timestamp.

Change-Id: I872b7581da50e7f2089daa7e248ca05b6703f019
2020-06-24 14:23:22 -07:00
Chris Parsons
590f1b22c2 Merge remote-tracking branch 'aosp/upstream' into pull-upstream-2 am: 10b473fefa am: 470dd942e7 am: bb39193bd0 am: da743f5e01
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1339763

Change-Id: I0372c4e84c9f08bbd5df3d28826e3b193698a160
2020-06-16 23:34:00 +00:00
Chris Parsons
da743f5e01 Merge remote-tracking branch 'aosp/upstream' into pull-upstream-2 am: 10b473fefa am: 470dd942e7 am: bb39193bd0
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1339763

Change-Id: I16778eaa128b3b33857fe02bfa1aed5ac3ead813
2020-06-16 23:18:17 +00:00
Chris Parsons
bb39193bd0 Merge remote-tracking branch 'aosp/upstream' into pull-upstream-2 am: 10b473fefa am: 470dd942e7
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1339763

Change-Id: I9f3a7f0a64afd6781c5b662a97a76c57f3be1a78
2020-06-16 23:01:54 +00:00
Chris Parsons
470dd942e7 Merge remote-tracking branch 'aosp/upstream' into pull-upstream-2 am: 10b473fefa
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1339763

Change-Id: Ifcf191ebc34518c85a7a79b149e7eaa2d06c8e8a
2020-06-16 22:47:53 +00:00
Chris Parsons
10b473fefa Merge remote-tracking branch 'aosp/upstream' into pull-upstream-2
* aosp/upstream:
  Use github actions instead of travis
  Export ModuleListFile in bootstrap (with fix) (#304)
  Revert "Merge pull request #301 from c-parsons/modulelistfile"
  Revert "Always emit rules for tests and add phony to run them"
  Revert changes to singleton_ctx.go
  Change bootstrap.moduleListFile to be exported
  Add a getter for ModuleListFile to SingletonContext

Test: `m nothing` and treehugger
Change-Id: I37cb1b08d962ab34d3b7d7999496795986315217
2020-06-16 13:02:55 -04:00
Dan Willemsen
2c0cd0ac8d
Merge pull request #305 from danw/ghactions
Use github actions instead of travis
2020-06-15 11:19:25 -07:00
Dan Willemsen
bb7ecb7fb3 Use github actions instead of travis
Change-Id: I8a03ca383c53bbcacc403cb954fc2ec2af8fe33d
2020-06-15 10:32:10 -07:00
c-parsons
fe2fa04c30
Export ModuleListFile in bootstrap (with fix) (#304)
* Export ModuleListFile in bootstrap (with fix)

* Run gofmt on command.go
2020-06-15 09:03:27 -07:00
colincross
743261c07e
Merge pull request #303 from colincross/blueprint_tests
Revert changes that broke the build or tests
2020-06-11 16:34:45 -07:00
Colin Cross
bae4de9f16 Revert "Merge pull request #301 from c-parsons/modulelistfile"
This reverts commit 1160e9826f, reversing
changes made to 3a153ecc7f.
2020-06-11 16:29:43 -07:00
Colin Cross
f89751462c Revert "Always emit rules for tests and add phony to run them"
This reverts commit 63085f9e7c.

It breaks the blueprint tests, and we aren't use it yet, so revert
it for now.

Change-Id: I1ac81371342285e8d57baf15fe3a223d4140c6cf
2020-06-11 16:23:10 -07:00
colincross
1160e9826f
Merge pull request #301 from c-parsons/modulelistfile 2020-06-04 14:42:05 -07:00
Colin Cross
b79cf1fe2d Merge remote-tracking branch 'aosp/upstream' am: 91fa1c8b99 am: f7f790fe75 am: 4542cd49da am: d05a5951d2
Change-Id: I8e44c9f7cefd4326f754d84fd4404c45e8fdd3f6
2020-05-28 03:57:52 +00:00
Colin Cross
d05a5951d2 Merge remote-tracking branch 'aosp/upstream' am: 91fa1c8b99 am: f7f790fe75 am: 4542cd49da
Change-Id: I3e24360667e2aecd6496d0712c2fe8307dfd7dfc
2020-05-28 03:28:49 +00:00
Colin Cross
4542cd49da Merge remote-tracking branch 'aosp/upstream' am: 91fa1c8b99 am: f7f790fe75
Change-Id: I5491370aaef5d8442e01ffc63ea7f3863a490445
2020-05-28 03:13:08 +00:00
Colin Cross
f7f790fe75 Merge remote-tracking branch 'aosp/upstream' am: 91fa1c8b99
Change-Id: I032e8b1478d5aa46fe603dd346705c22bcefd581
2020-05-28 02:59:50 +00:00
c-parsons
01e094f1b4
Revert changes to singleton_ctx.go 2020-05-27 21:34:26 -04:00
c-parsons
8690f8f196
Change bootstrap.moduleListFile to be exported 2020-05-27 21:31:07 -04:00
Colin Cross
91fa1c8b99 Merge remote-tracking branch 'aosp/upstream'
* aosp/upstream:
  Add ctx.OtherModule(Reverse)DependencyVariantExists.

Bug: 151303681
Test: treehugger
Change-Id: I2389db5e558a34b8a44756bdd2a5f91a0a0f6a3f
2020-05-26 14:48:26 -07:00
colincross
3a153ecc7f
Merge pull request #300 from marstj/master
Add ctx.OtherModule(Reverse)DependencyVariantExists.
2020-05-26 13:27:14 -07:00
Martin Stjernholm
2f212479e2 Add ctx.OtherModule(Reverse)DependencyVariantExists.
This allows guarding calls to AddVariationDependencies and
AddReverseDependency to register dependencies on optional modules.
2020-05-26 20:52:43 +01:00
Chris Parsons
56a06b3c06 Add a getter for ModuleListFile to SingletonContext 2020-05-20 13:50:58 -04:00
Automerger Merge Worker
d911212345 Merge "Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: c9944506d5 am: 97f031a094" into rvc-d1-dev-plus-aosp am: a30810562a
Change-Id: Iffb94de512e8e79e4a02a5cef92b76062a236bda
2020-05-19 05:06:34 +00:00
Automerger Merge Worker
590ff013e5 Merge "Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: c9944506d5 am: 1d7824d66a am: d863dbf2ed" into rvc-qpr-dev-plus-aosp 2020-05-19 05:06:07 +00:00
Colin Cross
eb5dac3961 Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: c9944506d5 am: 1d7824d66a am: ea7e0bfc0d
Change-Id: I0c0e96c17693024252744fb1e08adec6ca64425f
2020-05-19 05:06:02 +00:00
Colin Cross
78ba6f48f1 Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: c9944506d5 am: 1d7824d66a am: d863dbf2ed
Change-Id: Ie4806d4dc8737bc2056a8a5682bf1cad6a38ed7d
2020-05-19 05:06:02 +00:00
Automerger Merge Worker
a30810562a Merge "Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: c9944506d5 am: 97f031a094" into rvc-d1-dev-plus-aosp 2020-05-19 04:53:51 +00:00
Colin Cross
f34ce0b6e5 Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: c9944506d5 am: 97f031a094
Change-Id: I5d80dfba93fc6818d44166888118dcb204e98885
2020-05-19 04:53:47 +00:00
Colin Cross
d863dbf2ed Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: c9944506d5 am: 1d7824d66a
Change-Id: Ia043802de0d6e2c9afdf98ffc347c42ce3463d1c
2020-05-19 04:53:41 +00:00
Colin Cross
ea7e0bfc0d Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: c9944506d5 am: 1d7824d66a
Change-Id: I8875f3f7686f9be5687d2d0f875f468df334f5df
2020-05-19 04:53:39 +00:00
Colin Cross
97f031a094 Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: c9944506d5
Change-Id: I5c76a82998c0d1219719fc2dd1c707fde905bf3e
2020-05-19 04:43:54 +00:00
Colin Cross
1d7824d66a Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: c9944506d5
Change-Id: Icc3d03d869d972959045fd4aac858aeafc4eb3b3
2020-05-19 04:43:53 +00:00
Colin Cross
c9944506d5 Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev
* goog/mirror-aosp-master:
  Support checking syntax of generated Blueprint files
  Always emit rules for tests and add phony to run them

Bug: 155628860
Test: treehugger
Change-Id: Ie843b929edf1c11c201792eefcb7772b1e6daeb8
2020-05-18 17:07:28 -07:00
Colin Cross
b490703183 Merge remote-tracking branch 'aosp/upstream' am: 709f28242e am: 0f1a8e2f85 am: ee5caa6d7b am: 71d87e6985
Change-Id: I99dddcc80496136e0bb549451c87c60a0bc80cf2
2020-05-18 21:26:21 +00:00
Colin Cross
71d87e6985 Merge remote-tracking branch 'aosp/upstream' am: 709f28242e am: 0f1a8e2f85 am: ee5caa6d7b
Change-Id: Iabae4845713316ece1cb36d8db9b30743f9411af
2020-05-18 21:16:10 +00:00
Colin Cross
ee5caa6d7b Merge remote-tracking branch 'aosp/upstream' am: 709f28242e am: 0f1a8e2f85
Change-Id: I8a804d271b249d67f558d7d15c3f895166d150f8
2020-05-18 20:58:07 +00:00
Colin Cross
0f1a8e2f85 Merge remote-tracking branch 'aosp/upstream' am: 709f28242e
Change-Id: I4aee761b65fdde0fbe2640df98dafc2a68cdd0b0
2020-05-18 20:40:44 +00:00
Colin Cross
709f28242e Merge remote-tracking branch 'aosp/upstream'
* aosp/upstream:
  Support checking syntax of generated Blueprint files
  Always emit rules for tests and add phony to run them

Bug: 155628860
Bug: 156428456
Test: treehugger
Change-Id: Ia0e0c8d8d07489c945d4e03d039273cc3f597ac0
2020-05-18 12:03:48 -07:00
colincross
2bcc43c60f
Merge pull request #299 from paulduffin/master
Support checking syntax of generated Blueprint files
2020-05-14 16:10:00 -07:00
Paul Duffin
2a2c58ef46 Support checking syntax of generated Blueprint files
Adds a CheckBlueprintSyntax(...) method to check the syntax of a
Blueprint file.

Changes processModuleDef and newModule from being method on *Context to
being standalone functions. That ensures that CheckBlueprintSyntax(...)
does not need to take a context and so there is no chance that it can
change its state.
2020-05-13 09:06:17 +01:00
colincross
301749801e
Merge pull request #298 from colincross/blueprint_tests
Always emit rules for tests and add phony to run them
2020-05-12 20:45:35 -07:00
Colin Cross
63085f9e7c Always emit rules for tests and add phony to run them
Emit the rules to build blueprint tests even if runGoTests is not
set, and add a phony rule "blueprint_tests" to run them.  This will
allow Soong to stop running the tests at the beginning of every build
but still run them as part of checkbuild or with a manual
`m blueprint_tests`.

Bug: 156428456
Test: m
Test: m blueprint_tests
Change-Id: If293a0757766d3046e78bf230a1825f15adc68fd
2020-05-12 19:20:26 -07:00
Colin Cross
a97c32d709 [automerger skipped] Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: 300b6297f4 -s ours am: 0aa8d6d0bb -s ours am: 685eb7d958 -s ours
am skip reason: Change-Id I649f2a524f200d696b038ee6bc99d95308e1b475 with SHA-1 6f902c4134 is in history

Change-Id: I7f72127bc09e468f01cd850980a5a94747b03913
2020-05-07 08:05:06 +00:00