Commit graph

1603 commits

Author SHA1 Message Date
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
Automerger Merge Worker
10f1637183 Merge "[automerger skipped] Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: 300b6297f4 am: 8cc4c871c4 -s ours am: 9cf5d0dd78 -s ours" into rvc-qpr-dev-plus-aosp 2020-05-07 08:05:02 +00:00
Colin Cross
92d198072a [automerger skipped] Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: 300b6297f4 am: 8cc4c871c4 -s ours am: 9cf5d0dd78 -s ours
am skip reason: Change-Id I649f2a524f200d696b038ee6bc99d95308e1b475 with SHA-1 6f902c4134 is in history

Change-Id: Ifbca35c1e867e214451a64b7d7e867c8b08ec642
2020-05-07 08:04:58 +00:00
Colin Cross
1f6de0e4d5 [automerger skipped] Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: 300b6297f4 am: 8cc4c871c4 am: e51aae576d -s ours
am skip reason: Change-Id I649f2a524f200d696b038ee6bc99d95308e1b475 with SHA-1 6f902c4134 is in history

Change-Id: I029602572d66413d7816fb4649a031481ab2a77c
2020-05-07 08:04:54 +00:00
Colin Cross
685eb7d958 [automerger skipped] Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: 300b6297f4 -s ours am: 0aa8d6d0bb -s ours
am skip reason: Change-Id I649f2a524f200d696b038ee6bc99d95308e1b475 with SHA-1 6f902c4134 is in history

Change-Id: Ib54885c197081418ccf70a0fce599d1c05b421af
2020-05-07 07:26:22 +00:00
Colin Cross
e51aae576d Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: 300b6297f4 am: 8cc4c871c4
Change-Id: Iba3ab9552a1f478a068154f07f817f01dee5d3ac
2020-05-07 07:26:17 +00:00
Colin Cross
9cf5d0dd78 [automerger skipped] Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: 300b6297f4 am: 8cc4c871c4 -s ours
am skip reason: Change-Id I649f2a524f200d696b038ee6bc99d95308e1b475 with SHA-1 6f902c4134 is in history

Change-Id: I0c65555f54b7210da3c3f0248f8586611a203e05
2020-05-07 07:25:30 +00:00
Colin Cross
0aa8d6d0bb [automerger skipped] Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: 300b6297f4 -s ours
am skip reason: Change-Id I649f2a524f200d696b038ee6bc99d95308e1b475 with SHA-1 6f902c4134 is in history

Change-Id: I3102c52dd904376e2dd127db2312bf9341ef8686
2020-05-07 07:11:55 +00:00
Colin Cross
8cc4c871c4 Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev am: 300b6297f4
Change-Id: Iff1292b0504285196328fe2bd3c21dca03bfc35c
2020-05-07 07:11:53 +00:00
Colin Cross
300b6297f4 Merge remote-tracking branch 'goog/mirror-aosp-master' into rvc-dev
* goog/mirror-aosp-master:
  Run LoadHooks before registering module
  Actually write an empty ninja file with --empty-ninja-file

Bug: 155462403
Test: treehugger
Change-Id: Ia2e5856c52407cebca56abb195915b370e26f0e7
Merged-In: I649f2a524f200d696b038ee6bc99d95308e1b475
2020-05-07 00:30:24 +00:00
Colin Cross
8d9ff31909 Merge remote-tracking branch 'aosp/upstream' am: 6f902c4134 am: 8f60c67b41 am: 96d10b19c9 am: 199aa5a6b6
Change-Id: I52dab89f285c4b96430322b9794b0635733e8869
2020-05-06 03:24:16 +00:00
Colin Cross
199aa5a6b6 Merge remote-tracking branch 'aosp/upstream' am: 6f902c4134 am: 8f60c67b41 am: 96d10b19c9
Change-Id: I13ba26847bf5fd1525e2bc00f16ea7deb51cc8fd
2020-05-06 03:07:39 +00:00
Colin Cross
96d10b19c9 Merge remote-tracking branch 'aosp/upstream' am: 6f902c4134 am: 8f60c67b41
Change-Id: I2a216b21bfdc6b5188c19d49504804a6f901adc5
2020-05-06 02:53:57 +00:00
Colin Cross
8f60c67b41 Merge remote-tracking branch 'aosp/upstream' am: 6f902c4134
Change-Id: I49d97f46239283fadb938133d26b801d714c6327
2020-05-06 02:43:36 +00:00
Colin Cross
6f902c4134 Merge remote-tracking branch 'aosp/upstream'
* aosp/upstream:
  Run LoadHooks before registering module

Bug: 155462403
Test: treehugger
Change-Id: I649f2a524f200d696b038ee6bc99d95308e1b475
2020-05-04 08:30:27 -07:00
colincross
b0fe51a0c2
Merge pull request #297 from paulduffin/master
Run LoadHooks before registering module
2020-05-04 08:27:39 -07:00
Paul Duffin
244033b20f Run LoadHooks before registering module
Previously a LoadHook could not modify the name of a module because the
module was registered before the LoadHooks were run. That made it very
complicated (requiring mutators and auto generated names) to create a
module type whose name was determined by say the directory in which it
is defined.

This change moves the LoadHook execution slightly earlier so it runs
before registration of the module.

That caused one slight side problem which was that the
moduleInfo.Name() would fail when called in a LoadHook. That was
because that gets the name from group.name but was group was nil
because it is only set when the module is registered.

Modifying the moduleInfo.Name() method to get the name from the module
logicModule.Name() if group is nil fixed that. The reason for getting
the name from the group.name rather than the logicModule.Name() is that
the former tracks renames but the latter does not. However that is not
an issue in this case as there has been no opportunity for the module
to be renamed until after the LoadHook has returned.
2020-05-04 14:16:03 +01:00
Dan Willemsen
2dffd62528 Merge remote-tracking branch 'aosp/upstream' am: ec5085e613 am: 6a1534fcc8 am: 81426fa08b am: d865a2f8c1
Change-Id: I1034e1e8f1d1dfaf0361f66b626ad198ac8b10fe
2020-04-20 14:11:56 +00:00
Dan Willemsen
d865a2f8c1 Merge remote-tracking branch 'aosp/upstream' am: ec5085e613 am: 6a1534fcc8 am: 81426fa08b
Change-Id: I29ccb78140ca71b5e2b373eb830116870b7f3b9c
2020-04-20 13:56:09 +00:00
Dan Willemsen
81426fa08b Merge remote-tracking branch 'aosp/upstream' am: ec5085e613 am: 6a1534fcc8
Change-Id: I7b22e7fd4aec98613f0d1831e5518ae6c6b96d47
2020-04-20 13:27:02 +00:00
Dan Willemsen
6a1534fcc8 Merge remote-tracking branch 'aosp/upstream' am: ec5085e613
Change-Id: If5a2fa9080bfcc884b8bc6ed7bba72d0c8357002
2020-04-20 13:05:05 +00:00
Dan Willemsen
ec5085e613 Merge remote-tracking branch 'aosp/upstream'
* aosp/upstream:
  Actually write an empty ninja file with --empty-ninja-file

Test: treehugger (build_test)
Change-Id: Iff7851f2aa39eb14b7ae72ed6ce94fa0ce8d2621
2020-04-19 15:20:02 -07:00
Dan Willemsen
2a062a2ef0
Merge pull request #296 from danw/emptyfile
Actually write an empty ninja file with --empty-ninja-file
2020-04-19 13:32:06 -07:00