Commits · 27026dad96ba0f97be9dfdc52b48daf26774f8e2 · cheri / android_build_blueprint · GitLab

Oct 11, 2016
- Merge remote-tracking branch 'aosp/upstream' into master am: 1bf2276b am:... · 27026dad
  Colin Cross authored Oct 11, 2016
  27026dad
- Merge remote-tracking branch 'aosp/upstream' into master am: 1bf2276b am: 1f607fc0 · 100e2c4d
  Colin Cross authored Oct 11, 2016
  100e2c4d
- Merge remote-tracking branch 'aosp/upstream' into master am: 1bf2276b · 4795c181
  Colin Cross authored Oct 11, 2016
  4795c181
- Merge remote-tracking branch 'aosp/upstream' into master · 1f607fc0
  Colin Cross authored Oct 11, 2016
  1f607fc0
- Merge remote-tracking branch 'aosp/upstream' into master · 1bf2276b
  Colin Cross authored Oct 11, 2016
  1bf2276b
- Merge pull request #125 from colincross/build_deps · ad914cea
  colincross authored Oct 11, 2016
  ad914cea
- Add dependency on build= blueprint files · 2458712c
  Colin Cross authored Oct 11, 2016
  2458712c
Sep 30, 2016
- Merge remote-tracking branch 'aosp/upstream' into master am: ea589823 am:... · 3f529789
  Colin Cross authored Sep 30, 2016
  3f529789
- Merge remote-tracking branch 'aosp/upstream' into master am: ea589823 am: fbb627b2 · f268c7b6
  Colin Cross authored Sep 30, 2016
  f268c7b6
- Merge remote-tracking branch 'aosp/upstream' into master am: ea589823 · c68d8f0a
  Colin Cross authored Sep 30, 2016
  c68d8f0a
- Merge remote-tracking branch 'aosp/upstream' into master · fbb627b2
  Colin Cross authored Sep 30, 2016
  fbb627b2
Sep 29, 2016
- Merge remote-tracking branch 'aosp/upstream' into master · ea589823
  Colin Cross authored Sep 29, 2016
  ea589823
- Merge pull request #124 from colincross/escape · 888b21f8
  colincross authored Sep 29, 2016
  888b21f8
- Add proptools functions to escape strings · 41ca49ff
  Colin Cross authored Sep 29, 2016
  41ca49ff
Sep 09, 2016
- Merge branch 'aosp/upstream' into master am: 6bbcbc94 am: 61f299c6 am: ae4acc93 · da4854c9
  Dan Willemsen authored Sep 09, 2016
  da4854c9
- Merge branch 'aosp/upstream' into master am: 6bbcbc94 am: 61f299c6 · 193d0ab1
  Dan Willemsen authored Sep 09, 2016
  193d0ab1
- Merge branch 'aosp/upstream' into master am: 6bbcbc94 · ae4acc93
  Dan Willemsen authored Sep 09, 2016
  ae4acc93
- Merge branch 'aosp/upstream' into master · 61f299c6
  Dan Willemsen authored Sep 09, 2016
  61f299c6
- Merge branch 'aosp/upstream' into master · 6bbcbc94
  Dan Willemsen authored Sep 09, 2016
  6bbcbc94
- Merge pull request #122 from danw/structof · f5909d9c
  Dan Willemsen authored Sep 09, 2016
  f5909d9c
- Support structures built with StructOf · ec5ba986
  Dan Willemsen authored Sep 06, 2016
  ec5ba986
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