Jaewoong Jung
428ebae61a
Merge remote-tracking branch 'upstream/master' into master
...
am: 9e75985c0d
2019-03-08 16:06:46 -08:00
Jaewoong Jung
eaf410fe20
Merge pull request #243 from patricearruda/master
...
Moving the ParseBlueprintsFiles comment in context.go.
2019-03-08 14:28:58 -08:00
Patrice Arruda
b0a40a717a
Moving the ParseBlueprintsFiles go comment in context.go.
...
The go comment for the blueprint.Context.ParseBlueprintsFiles was
actually place above the blueprint.Context.ParseFileList.
Bug: N/A
Test: N/A
Change-Id: I065d2f6ec034c614e40de745931f4c87cdb73422
2019-03-08 14:17:43 -08:00
Jaewoong Jung
9e75985c0d
Merge remote-tracking branch 'upstream/master' into master
...
* upstream/master:
Panic when copying private properties.
Fixes: 126917357
Test: m checkbuild
Change-Id: I34a7fd48c99c80cdbaadf547a7e9d84f180a6108
2019-03-08 13:18:46 -08:00
Jaewoong Jung
5e9f9070d5
Merge pull request #242 from gyias/bpdoc
...
Panic when copying private properties.
2019-03-08 09:24:49 -08:00
Jaewoong Jung
7d699c37ec
Panic when copying private properties.
...
When CopyProperties comes across private properties, it silently ignores
them. This is error-prone and can result in a bug very hard to debug if
the developer is unaware of the behavior.
Change-Id: Id6a0752e384ec7fed35728c1e87dbfa95fea84f2
2019-03-07 16:24:56 -08:00
Colin Cross
65baa5ec75
Merge remote-tracking branch 'aosp/upstream' into master am: ba03162726 am: fe4eb94eb0
...
am: 2cab480e58
2019-03-07 12:06:35 -08:00
Colin Cross
2cab480e58
Merge remote-tracking branch 'aosp/upstream' into master am: ba03162726
...
am: fe4eb94eb0
2019-03-07 11:27:58 -08:00
Colin Cross
fe4eb94eb0
Merge remote-tracking branch 'aosp/upstream' into master
...
am: ba03162726
2019-03-07 11:04:58 -08:00
Colin Cross
ba03162726
Merge remote-tracking branch 'aosp/upstream' into master
...
* aosp/upstream:
Add PropertyIndexesWithTag
Test: m checkbuild
Change-Id: I9a0268603f8040fc3133819ed46c45f396551073
2019-03-06 14:32:07 -08:00
colincross
a9df651359
Merge pull request #241 from colincross/tagindex
...
Add PropertyIndexesWithTag
2019-03-05 23:15:15 -08:00
Colin Cross
bdec5d9c71
Merge remote-tracking branch 'aosp/upstream' into master am: d8000d21a9 am: 8954814fb5
...
am: 8d7c363c12
2019-03-05 20:06:32 -08:00
Colin Cross
8d7c363c12
Merge remote-tracking branch 'aosp/upstream' into master am: d8000d21a9
...
am: 8954814fb5
2019-03-05 19:49:58 -08:00
Colin Cross
a4f6a3bebf
Add PropertyIndexesWithTag
...
Add a function that returns all of the indexes to properties in
a property struct that are tagged with `name:"value"`.
Test: proptools/tag_test.go
Change-Id: I00294934c1a0383c8b64ecaabc0e138682efb2e5
2019-03-05 19:47:43 -08:00
Colin Cross
8954814fb5
Merge remote-tracking branch 'aosp/upstream' into master
...
am: d8000d21a9
2019-03-05 19:42:56 -08:00
Colin Cross
1af3e35bdd
Merge remote-tracking branch 'aosp/upstream' into master am: 2a80a36834 am: 34c5c48468
...
am: 065ac47e03
2019-03-04 10:30:04 -08:00
Colin Cross
065ac47e03
Merge remote-tracking branch 'aosp/upstream' into master am: 2a80a36834
...
am: 34c5c48468
2019-03-04 10:26:01 -08:00
Colin Cross
34c5c48468
Merge remote-tracking branch 'aosp/upstream' into master
...
am: 2a80a36834
2019-03-04 10:22:01 -08:00
Colin Cross
d8000d21a9
Merge remote-tracking branch 'aosp/upstream' into master
...
* aosp/upstream:
Add more OtherModule* methods
Run go 1.11 and go 1.12 in travis
Support go 1.12
Test: m checkbuild
Change-Id: I9ed244b6c1a928590fb8220fb00cc8b1d4ef8c60
2019-03-03 17:36:33 -08:00
colincross
17a0b96440
Merge pull request #240 from colincross/other_module
...
Add more OtherModule* methods
2019-03-03 17:06:47 -08:00
Colin Cross
d28b304d30
Add more OtherModule* methods
...
Add OtherModuleDir, OtherModuleSubDir, and OtherModuleType to
ModuleContext and TopDownMutatorContext, and add ModuleType to
BaseModuleContext.
Change-Id: If5c873a2620ef10333c0bdba5ab89d4256e5fdf2
2019-03-01 13:44:15 -08:00
colincross
bf8c1d31d9
Merge pull request #239 from colincross/go1.12
...
Support go 1.12
2019-02-28 19:52:33 -08:00
Colin Cross
16b01609ce
Run go 1.11 and go 1.12 in travis
...
Change-Id: If8d53ca83fb97cc6b68e3e5f4025119bb3ea2502
2019-02-28 14:42:04 -08:00
Colin Cross
f7104c0ad6
Support go 1.12
...
go 1.12 changed the stack trace of a function call during global
variable initialization to contain a function called
"PKG.init.ializers". Fix callerName to split the package path
and function name on the first "." after the last "/", and look
for functions called "init.ializers" or functions with the
prefix "init."
Change-Id: Ic2190837a8c4cde075f727bd69dd18d517a0ebc0
2019-02-28 14:38:42 -08:00
Colin Cross
2a80a36834
Merge remote-tracking branch 'aosp/upstream' into master
...
* aosp/upstream:
Replace *Escape with *EscapeList
Test: m checkbuild
Change-Id: I29a36d6ced9d5a97a123df7f85448e89cdc980ab
2019-02-28 14:33:15 -08:00
colincross
284c742a33
Merge pull request #219 from colincross/escape_list
...
Replace *Escape with *EscapeList
2019-02-28 11:14:02 -08:00
Alex Light
68a4367c51
Merge remote-tracking branch 'aosp/upstream' into master am: 2255c706d4 am: 8cb211b3ce
...
am: 014bc227c4
2019-02-28 09:44:08 -08:00
Alex Light
014bc227c4
Merge remote-tracking branch 'aosp/upstream' into master am: 2255c706d4
...
am: 8cb211b3ce
2019-02-28 09:32:00 -08:00
Alex Light
8cb211b3ce
Merge remote-tracking branch 'aosp/upstream' into master
...
am: 2255c706d4
2019-02-28 09:17:01 -08:00
Alex Light
2255c706d4
Merge remote-tracking branch 'aosp/upstream' into master
...
* aosp/upstream:
GetDirectDepWithTag needs to check all tags before panicing
Allow Context to query Singletons
Test: Manual
Bug: 124507633
Bug: 125933724
Change-Id: If0a51961133a7dcbe7c779220130a203bcabed70
2019-02-28 00:30:43 +00:00
colincross
02c110735d
Merge pull request #238 from allight/rebase-add-java-services
...
GetDirectDepWithTag needs to check all tags before panicing
2019-02-27 16:13:57 -08:00
Alex Light
142de248fa
GetDirectDepWithTag needs to check all tags before panicing
...
GetDirectDeWithTag would panic if the first possible directDep did not
have the correct tag. It should check to see if any version of that
dependency has the right tag.
Test: atest CtsJdwpTunnelHostTestCases
Bug: 124507633
Bug: 125933724
Change-Id: I00d269130e9f136a93fd30c58b8fd929372d5b37
2019-02-27 15:34:26 -08:00
colincross
8908a0a806
Merge pull request #237 from colincross/singleton
...
Allow Context to query Singletons
2019-02-26 10:54:08 -08:00
Colin Cross
9226d6c9f5
Allow Context to query Singletons
...
Add Context.Singletons and Context.SingletonName to allow primary
builders to query Singletons returned by all registered
SingletonFactories.
Change-Id: Iee85643dd47f7472e6bb5ae8004374bd6ea0419e
2019-02-26 10:15:40 -08:00
Xin Li
471af31777
Merge stage-aosp-master into pi-dev-plus-aosp
...
am: 054707924c
2019-02-25 05:05:32 -08:00
Xin Li
054707924c
Merge stage-aosp-master into pi-dev-plus-aosp
...
Bug: 126125118
Change-Id: Ia3eb52ef279aaf79ec76025b6efa6ba036cab99b
2019-02-25 00:27:11 -08:00
Xin Li
ee10093dbb
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
Bug: 120848293
Change-Id: I7d3b801c3eb7a8ff2e60170450428eadd2dbdf2b
2019-02-20 16:17:20 -08:00
Dan Willemsen
732dc6038d
Add asmundak and jungjw to OWNERS am: f01f87af85 am: 969f1e6416
...
am: da2e532b1b
2019-02-19 20:06:28 -08:00
Dan Willemsen
da2e532b1b
Add asmundak and jungjw to OWNERS am: f01f87af85
...
am: 969f1e6416
2019-02-19 19:56:10 -08:00
Dan Willemsen
969f1e6416
Add asmundak and jungjw to OWNERS
...
am: f01f87af85
2019-02-19 19:47:04 -08:00
Sasha Smundak
879895ca58
Merge remote-tracking branch 'aosp/upstream' into master am: 012c4ff202 am: 024b7591f7
...
am: 7fd1017a5f
2019-02-19 17:57:40 -08:00
Sasha Smundak
7fd1017a5f
Merge remote-tracking branch 'aosp/upstream' into master am: 012c4ff202
...
am: 024b7591f7
2019-02-19 17:45:40 -08:00
Sasha Smundak
024b7591f7
Merge remote-tracking branch 'aosp/upstream' into master
...
am: 012c4ff202
2019-02-19 17:41:37 -08:00
Dan Willemsen
f01f87af85
Add asmundak and jungjw to OWNERS
...
Change-Id: Id47482e111a99945c9b441e4a9d3c46f4b1e6a1f
2019-02-20 01:29:22 +00:00
Sasha Smundak
012c4ff202
Merge remote-tracking branch 'aosp/upstream' into master
...
* aosp/upstream:
Export CollapseDuplicateProperties, Soong writedocs uses it
Change-Id: Ib237ea5810b9793725d1b7f6c21286058413b2b7
Test: Manual
Bug: 120512870
2019-02-19 10:57:14 -08:00
asmundak
d444506bf6
Merge pull request #235 from asmundak/collapseduplicate
...
Export CollapseDuplicateProperties, Soong writedocs uses it
2019-02-17 16:36:43 -08:00
Colin Cross
f2d9157218
Merge remote-tracking branch 'aosp/upstream' into master am: 1387a00b5f am: d8494be0a8
...
am: c2c1b3da19
2019-02-15 19:27:14 -08:00
Colin Cross
c2c1b3da19
Merge remote-tracking branch 'aosp/upstream' into master am: 1387a00b5f
...
am: d8494be0a8
2019-02-15 19:23:12 -08:00
Colin Cross
d8494be0a8
Merge remote-tracking branch 'aosp/upstream' into master
...
am: 1387a00b5f
2019-02-15 19:19:10 -08:00
Colin Cross
1387a00b5f
Merge remote-tracking branch 'aosp/upstream' into master
...
* aosp/upstream:
Support examples as tests
Test: m checkbuild
Change-Id: Iee685124952a1e7c1bf1fe33ebfcb249b3ffbe69
2019-02-15 17:17:31 -08:00
