Advertisement
bigrushdog

eos_443_merge_notes

Jun 5th, 2014
234
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Java 8.25 KB | None | 0 0
  1. repo init -u https://android.googlesource.com/platform/manifest -b android-4.4.3_r1.1
  2. repo init -u git://github.com/teameos/manifest.git -b kk4.4 -g all,kernel,device,vendor
  3. repo forall -c 'git checkout teameos/kk4.4; git branch -D kk4.4; git checkout -b kk4.4'
  4. git merge android-4.4.3_r1.1
  5.  
  6. *************************************************************
  7.  
  8. ** SUCCESSFULLY MERGED *****
  9.  
  10. art
  11. bionic
  12. build
  13. dalvik
  14. libcore
  15. external/chromium_org
  16. external/chromium_org/third_party/openssl
  17. external/icu4c
  18. external/libselinux
  19. external/sepolicy
  20. external/sqlite
  21. frameworks/av
  22. frameworks/native
  23.  
  24. packages/apps/Browser/
  25. packages/apps/CellBroadcastReceiver
  26. packages/apps/Gallery2
  27. packages/apps/Mms
  28. packages/apps/Settings
  29.  
  30. packages/providers/ContactsProvider
  31. packages/providers/DownloadProvider
  32.  
  33. system/vold
  34. system/core
  35. system/media
  36. system/netd
  37.  
  38. ***********************************
  39.  
  40. ** ALL THESE WE GOTTA WAIT FOR CAF OR CM **
  41.  
  42. packages/apps/Camera2
  43. packages/apps/Bluetooth
  44. packages/apps/Dialer
  45. packages/apps/InCallUI
  46. external/bluetooth/bluedroid
  47. frameworks/base ** NOTE: See 2 reverted commits, one tele new api, other BT GATT api**
  48. frameworks/opt/tele
  49. packages/apps/Contacts
  50. packages/apps/ContactsCommon
  51. packages/services/Telephony
  52. packages/apps/Launcher3 ** UGLY, pushed stock 4.4.3, lots of new stuff, i have pre-merge-branch locally **
  53.  
  54. ****************************************
  55.  
  56.  
  57. NEW PROJECTS
  58.  
  59. Deleting obsolete path /home/bigrushdog/eos/device/asus/flo-kernel
  60. Deleting obsolete path /home/bigrushdog/eos/device/common
  61. Deleting obsolete path /home/bigrushdog/eos/device/google/accessory/arduino
  62. Deleting obsolete path /home/bigrushdog/eos/device/google/accessory/demokit
  63. Deleting obsolete path /home/bigrushdog/eos/device/lge/hammerhead-kernel
  64. Deleting obsolete path /home/bigrushdog/eos/device/lge/mako-kernel
  65. Deleting obsolete path /home/bigrushdog/eos/external/chromium_org/third_party/angle
  66. Deleting obsolete path /home/bigrushdog/eos/external/chromium_org/third_party/sfntly/cpp/src
  67. Deleting obsolete path /home/bigrushdog/eos/external/libexif
  68. Deleting obsolete path /home/bigrushdog/eos/external/libssh2
  69. Deleting obsolete path /home/bigrushdog/eos/frameworks/opt/widget
  70. Deleting obsolete path /home/bigrushdog/eos/packages/inputmethods/OpenWnn
  71. Deleting obsolete path /home/bigrushdog/eos/packages/inputmethods/PinyinIME
  72. Deleting obsolete path /home/bigrushdog/eos/prebuilts/gradle-plugin
  73. Deleting obsolete path /home/bigrushdog/eos/prebuilts/maven_repo/android
  74.  
  75.  
  76. TOUCHED PROJECTS
  77.  
  78. art/: discarding 9 commits
  79. bionic/: discarding 5 commits
  80. bootable/recovery/: discarding 4 commits
  81. build/: discarding 58 commits
  82. cts/: discarding 459 commits
  83. dalvik/: discarding 6 commits
  84. developers/build/: discarding 14 commits
  85. developers/samples/android/: discarding 29 commits
  86. development/: discarding 18 commits
  87. device/asus/deb/: discarding 1 commits
  88. device/asus/flo/: discarding 4 commits
  89. device/asus/grouper/: discarding 1 commits
  90. device/asus/tilapia/: discarding 1 commits
  91. device/lge/hammerhead/: discarding 11 commits
  92. device/lge/mako/: discarding 7 commits
  93. device/samsung/manta/: discarding 6 commits
  94. external/android-clat/: discarding 32 commits
  95. external/bluetooth/bluedroid/: discarding 27 commits
  96. external/bouncycastle/: discarding 1 commits
  97. external/chromium_org/: discarding 843 commits
  98. external/chromium_org/testing/gtest/: discarding 15 commits
  99. external/chromium_org/third_party/WebKit/: discarding 196 commits
  100. external/chromium_org/third_party/freetype/: discarding 44 commits
  101. external/chromium_org/third_party/icu/: discarding 53 commits
  102. external/chromium_org/third_party/leveldatabase/src/: discarding 12 commits
  103. external/chromium_org/third_party/libjingle/source/talk/: discarding 87 commits
  104. external/chromium_org/third_party/libphonenumber/src/phonenumbers/: discarding 16 commits
  105. external/chromium_org/third_party/libphonenumber/src/resources/: discarding 21 commits
  106. external/chromium_org/third_party/mesa/src/: discarding 7 commits
  107. external/chromium_org/third_party/openssl/: discarding 71 commits
  108. external/chromium_org/third_party/opus/src/: discarding 7 commits
  109. external/chromium_org/third_party/ots/: discarding 46 commits
  110. external/chromium_org/third_party/skia/gyp/: discarding 337 commits
  111. external/chromium_org/third_party/skia/include/: discarding 460 commits
  112. external/chromium_org/third_party/skia/src/: discarding 899 commits
  113. external/chromium_org/tools/grit/: discarding 20 commits
  114. external/chromium_org/tools/gyp/: discarding 164 commits
  115. external/chromium_org/v8/: discarding 297 commits
  116. external/flac/: discarding 1 commits
  117. external/icu4c/: discarding 1 commits
  118. external/jhead/: discarding 1 commits
  119. external/libnl-headers/: discarding 1 commits
  120. external/libselinux/: discarding 2 commits
  121. external/ppp/: discarding 1 commits
  122. external/qemu/: discarding 1 commits
  123. external/sepolicy/: discarding 2 commits
  124. external/skia/: discarding 13 commits
  125. external/sqlite/: discarding 7 commits
  126. external/tinycompress/: discarding 1 commits
  127. external/tremolo/: discarding 1 commits
  128.  
  129.  
  130. frameworks/av/: discarding 94 commits
  131. frameworks/base/: discarding 388 commits
  132. frameworks/compile/libbcc/: discarding 2 commits
  133. frameworks/compile/slang/: discarding 1 commits
  134. frameworks/ex/: discarding 3 commits
  135. frameworks/native/: discarding 17 commits
  136. frameworks/opt/colorpicker/: discarding 1 commits
  137. frameworks/opt/datetimepicker/: discarding 1 commits
  138. frameworks/opt/telephony/: discarding 6 commits
  139. frameworks/opt/timezonepicker/: discarding 2 commits
  140. frameworks/rs/: discarding 4 commits
  141. frameworks/support/: discarding 6 commits
  142. frameworks/testing/: discarding 1 commits
  143. frameworks/webview/: discarding 426 commits
  144.  
  145.  
  146. hardware/broadcom/libbt/: discarding 2 commits
  147. hardware/broadcom/wlan/: discarding 1 commits
  148. hardware/libhardware/: discarding 3 commits
  149. hardware/qcom/audio/: discarding 1 commits
  150. hardware/qcom/camera/: discarding 3 commits
  151. hardware/qcom/media/: discarding 4 commits
  152. hardware/samsung_slsi/exynos5/: discarding 7 commits
  153. hardware/ti/omap4xxx/: discarding 1 commits
  154.  
  155. libcore/: discarding 16 commits
  156.  
  157. packages/apps/BasicSmsReceiver/: discarding 1 commits
  158. packages/apps/Bluetooth/: discarding 31 commits
  159. packages/apps/Browser/: discarding 63 commits
  160. packages/apps/Calculator/: discarding 1 commits
  161. packages/apps/Calendar/: discarding 25 commits
  162. packages/apps/Camera/: discarding 3 commits
  163. packages/apps/Camera2/: discarding 29 commits
  164. packages/apps/CellBroadcastReceiver/: discarding 3 commits
  165. packages/apps/Contacts/: discarding 40 commits
  166. packages/apps/ContactsCommon/: discarding 21 commits
  167. packages/apps/DeskClock/: discarding 3 commits
  168. packages/apps/Dialer/: discarding 80 commits
  169. packages/apps/Email/: discarding 859 commits
  170. packages/apps/Exchange/: discarding 305 commits
  171. packages/apps/Gallery/: discarding 1 commits
  172. packages/apps/Gallery2/: discarding 17 commits
  173. packages/apps/HTMLViewer/: discarding 1 commits
  174. packages/apps/InCallUI/: discarding 22 commits
  175. packages/apps/Launcher2/: discarding 6 commits
  176. packages/apps/Launcher3/: discarding 901 commits
  177. packages/apps/Mms/: discarding 5 commits
  178. packages/apps/Music/: discarding 4 commits
  179. packages/apps/Nfc/: discarding 4 commits
  180. packages/apps/PackageInstaller/: discarding 2 commits
  181. packages/apps/Phone/: discarding 24 commits
  182. packages/apps/Settings/: discarding 47 commits
  183. packages/apps/SoundRecorder/: discarding 2 commits
  184. packages/apps/Stk/: discarding 1 commits
  185. packages/apps/Tag/: discarding 2 commits
  186. packages/apps/UnifiedEmail/: discarding 1620 commits
  187. packages/apps/VideoEditor/: discarding 3 commits
  188. packages/inputmethods/LatinIME/: discarding 5 commits
  189. packages/providers/CalendarProvider/: discarding 2 commits
  190. packages/providers/ContactsProvider/: discarding 3 commits
  191. packages/providers/DownloadProvider/: discarding 3 commits
  192. packages/providers/MediaProvider/: discarding 1 commits
  193. packages/screensavers/PhotoTable/: discarding 3 commits
  194. packages/services/Telephony/: discarding 22 commits
  195. packages/wallpapers/Basic/: discarding 1 commits
  196. packages/wallpapers/LivePicker/: discarding 1 commits
  197. pdk/: discarding 8 commits
  198. prebuilts/devtools/: discarding 1 commits
  199. prebuilts/misc/: discarding 3 commits
  200. system/core/: discarding 14 commits
  201. system/extras/: discarding 3 commits
  202. system/media/: discarding 1 commits
  203. system/netd/: discarding 8 commits
  204. system/vold/: discarding 9 commits
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement