Commits · fbb5e2ee8313fa05bd4a3d2033a36383a4466d4e · cheri / android_build_blueprint · GitLab

Dec 09, 2016
- Merge remote-tracking branch 'aosp/upstream' into race am: f9ede325 am: 29ce2017 am: 88727248 · fbb5e2ee
  Colin Cross authored Dec 09, 2016
  fbb5e2ee
- Merge remote-tracking branch 'aosp/upstream' into race am: f9ede325 am: 29ce2017 · 448856ea
  Colin Cross authored Dec 09, 2016
  448856ea
- Merge remote-tracking branch 'aosp/upstream' into race am: f9ede325 · 88727248
  Colin Cross authored Dec 09, 2016
  88727248
- Merge remote-tracking branch 'aosp/upstream' into race · 29ce2017
  Colin Cross authored Dec 09, 2016
  29ce2017
- Merge remote-tracking branch 'aosp/upstream' into race · f9ede325
  Colin Cross authored Dec 09, 2016
  f9ede325
- Merge pull request #136 from colincross/race · 92844f0d
  colincross authored Dec 09, 2016
  92844f0d
- Fix data race when applying replacements · 0ce142ca
  Colin Cross authored Dec 09, 2016
  0ce142ca
Nov 24, 2016
- Merge remote-tracking branch 'aosp/upstream' into master am: f6c12c9d am:... · 86d05759
  Colin Cross authored Nov 24, 2016
  86d05759
Nov 23, 2016
- Merge remote-tracking branch 'aosp/upstream' into master am: f6c12c9d am: b615421f · ba491bd3
  Colin Cross authored Nov 23, 2016
  ba491bd3
- Merge remote-tracking branch 'aosp/upstream' into master am: f6c12c9d · 82803331
  Colin Cross authored Nov 23, 2016
  82803331
- Merge remote-tracking branch 'aosp/upstream' into master · b615421f
  Colin Cross authored Nov 23, 2016
  b615421f
Nov 22, 2016
- Merge remote-tracking branch 'aosp/upstream' into master · f6c12c9d
  Colin Cross authored Nov 22, 2016
  f6c12c9d
- Merge pull request #135 from colincross/deps · 0f1fa92e
  colincross authored Nov 22, 2016
  0f1fa92e
- Support deps and depfile properties on build statements · aa873e1c
  Colin Cross authored Nov 22, 2016
  aa873e1c
Nov 15, 2016
- Merge remote-tracking branch 'aosp/upstream' into master am: ce31b335 am:... · b7a6ddd3
  Colin Cross authored Nov 15, 2016
  b7a6ddd3
- Merge remote-tracking branch 'aosp/upstream' into master am: ce31b335 am: 03790c8e · 123afa58
  Colin Cross authored Nov 15, 2016
  123afa58
- Merge remote-tracking branch 'aosp/upstream' into master am: ce31b335 · 6ad154b7
  Colin Cross authored Nov 15, 2016
  6ad154b7
- Merge remote-tracking branch 'aosp/upstream' into master · 03790c8e
  Colin Cross authored Nov 15, 2016
  03790c8e
- Merge remote-tracking branch 'aosp/upstream' into master · ce31b335
  Colin Cross authored Nov 14, 2016
  ce31b335
- Merge pull request #134 from colincross/glob · 8c5b1d1f
  colincross authored Nov 14, 2016
  8c5b1d1f
Nov 14, 2016
- Fix optional_subdirs globbing · 08e4954a
  Colin Cross authored Nov 14, 2016
  08e4954a
Nov 06, 2016
- Merge remote-tracking branch 'aosp/upstream' into master am: 5e10ceb3 am:... · 6089819f
  Colin Cross authored Nov 06, 2016
  6089819f
- Merge remote-tracking branch 'aosp/upstream' into master am: 5e10ceb3 am: 286845f3 · 7e43a36c
  Colin Cross authored Nov 06, 2016
  7e43a36c
- Merge remote-tracking branch 'aosp/upstream' into master am: 5e10ceb3 · be538e26
  Colin Cross authored Nov 06, 2016
  be538e26
- Merge remote-tracking branch 'aosp/upstream' into master · 286845f3
  Colin Cross authored Nov 06, 2016
  286845f3
Nov 05, 2016
- Merge remote-tracking branch 'aosp/upstream' into master · 5e10ceb3
  Colin Cross authored Nov 05, 2016
  5e10ceb3
- Merge pull request #133 from colincross/glob · 36518a61
  colincross authored Nov 05, 2016
  36518a61
- Add better error message when stat returns nil · ced59eea
  Colin Cross authored Nov 05, 2016
  ced59eea
Nov 04, 2016
- Merge remote-tracking branch 'aosp/upstream' into master am: 4dedb64f am:... · 260571ce
  Colin Cross authored Nov 04, 2016
  260571ce
- Merge remote-tracking branch 'aosp/upstream' into master am: 4dedb64f am: 16ca1f8e · 60ccc505
  Colin Cross authored Nov 04, 2016
  60ccc505
- Merge remote-tracking branch 'aosp/upstream' into master am: 4dedb64f · 6c3a3e02
  Colin Cross authored Nov 04, 2016
  6c3a3e02
- Merge remote-tracking branch 'aosp/upstream' into master · 16ca1f8e
  Colin Cross authored Nov 04, 2016
  16ca1f8e
Nov 03, 2016
- Merge remote-tracking branch 'aosp/upstream' into master · 4dedb64f
  Colin Cross authored Nov 03, 2016
  4dedb64f
- Merge pull request #131 from colincross/glob · 09e03f31
  colincross authored Nov 03, 2016
  09e03f31
- Import globbing from Soong · 127d2eae
  Colin Cross authored Nov 01, 2016
  127d2eae
- Merge remote-tracking branch 'aosp/upstream' into master am: a255dffd am:... · ba229e34
  Dan Willemsen authored Nov 03, 2016
  ba229e34
- Merge remote-tracking branch 'aosp/upstream' into master am: a255dffd am: e313c1fd · 55d4310f
  Dan Willemsen authored Nov 03, 2016
  55d4310f
- Merge remote-tracking branch 'aosp/upstream' into master am: a255dffd · 723465d4
  Dan Willemsen authored Nov 03, 2016
  723465d4
- Merge remote-tracking branch 'aosp/upstream' into master · e313c1fd
  Dan Willemsen authored Nov 03, 2016
  e313c1fd
Nov 02, 2016
- Merge remote-tracking branch 'aosp/upstream' into master · a255dffd
  Dan Willemsen authored Nov 02, 2016
  a255dffd