Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / build / f50b9c4c85d2e6481f20c76cd14d8ac9f5f776f1
  1. f50b9c4 resolved conflicts for merge of 24297cab to gingerbread-plus-aosp by Ed Heyl · 14 years ago
  2. 24297ca Merge "version bump for new release (please don't merge)" into gingerbread by Ed Heyl · 14 years ago
  3. 3c83a5a version bump for new release (please don't merge) by Ed Heyl · 14 years ago
  4. b9c627c am 0683a773: Merge "x86: Use GCC 4.4.3" by David Turner · 14 years ago
  5. 5822221 am 9238d44c: Only copy once even if the first matched src:dest pair appears more than once. by Ying Wang · 14 years ago
  6. 0a1f323 am a73b6561: Drop support for target files with no recovery.fstab. by Ying Wang · 14 years ago
  7. 0683a77 Merge "x86: Use GCC 4.4.3" by David Turner · 14 years ago
  8. 9238d44 Only copy once even if the first matched src:dest pair appears more than once. by Ying Wang · 14 years ago
  9. a73b656 Drop support for target files with no recovery.fstab. by Ying Wang · 14 years ago
  10. 51de643 am 9edd4fa0: Merge "x86: sdk_x86 build target" by David Turner · 14 years ago
  11. 9edd4fa Merge "x86: sdk_x86 build target" by David Turner · 14 years ago
  12. dfa82c4 am faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target" by David Turner · 14 years ago
  13. faa6820 Merge "x86: Add in the VirtualBox emulator as a separate build target" by David Turner · 14 years ago
  14. 243d9ae am 4d67e916: am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler" by Wink Saville · 14 years ago
  15. a17b91f x86: Use GCC 4.4.3 by Bruce Beare · 14 years ago
  16. 5636301 x86: sdk_x86 build target by Bruce Beare · 14 years ago
  17. ba366c4 x86: Add in the VirtualBox emulator as a separate build target by Bruce Beare · 14 years ago
  18. 4d67e91 am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler" by Wink Saville · 14 years ago
  19. d09b2e5 Merge "WAPPushManager, WAP Push over SMS message handler" by Wink Saville · 14 years ago
  20. eaa464e am a34fa95c: force inclusion of system log tags in the event-log-tags file by Doug Zongker · 14 years ago
  21. a34fa95 force inclusion of system log tags in the event-log-tags file by Doug Zongker · 14 years ago
  22. 747a978 am 951a3e5f: Merge "Build system tweaks for Valgrind." by Kenny Root · 14 years ago
  23. 951a3e5 Merge "Build system tweaks for Valgrind." by Kenny Root · 14 years ago
  24. bd528a8 Build system tweaks for Valgrind. by Jeff Brown · 14 years ago
  25. b3f59bd am 86a90364: Merge "core/binary.mk: Add missing Objective-C objects to the build." by David 'Digit' Turner · 14 years ago
  26. 86a9036 Merge "core/binary.mk: Add missing Objective-C objects to the build." by David 'Digit' Turner · 14 years ago
  27. 5ca286d core/binary.mk: Add missing Objective-C objects to the build. by David 'Digit' Turner · 14 years ago
  28. c7797bb am 8f9849a0: Merge "no-op" by Jean-Baptiste Queru · 14 years ago
  29. 8f9849a Merge "no-op" by Jean-Baptiste Queru · 14 years ago
  30. c13cf19 no-op by Jean-Baptiste Queru · 14 years ago
  31. 6128163 am 886e5aa7: Merge "fix api level filtering script to compare integers, not strings" into gingerbread by Scott Main · 14 years ago
  32. 886e5aa Merge "fix api level filtering script to compare integers, not strings" into gingerbread by Scott Main · 14 years ago
  33. af2ba51 fix api level filtering script to compare integers, not strings by Scott Main · 14 years ago
  34. 3e01b48 am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge. by Raphael · 14 years ago
  35. 843c6e2 merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge. by Raphael · 14 years ago
  36. ed19189 am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows" by Raphael Moll · 14 years ago
  37. a15717c am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows" by Raphael Moll · 14 years ago
  38. 6b7b53c Merge "SDK: Enable "make sdk/common" under Windows" by Raphael Moll · 14 years ago
  39. 79e1d2c am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK." by Raphael · 14 years ago
  40. 6b6e811 am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK." by Raphael · 14 years ago
  41. 192d1ef SDK: Enable "make sdk/common" under Windows by Raphael Moll · 14 years ago
  42. 678c7ac am d7798a7e: fix TINY ANDROID yet again... by Brian Swetland · 14 years ago
  43. d7798a7 fix TINY ANDROID yet again... by Brian Swetland · 14 years ago
  44. 4167b2b Merge "SDK: Strip llvm-rs-cc in SDK." by Raphael · 14 years ago
  45. 39f4b56 SDK: Strip llvm-rs-cc in SDK. by Raphael · 14 years ago
  46. 463694a am 0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb by Scott Main · 14 years ago
  47. 0fe9974 cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 by Scott Main · 14 years ago
  48. e29ef59 Merge from open-source master by Jean-Baptiste Queru · 14 years ago
  49. 00aef60 am 2d946f7a: Merge "partial build fix" by Jean-Baptiste Queru · 14 years ago
  50. 2a65eda am de50cfb5: Merge "partial build fix" by Jean-Baptiste Queru · 14 years ago
  51. 2d946f7 Merge "partial build fix" by Jean-Baptiste Queru · 14 years ago
  52. 83e2f94 partial build fix by Jean-Baptiste Queru · 14 years ago
  53. de50cfb Merge "partial build fix" by Jean-Baptiste Queru · 14 years ago
  54. bf041eb partial build fix by Jean-Baptiste Queru · 14 years ago
  55. 2039512 am 61356271: am e388ac10: Merge "Extra protobuf-related support" by Jean-Baptiste Queru · 14 years ago
  56. 6135627 am e388ac10: Merge "Extra protobuf-related support" by Jean-Baptiste Queru · 14 years ago
  57. e388ac1 Merge "Extra protobuf-related support" by Jean-Baptiste Queru · 14 years ago
  58. d396641 am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc" by Jean-Baptiste Queru · 14 years ago
  59. ab81ffe am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc" by Jean-Baptiste Queru · 14 years ago
  60. c61d4c9 Extra protobuf-related support by Jean-Baptiste Queru · 14 years ago
  61. 70b8941 Merge "Add dnsproxyd to keep in sync with base init.rc" by Jean-Baptiste Queru · 14 years ago
  62. d59072d Add dnsproxyd to keep in sync with base init.rc by Bruce Beare · 14 years ago
  63. 53cebd7 am ad3e0072: am 39f358b7: Merge "Protobuf compiler support in the build system" by Jean-Baptiste Queru · 14 years ago
  64. ad3e007 am 39f358b7: Merge "Protobuf compiler support in the build system" by Jean-Baptiste Queru · 14 years ago
  65. 5a50ece am f273723f: am 1e0055fb: Merge "A few more grandfathered user tags" by Jean-Baptiste Queru · 14 years ago
  66. f273723 am 1e0055fb: Merge "A few more grandfathered user tags" by Jean-Baptiste Queru · 14 years ago
  67. 39f358b Merge "Protobuf compiler support in the build system" by Jean-Baptiste Queru · 14 years ago
  68. 79ee7bf Protobuf compiler support in the build system by Jean-Baptiste Queru · 14 years ago
  69. 1e0055f Merge "A few more grandfathered user tags" by Jean-Baptiste Queru · 14 years ago
  70. 2497b61 A few more grandfathered user tags by Jean-Baptiste Queru · 14 years ago
  71. 020e2fc am 928a0304: re-merge from readonly-korg-master - do not merge by Jean-Baptiste Queru · 14 years ago
  72. 928a030 re-merge from readonly-korg-master - do not merge by Jean-Baptiste Queru · 14 years ago
  73. 46b944d am 1fe74722: am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge" by Jean-Baptiste Queru · 14 years ago
  74. 1fe7472 am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge" by Jean-Baptiste Queru · 14 years ago
  75. 4a91aa9 Merge "Add a few more legacy modules that can have user tags - do not merge" by Jean-Baptiste Queru · 14 years ago
  76. 4fd2ef0 Add a few more legacy modules that can have user tags - do not merge by Jean-Baptiste Queru · 14 years ago
  77. bbe78df am 05d14cb9: Merge "don\'t use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread by Scott Main · 14 years ago
  78. 05d14cb Merge "don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread by Scott Main · 14 years ago
  79. 42d1d32 don't use the sdkdoc template if the index file is a preview by Scott Main · 14 years ago
  80. fce8892 Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge by Jean-Baptiste Queru · 14 years ago
  81. 7e1ce27 Merge commit '50738779' into gingerbread-plus-aosp by Ed Heyl · 14 years ago
  82. 5073877 DO NOT MERGE Fix issue #3373438: Update GBMR versions by Dianne Hackborn · 14 years ago
  83. 7dfc127 am 54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread by Eric Fischer · 14 years ago
  84. 54a6b73 Merge "Flesh out the languages_full list with recently added locales." into gingerbread by Eric Fischer · 14 years ago
  85. 6efeec6 am 755bed4c: Merge "Add support for custom Linux host toolchains when building the SDK." by David 'Digit' Turner · 14 years ago
  86. 755bed4 Merge "Add support for custom Linux host toolchains when building the SDK." by David 'Digit' Turner · 14 years ago
  87. 60a1e88 Add support for custom Linux host toolchains when building the SDK. by David 'Digit' Turner · 14 years ago
  88. 8e9d20b am 27016763: merge from gingerbread by Jean-Baptiste Queru · 14 years ago
  89. 2701676 merge from gingerbread by Jean-Baptiste Queru · 14 years ago
  90. 1c81f3b Flesh out the languages_full list with recently added locales. by Eric Fischer · 14 years ago
  91. 4125d8e am a4781e86: Merge from open-source gingerbread by Jean-Baptiste Queru · 14 years ago
  92. a4781e8 Merge from open-source gingerbread by Jean-Baptiste Queru · 14 years ago
  93. 9ac1e65 Merge "CTS: pass vogar expectation location to CollectAllTests." into gingerbread by Jean-Baptiste Queru · 14 years ago
  94. 08b9642 am 66888a7c: docs: update the sdk doc template to remove a bunch of obsolete things and clean up the logic statements for clarity by Scott Main · 14 years ago
  95. 66888a7 docs: update the sdk doc template to remove a bunch of obsolete by Scott Main · 14 years ago
  96. fdb400c CTS: pass vogar expectation location to CollectAllTests. by Brett Chabot · 14 years ago
  97. 79609e3 am a712543e: Don\'t prepend ./ before the dirs to be removed by Ying Wang · 14 years ago
  98. ee8fe64 WAPPushManager, WAP Push over SMS message handler by noda · 14 years ago
  99. e503fcd am 7e27c8e1: Merge "Pass OUT_DIR variable to atree." by Raphael Moll · 14 years ago
  100. 7e27c8e Merge "Pass OUT_DIR variable to atree." by Raphael Moll · 14 years ago