Commits · 4c832f27cf409248e0c6758df3c098437c733f54 · cheri / android_build_blueprint · GitLab

Aug 31, 2016
- Merge remote-tracking branch 'aosp/upstream' into master am: 9430d486 am:... · 4c832f27
  Dan Willemsen authored Aug 31, 2016
  4c832f27
- Merge remote-tracking branch 'aosp/upstream' into master am: 9430d486 am: 077aa5fa · c647dbf4
  Dan Willemsen authored Aug 31, 2016
  c647dbf4
- Merge remote-tracking branch 'aosp/upstream' into master am: 9430d486 · 8b20d013
  Dan Willemsen authored Aug 31, 2016
  8b20d013
- Merge remote-tracking branch 'aosp/upstream' into master · 077aa5fa
  Dan Willemsen authored Aug 31, 2016
  077aa5fa
- Merge remote-tracking branch 'aosp/upstream' into master · 9430d486
  Dan Willemsen authored Aug 31, 2016
  9430d486
- Merge pull request #121 from danw/simple_bootstrap · 4a35b514
  Dan Willemsen authored Aug 31, 2016
  4a35b514
- Simplify bootstrap · 7d0dddd8
  Dan Willemsen authored Aug 13, 2016
  7d0dddd8
Aug 30, 2016
- Merge remote-tracking branch 'aosp/upstream' into master am: 62e5e9bb am:... · 36e027d2
  Colin Cross authored Aug 30, 2016
  36e027d2
- Merge remote-tracking branch 'aosp/upstream' into master am: 62e5e9bb am: 05d6604f · d6eeed49
  Colin Cross authored Aug 30, 2016
  d6eeed49
- Merge remote-tracking branch 'aosp/upstream' into master am: 62e5e9bb · 4c075b7a
  Colin Cross authored Aug 30, 2016
  4c075b7a
- Merge remote-tracking branch 'aosp/upstream' into master · 05d6604f
  Colin Cross authored Aug 30, 2016
  05d6604f
Aug 29, 2016
- Merge remote-tracking branch 'aosp/upstream' into master · 62e5e9bb
  Colin Cross authored Aug 29, 2016
  62e5e9bb
- Merge pull request #120 from colincross/builtin · 3fc513f9
  colincross authored Aug 29, 2016
  3fc513f9
- Add NewBuiltinRule and NewBuiltinPool · e0e473ef
  Colin Cross authored Aug 29, 2016
  e0e473ef
Aug 23, 2016
- Merge remote-tracking branch 'aosp/upstream' into master am: ec648798 am:... · 7504b1e7
  Colin Cross authored Aug 23, 2016
  7504b1e7
- Merge remote-tracking branch 'aosp/upstream' into master am: ec648798 am: 61dc5c4e · 168cee07
  Colin Cross authored Aug 23, 2016
  168cee07
- Merge remote-tracking branch 'aosp/upstream' into master am: ec648798 · 2c4024d8
  Colin Cross authored Aug 23, 2016
  2c4024d8
- Merge remote-tracking branch 'aosp/upstream' into master · 61dc5c4e
  Colin Cross authored Aug 23, 2016
  61dc5c4e
- Merge remote-tracking branch 'aosp/upstream' into master · ec648798
  Colin Cross authored Aug 22, 2016
  ec648798
Aug 22, 2016
- Merge pull request #119 from colincross/extend · b9fb0ad5
  colincross authored Aug 22, 2016
  b9fb0ad5
- Relax type requirements when extending properties · bf2adbfe
  Colin Cross authored Aug 19, 2016
  bf2adbfe
Aug 18, 2016
- Merge pull request #118 from mortonfox/patch-1 · 7fda24e5
  colincross authored Aug 17, 2016
  7fda24e5
- Update link to Ninja · ebb35417
  Morton Fox authored Aug 18, 2016
  
  ebb35417
Aug 15, 2016
- Merge pull request #117 from colincross/variant · e412f09f
  colincross authored Aug 15, 2016
  e412f09f
Aug 12, 2016
- Merge remote-tracking branch 'aosp/upstream' into master am: 00e2bd79 am:... · 5ee5f5d3
  Colin Cross authored Aug 12, 2016
  5ee5f5d3
- Merge remote-tracking branch 'aosp/upstream' into master am: 00e2bd79 am: b73accc8 · d8692463
  Colin Cross authored Aug 12, 2016
  d8692463
- Merge remote-tracking branch 'aosp/upstream' into master am: 00e2bd79 · d3cf1fd2
  Colin Cross authored Aug 12, 2016
  d3cf1fd2
- Merge remote-tracking branch 'aosp/upstream' into master · b73accc8
  Colin Cross authored Aug 12, 2016
  b73accc8
- Merge remote-tracking branch 'aosp/upstream' into master am: c0bed78a am:... · 9d46bdef
  Colin Cross authored Aug 12, 2016
  9d46bdef
- Merge remote-tracking branch 'aosp/upstream' into master am: c0bed78a am: 7421b972 · b0d5c5ca
  Colin Cross authored Aug 12, 2016
  b0d5c5ca
- Merge remote-tracking branch 'aosp/upstream' into master am: c0bed78a · 2835a885
  Colin Cross authored Aug 12, 2016
  2835a885
- Merge remote-tracking branch 'aosp/upstream' into master · 7421b972
  Colin Cross authored Aug 12, 2016
  7421b972
- Merge remote-tracking branch 'aosp/upstream' into master · 00e2bd79
  Colin Cross authored Aug 11, 2016
  00e2bd79
- Merge pull request #115 from colincross/parallel · 087b721e
  colincross authored Aug 11, 2016
  087b721e
- Merge remote-tracking branch 'aosp/upstream' into master · c0bed78a
  Colin Cross authored Aug 11, 2016
  c0bed78a
- Elide empty variations · badc8817
  Colin Cross authored Aug 11, 2016
  badc8817
Aug 11, 2016
- Merge pull request #116 from colincross/fix · 45f63e41
  colincross authored Aug 11, 2016
  45f63e41
- Fix error reporting in parallel mutators · 0fff7421
  Colin Cross authored Aug 11, 2016
  0fff7421
- Merge remote-tracking branch 'aosp/upstream' into master am: 0d50df6b am:... · fb115a8e
  Colin Cross authored Aug 11, 2016
  fb115a8e
- Merge remote-tracking branch 'aosp/upstream' into master am: 0d50df6b am: b0421060 · 1d8ad93f
  Colin Cross authored Aug 11, 2016
  1d8ad93f