Colin Cross
8954814fb5
Merge remote-tracking branch 'aosp/upstream' into master
...
am: d8000d21a9
Change-Id: I910f58b12fb5e8b3b08dcc207541c9ab10233bdb
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
Change-Id: I66e1a1185d9974800db097298cfe2443759d2193
2019-03-04 10:30:04 -08:00
Colin Cross
065ac47e03
Merge remote-tracking branch 'aosp/upstream' into master am: 2a80a36834
...
am: 34c5c48468
Change-Id: I287b6dc9adf222e528bbb7489285fa34422e3929
2019-03-04 10:26:01 -08:00
Colin Cross
34c5c48468
Merge remote-tracking branch 'aosp/upstream' into master
...
am: 2a80a36834
Change-Id: Icae8e6316a18cfb42da278008e77f8d5c86e42e3
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
Change-Id: I5d0a51ebfa6fbc8cf62a8c3d3b6d17fd4d009508
2019-02-28 09:44:08 -08:00
Alex Light
014bc227c4
Merge remote-tracking branch 'aosp/upstream' into master am: 2255c706d4
...
am: 8cb211b3ce
Change-Id: Icca1ffeecb7b7b7d944cf4bf20ba86d07f37292d
2019-02-28 09:32:00 -08:00
Alex Light
8cb211b3ce
Merge remote-tracking branch 'aosp/upstream' into master
...
am: 2255c706d4
Change-Id: I5c58efe3c8a7e085882b18a08647eea74f7b1f24
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
Change-Id: I445a27e4fa7c943c866b1ab000692381b9bbc475
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
Change-Id: I6c67a29e3d668865ba8bf54fc71372357b1c50ac
2019-02-19 20:06:28 -08:00
Dan Willemsen
da2e532b1b
Add asmundak and jungjw to OWNERS am: f01f87af85
...
am: 969f1e6416
Change-Id: Id34965f320edb1e7db79879afa81051d7b40b550
2019-02-19 19:56:10 -08:00
Dan Willemsen
969f1e6416
Add asmundak and jungjw to OWNERS
...
am: f01f87af85
Change-Id: Id27b15f40fea48b5af94186f43f94e23a7a3cfbf
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
Change-Id: I197f695e92e0f6408ef28cf09abf92734424e500
2019-02-19 17:57:40 -08:00
Sasha Smundak
7fd1017a5f
Merge remote-tracking branch 'aosp/upstream' into master am: 012c4ff202
...
am: 024b7591f7
Change-Id: Ia63c6075519c50cc6a38c42c42c5b461d9e114fc
2019-02-19 17:45:40 -08:00
Sasha Smundak
024b7591f7
Merge remote-tracking branch 'aosp/upstream' into master
...
am: 012c4ff202
Change-Id: I4a0ebbaf96f6e64f873e8aa85ac207fd86738781
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
Change-Id: I536d32b0806d8ba22022187c22e469a7e2dac303
2019-02-15 19:27:14 -08:00
Colin Cross
c2c1b3da19
Merge remote-tracking branch 'aosp/upstream' into master am: 1387a00b5f
...
am: d8494be0a8
Change-Id: Id5c4c03216a0d8c6a5c49b76f32816ae3cd1c7d8
2019-02-15 19:23:12 -08:00
Colin Cross
d8494be0a8
Merge remote-tracking branch 'aosp/upstream' into master
...
am: 1387a00b5f
Change-Id: I8551374e9a820c9a7486dfdddaea40442718a74a
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
colincross
58edc0fa5c
Merge pull request #236 from colincross/examples
...
Support examples as tests
2019-02-15 16:39:32 -08:00
Colin Cross
463eab7950
Support examples as tests
...
go test supports running examples as tests and verifying their
output, add support for running them to gotestmain.
Change-Id: If51abc64467d4701195cefc6db513f4d008794b5
2019-02-15 15:13:37 -08:00
Sasha Smundak
797563bec4
Export CollapseDuplicateProperties, Soong writedocs uses it
2019-02-14 10:58:48 -08:00
Jaewoong Jung
01ba7fe62b
Merge remote-tracking branch 'aosp/upstream' am: e2f3158478
am: 676fb278d8
...
am: 8f71fd97b9
Change-Id: Ib48eaa6499114440b7a1346df19645fc5546acf7
2019-02-13 20:42:13 -08:00
Jaewoong Jung
8f71fd97b9
Merge remote-tracking branch 'aosp/upstream' am: e2f3158478
...
am: 676fb278d8
Change-Id: I235560fd50d31cbc2877fcb24dfd727677a5cf91
2019-02-13 20:30:20 -08:00
Jaewoong Jung
676fb278d8
Merge remote-tracking branch 'aosp/upstream'
...
am: e2f3158478
Change-Id: I922e5c2661b439c6a890a35a20ba7a72f834ffd2
2019-02-13 20:14:58 -08:00
Jaewoong Jung
e2f3158478
Merge remote-tracking branch 'aosp/upstream'
...
* aosp/upstream:
bpdoc improvements
Test: m soong_docs
Change-Id: I363be21199fdd0cd361cbd4ea14e6d7ddcd0526b
2019-02-13 12:25:02 -08:00
Jaewoong Jung
33cfa1c98a
Merge pull request #234 from gyias/bpdoc
...
bpdoc improvements
2019-02-12 11:32:37 -08:00
Jaewoong Jung
781f6b2896
bpdoc improvements
...
1. Extract module type documentation.
2. Support primary builder customization of factory function to use for
documentation for each module type.
3. Change the ModuleType list order so that they are grouped by package.
This is basically minor refactoring + readability improvement done on
top of https://github.com/google/blueprint/pull/232 .
Change-Id: If7413e5ac23486b85f18d02fb3ba288a38730c32
2019-02-08 15:48:27 -08:00
Colin Cross
a26fd01be7
Merge remote-tracking branch 'aosp/upstream' into master am: 0a9f800555
am: 2a391f2ed7
...
am: 744502f1a9
Change-Id: I5b76d85501f9f6f650e400a30cdc8ad39c4038e6
2019-01-24 15:55:42 -08:00
Colin Cross
744502f1a9
Merge remote-tracking branch 'aosp/upstream' into master am: 0a9f800555
...
am: 2a391f2ed7
Change-Id: I937725997413e5b00fef8c690ee45caff945e67c
2019-01-24 15:34:23 -08:00
Colin Cross
2a391f2ed7
Merge remote-tracking branch 'aosp/upstream' into master
...
am: 0a9f800555
Change-Id: I89d74a22e971f57ebcbd28785ef542c293e180b0
2019-01-24 15:31:25 -08:00
Colin Cross
0a9f800555
Merge remote-tracking branch 'aosp/upstream' into master
...
* aosp/upstream:
Use sync.Map for type field cache
Write ninja file directly to the output file
Add pprof labels
Test: m checkbuild
Change-Id: I15d2689b25fc8a654f7eb4b9de5b64c5cc96ed5f
2019-01-24 10:40:12 -08:00
colincross
3eeabc7991
Merge pull request #231 from colincross/pprof
...
Performance improvements
2019-01-24 10:32:25 -08:00