Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_build / 732936d99a411e99c9a318506c778f8e8b23a17a
  1. 732936d resolved conflicts for merge of 8508a073 to honeycomb-plus-aosp by Raphael · 14 years ago
  2. de50d0a am d6605405: am 7f5a314a: am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'." by Raphael Moll · 14 years ago
  3. 8508a07 am 6e65ddb2: am cb84196f: Merge "Lunch: don\'t use a toolchain that doesn\'t exist." by Raphael Moll · 14 years ago
  4. d660540 am 7f5a314a: am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'." by Raphael Moll · 14 years ago
  5. 6e65ddb am cb84196f: Merge "Lunch: don\'t use a toolchain that doesn\'t exist." by Raphael Moll · 14 years ago
  6. 7f5a314 am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'." by Raphael Moll · 14 years ago
  7. cb84196 Merge "Lunch: don't use a toolchain that doesn't exist." by Raphael Moll · 14 years ago
  8. 169c19c Merge "Envsetup: Cygwin doesn't have 'ps -o command'." by Raphael Moll · 14 years ago
  9. c639c78 Lunch: don't use a toolchain that doesn't exist. by Raphael Moll · 14 years ago
  10. 70a86b0 Envsetup: Cygwin doesn't have 'ps -o command'. by Raphael Moll · 14 years ago
  11. 1c5df43 am 4f9479bf: am 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A" by David 'Digit' Turner · 14 years ago
  12. 4f9479b am 683e8e17: am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A" by David 'Digit' Turner · 14 years ago
  13. 683e8e1 am 04b963a1: Merge "emulator: Build emulator platform images as ARMv7-A" by David 'Digit' Turner · 14 years ago
  14. 04b963a Merge "emulator: Build emulator platform images as ARMv7-A" by David 'Digit' Turner · 14 years ago
  15. 2feecf6 am cc7dccc8: (-s ours) am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more" by Jean-Baptiste Queru · 14 years ago
  16. cc7dccc am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more" by Jean-Baptiste Queru · 14 years ago
  17. 91ba5de am 1894085d: Merge "Tweak prelink map even more" by Jean-Baptiste Queru · 14 years ago
  18. 1894085 Merge "Tweak prelink map even more" by Jean-Baptiste Queru · 14 years ago
  19. 7751f42 Tweak prelink map even more by Jean-Baptiste Queru · 14 years ago
  20. 2a85de6 am ea54b50e: am f3659c8b: am 36c1f10d: Merge "Relax the constraint of 64bit build environment." by Jean-Baptiste Queru · 14 years ago
  21. 4a9dd2d am af1b618c: (-s ours) am c5e5d989: am 9d7590b9: Merge "Tweak prelink map" by Jean-Baptiste Queru · 14 years ago
  22. ea54b50 am f3659c8b: am 36c1f10d: Merge "Relax the constraint of 64bit build environment." by Jean-Baptiste Queru · 14 years ago
  23. af1b618 am c5e5d989: am 9d7590b9: Merge "Tweak prelink map" by Jean-Baptiste Queru · 14 years ago
  24. f3659c8 am 36c1f10d: Merge "Relax the constraint of 64bit build environment." by Jean-Baptiste Queru · 14 years ago
  25. c5e5d98 am 9d7590b9: Merge "Tweak prelink map" by Jean-Baptiste Queru · 14 years ago
  26. 36c1f10 Merge "Relax the constraint of 64bit build environment." by Jean-Baptiste Queru · 14 years ago
  27. 2914f7f Relax the constraint of 64bit build environment. by Ying Wang · 14 years ago
  28. 9d7590b Merge "Tweak prelink map" by Jean-Baptiste Queru · 14 years ago
  29. 82b96df Tweak prelink map by Jean-Baptiste Queru · 14 years ago
  30. ff67ed6 am 5e2e09c5: (-s ours) am ee803184: am f771489d: Merge "Tweak prelink map, more" by Jean-Baptiste Queru · 14 years ago
  31. 5e2e09c am ee803184: am f771489d: Merge "Tweak prelink map, more" by Jean-Baptiste Queru · 14 years ago
  32. ee80318 am f771489d: Merge "Tweak prelink map, more" by Jean-Baptiste Queru · 14 years ago
  33. f771489 Merge "Tweak prelink map, more" by Jean-Baptiste Queru · 14 years ago
  34. 398aaee Tweak prelink map, more by Jean-Baptiste Queru · 14 years ago
  35. 3305a5a am 84891367: am 9bd85361: am 15ced7e1: Merge prelink map tweaks by Jean-Baptiste Queru · 14 years ago
  36. 8489136 am 9bd85361: am 15ced7e1: Merge prelink map tweaks by Jean-Baptiste Queru · 14 years ago
  37. 9bd8536 am 15ced7e1: Merge prelink map tweaks by Jean-Baptiste Queru · 14 years ago
  38. 15ced7e Merge prelink map tweaks by Jean-Baptiste Queru · 14 years ago
  39. d5f8455 Tweak prelink map by Jean-Baptiste Queru · 14 years ago
  40. 27c9c6f am 9f2e07d2: am 69ae44e2: am fd64de9a: Merge prelink map tweaks by Jean-Baptiste Queru · 14 years ago
  41. 9f2e07d am 69ae44e2: am fd64de9a: Merge prelink map tweaks by Jean-Baptiste Queru · 14 years ago
  42. 69ae44e am fd64de9a: Merge prelink map tweaks by Jean-Baptiste Queru · 14 years ago
  43. fd64de9 Merge prelink map tweaks by Jean-Baptiste Queru · 14 years ago
  44. 91e2927 Tweak prelink map by Jean-Baptiste Queru · 14 years ago
  45. 9a708f4 am 2ba042f9: (-s ours) am 40dc95be: am 14273125: Merge "Tweak prelink map" by Jean-Baptiste Queru · 14 years ago
  46. 2ba042f am 40dc95be: am 14273125: Merge "Tweak prelink map" by Jean-Baptiste Queru · 14 years ago
  47. 40dc95b am 14273125: Merge "Tweak prelink map" by Jean-Baptiste Queru · 14 years ago
  48. 1427312 Merge "Tweak prelink map" by Jean-Baptiste Queru · 14 years ago
  49. 1c594ea Tweak prelink map by Jean-Baptiste Queru · 14 years ago
  50. 4c60b30 am 70a89584: Merge 742968bd by Jean-Baptiste Queru · 14 years ago
  51. 70a8958 Merge 742968bd by Jean-Baptiste Queru · 14 years ago
  52. 742968b Adding a cleanspec to pick up version change. Do not merge. by Dan Morrill · 14 years ago
  53. 44fc3c6 am cedbd2f5: (-s ours) am eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread by Ed Heyl · 14 years ago
  54. cedbd2f am eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread by Ed Heyl · 14 years ago
  55. 13c7c02 am eb9fc27d: am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default" by Jean-Baptiste Queru · 14 years ago
  56. eb27aa0 Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread by Ed Heyl · 14 years ago
  57. eb9fc27 am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default" by Jean-Baptiste Queru · 14 years ago
  58. 4c90a64 am 14bf45f3: Merge "Switch back to mksh as the default" by Jean-Baptiste Queru · 14 years ago
  59. 14bf45f Merge "Switch back to mksh as the default" by Jean-Baptiste Queru · 14 years ago
  60. 256b14b Switch back to mksh as the default by Jean-Baptiste Queru · 14 years ago
  61. ee69da5 am 5aa44e2d: Merge bb41d06d by Jean-Baptiste Queru · 14 years ago
  62. 5aa44e2 Merge bb41d06d by Jean-Baptiste Queru · 14 years ago
  63. 5f5056f emulator: Build emulator platform images as ARMv7-A by David 'Digit' Turner · 14 years ago
  64. 3f72af1 Merge cb5b6d16 by Dianne Hackborn · 14 years ago
  65. cb5b6d1 am 0b22d93b: Welcome, Android 3.2. by Dianne Hackborn · 14 years ago
  66. 0b22d93 Welcome, Android 3.2. by Dianne Hackborn · 14 years ago
  67. bb41d06 Update version to 2.3.5. by Dan Morrill · 14 years ago
  68. d23d0f0 am ec664803: am c811f291: add ANDROID_HOST_OUT to env (please do not merge) by Ed Heyl · 14 years ago
  69. f0d2a54 Merge 78e7f1f0 by Jean-Baptiste Queru · 14 years ago
  70. 0a6c12b Merge 5adc2d05 by Jean-Baptiste Queru · 14 years ago
  71. 45a3ad7 Merge c1efb060 by Jean-Baptiste Queru · 14 years ago
  72. ec66480 am c811f291: add ANDROID_HOST_OUT to env (please do not merge) by Ed Heyl · 14 years ago
  73. 4f2297d add ANDROID_HOST_OUT to env (please do not merge) by Ed Heyl · 14 years ago
  74. c811f29 add ANDROID_HOST_OUT to env (please do not merge) by Ed Heyl · 14 years ago
  75. 60d6ef9 am 1482d2db: am e2419c89: Support to run dex-preopt on prebuilt apks. by Ying Wang · 14 years ago
  76. 0a2d335 am c1705c9a: Merge "x86: Enable -fstack-protector" by David Turner · 14 years ago
  77. e4778e6 am 4272b32a: Merge "Clean up of X86 build flags" by David Turner · 14 years ago
  78. 78e7f1f am 536938e0: am 978f86ea: Merge "Increase the Java heap size for droiddoc" by Jean-Baptiste Queru · 14 years ago
  79. 536938e am 978f86ea: Merge "Increase the Java heap size for droiddoc" by Jean-Baptiste Queru · 14 years ago
  80. 978f86e Merge "Increase the Java heap size for droiddoc" by Jean-Baptiste Queru · 14 years ago
  81. 5adc2d0 am c33e0739: Merge from gingerbread by Jean-Baptiste Queru · 14 years ago
  82. c33e073 Merge from gingerbread by Jean-Baptiste Queru · 14 years ago
  83. c1efb06 am 3c60c67a: Merge from open-source gingerbread by Jean-Baptiste Queru · 14 years ago
  84. 3c60c67 Merge from open-source gingerbread by Jean-Baptiste Queru · 14 years ago
  85. 8cbdef7 Merge "Relax the constraint of 64bit build environment." into gingerbread by Jean-Baptiste Queru · 14 years ago
  86. 823f638 am 3487736b: am 7d83ef8f: Support custom RenderScript compiler by Ying Wang · 14 years ago
  87. 3487736 am 7d83ef8f: Support custom RenderScript compiler by Ying Wang · 14 years ago
  88. 7d83ef8 Support custom RenderScript compiler by Ying Wang · 14 years ago
  89. 9b6614d am e02449dc: am 44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2 by Scott Main · 14 years ago
  90. e02449d am 44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2 by Scott Main · 14 years ago
  91. 44c32b9 Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2 by Scott Main · 14 years ago
  92. 17e47ad docs: adjust sdk page to show/hide messages based on whether online or offline docs by Scott Main · 14 years ago
  93. 1482d2d am e2419c89: Support to run dex-preopt on prebuilt apks. by Ying Wang · 14 years ago
  94. bb567df am 4cd9e2d9: am 06e2f72b: Support to run dex-preopt on prebuilt apks. by Ying Wang · 14 years ago
  95. 4cd9e2d am 06e2f72b: Support to run dex-preopt on prebuilt apks. by Ying Wang · 14 years ago
  96. 06e2f72 Support to run dex-preopt on prebuilt apks. by Ying Wang · 14 years ago
  97. e2419c8 Support to run dex-preopt on prebuilt apks. by Ying Wang · 14 years ago
  98. c1705c9 Merge "x86: Enable -fstack-protector" by David Turner · 14 years ago
  99. e397dcc x86: Enable -fstack-protector by Bruce Beare · 14 years ago
  100. 4272b32 Merge "Clean up of X86 build flags" by David Turner · 14 years ago