Commit Graph

3271 Commits

Author SHA1 Message Date
Jean-Baptiste Queru f289e82217 am 8abb5cc1: am a160e316: Merge "Fixed problem with keymap files copied to target"
Merge commit '8abb5cc10f295940e6706c72e2e0c93bf0de01e8'

* commit '8abb5cc10f295940e6706c72e2e0c93bf0de01e8':
  Fixed problem with keymap files copied to target
2010-08-31 15:10:43 -07:00
Jean-Baptiste Queru 8abb5cc10f am a160e316: Merge "Fixed problem with keymap files copied to target"
Merge commit 'a160e3169e6624610fd05b2edd14b674ffb54e44' into gingerbread-plus-aosp

* commit 'a160e3169e6624610fd05b2edd14b674ffb54e44':
  Fixed problem with keymap files copied to target
2010-08-31 15:04:01 -07:00
Jean-Baptiste Queru a160e3169e Merge "Fixed problem with keymap files copied to target" 2010-08-31 14:52:54 -07:00
Joe Onorato 5645dc379a am 42ee0a2a: (-s ours) am cd7c775e: fix the build still
Merge commit '42ee0a2a48f87922dc98f93abbe3394750b9c3f7'

* commit '42ee0a2a48f87922dc98f93abbe3394750b9c3f7':
  fix the build still
2010-08-31 13:12:56 -07:00
Joe Onorato 42ee0a2a48 am cd7c775e: fix the build still
Merge commit 'cd7c775ece6854765ae3208818e76d9d11724713' into gingerbread-plus-aosp

* commit 'cd7c775ece6854765ae3208818e76d9d11724713':
  fix the build still
2010-08-31 13:00:56 -07:00
Joe Onorato cd7c775ece fix the build still
Change-Id: I2bfbcdd4b463549f3f331ac7a1c7fa89aadef1a8
2010-08-31 12:56:49 -07:00
Joe Onorato f161663814 am 0f9a91c9: (-s ours) am 0ee89a72: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '0f9a91c94fa9f3b0082744efe2457528ef19fa62'

* commit '0f9a91c94fa9f3b0082744efe2457528ef19fa62':
  DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
2010-08-31 12:16:51 -07:00
Joe Onorato 0f9a91c94f am 0ee89a72: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb' into gingerbread-plus-aosp

* commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb':
  DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
2010-08-31 12:12:17 -07:00
Joe Onorato 0ee89a72d5 DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Change-Id: I886448a3126b81c19342d920669e050eb5ef20eb
2010-08-31 12:00:44 -07:00
Dirk Dougherty d77248ac7e Remove droiddoc/templates dir in favor of templates-sdk, move Android-specific assets to templates-sdk, add copies to templates-pdk as workaround.
Change-Id: Iad7d0f1955e5731ee9cebb8828a45bf3c297417b
2010-08-31 10:13:25 -07:00
Andreas Huber 36aa8c3798 resolved conflicts for merge of f739e312 to master
Change-Id: I3be6dbc299d2d761c96a6f00958d9a4c018ec290
2010-08-30 15:36:58 -07:00
Andreas Huber f739e3125e am a3989611: Cleanspec to make sure everything works consistently after turning off OpenCore.
Merge commit 'a39896119566a952647c392872c0ab99e9de7371' into gingerbread-plus-aosp

* commit 'a39896119566a952647c392872c0ab99e9de7371':
  Cleanspec to make sure everything works consistently after turning off OpenCore.
2010-08-30 15:23:51 -07:00
Andreas Huber a398961195 Cleanspec to make sure everything works consistently after turning off OpenCore.
Change-Id: Icf3ba66b8183e36247b4cfc623643e37f78d7144
related-to-bug: 2941153
2010-08-30 14:17:14 -07:00
Ying Wang ec9553f273 am a681bae5: am 9a8732fb: Link against Mac OSX 10.5 SDK if building on 10.6.
Merge commit 'a681bae5f6d2cc84d0ff54bb117ecd025062bbce'

* commit 'a681bae5f6d2cc84d0ff54bb117ecd025062bbce':
  Link against Mac OSX 10.5 SDK if building on 10.6.
2010-08-30 13:30:49 -07:00
Andreas Huber 3e8f987889 am aeb2bbc1: am 200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.
Merge commit 'aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486'

* commit 'aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486':
  Build without OpenCore by default, remove obsolete opt-in to stagefright.
2010-08-30 13:30:29 -07:00
Ying Wang a681bae5f6 am 9a8732fb: Link against Mac OSX 10.5 SDK if building on 10.6.
Merge commit '9a8732fb6c6a569495e3695fc1e2b638de209beb' into gingerbread-plus-aosp

* commit '9a8732fb6c6a569495e3695fc1e2b638de209beb':
  Link against Mac OSX 10.5 SDK if building on 10.6.
2010-08-30 13:20:50 -07:00
Andreas Huber aeb2bbc140 am 200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.
Merge commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410' into gingerbread-plus-aosp

* commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410':
  Build without OpenCore by default, remove obsolete opt-in to stagefright.
2010-08-30 13:06:50 -07:00
Andreas Huber 200f25984c Build without OpenCore by default, remove obsolete opt-in to stagefright.
Change-Id: I6e08d2136147f4e279f8a5b2b3837e4317faf27c
related-to-bug: 2941153
2010-08-30 12:48:03 -07:00
Ying Wang 9a8732fb6c Link against Mac OSX 10.5 SDK if building on 10.6.
So that tools built on Snow Leopard (10.6) can be used on Leopard (10.5).

Change-Id: I99745ecbe2ad11feaae31d5be31c34c2e0ad7cc5
2010-08-30 11:52:50 -07:00
Magnus Karlsson c90449f2a8 Fixed problem with keymap files copied to target
Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps
to build/target/board/generic. This causes the keymap files to copied into
the system image of generic and sdk products, but not into the system image
of HW products. Originally the qwerty.kl was copied to target no matter
if the target had a qwerty keyboard or not, which is the case for e.g.
the Nexus One.

Change-Id: I7cd80497632fb3b9e7ce2f3a7888d4924a355f52
2010-08-30 16:51:28 +02:00
Raphael Moll f3e7e04f70 am 2a1873b0: am 6ba4b59c: SDK: add hierarchyviewer2 to windows target list.
Merge commit '2a1873b09c73700d4339f379f4389b26beb81173'

* commit '2a1873b09c73700d4339f379f4389b26beb81173':
  SDK: add hierarchyviewer2 to windows target list.
2010-08-28 17:39:23 -07:00
Raphael Moll 2a1873b09c am 6ba4b59c: SDK: add hierarchyviewer2 to windows target list.
Merge commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3' into gingerbread-plus-aosp

* commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3':
  SDK: add hierarchyviewer2 to windows target list.
2010-08-28 17:31:31 -07:00
Raphael Moll 6ba4b59c90 SDK: add hierarchyviewer2 to windows target list.
Change-Id: I282173ab10930a716861f3774804d3d8484a71f3
2010-08-28 15:03:40 -07:00
Ying Wang d194a4ad3d Merge "Fix bug." 2010-08-27 16:24:23 -07:00
Ying Wang c2d64c8948 Fix bug.
Change-Id: I8bee35b7bb3fa0926f768d44a91cb45f76f224f9
Bug: 2957295
2010-08-27 16:19:07 -07:00
Ying Wang e238e5af4c am a9703989: am ae553143: Refactor a bit.
Merge commit 'a97039890e6a1999327cb3e9f2a28bf077a96e07'

* commit 'a97039890e6a1999327cb3e9f2a28bf077a96e07':
  Refactor a bit.
2010-08-27 15:52:03 -07:00
Iliyan Malchev ddaae7326e Merge "Turn on ASLR by default. The "-a" option now takes an argument (on/off)." 2010-08-27 15:04:39 -07:00
Ying Wang a4b6db9bf0 am cef82129: am aa6dbe21: Try to fix system.img in update zip file.
Merge commit 'cef82129e1b2a26f883c20521d79175747eac434'

* commit 'cef82129e1b2a26f883c20521d79175747eac434':
  Try to fix system.img in update zip file.
2010-08-27 12:14:58 -07:00
Bill Napier a6e0841bea Merge "Revert "Fix MonkeyRunner SDK documentation generation."" 2010-08-27 10:10:52 -07:00
Bill Napier 9a0e98ac47 Revert "Fix MonkeyRunner SDK documentation generation."
This reverts commit b47386bb27.
2010-08-27 09:58:29 -07:00
Hristo Bojinov 1ddbbfbbf3 Merge "Increase the Retouch buffer size from 550,000 to 600,000" 2010-08-27 09:32:21 -07:00
Bill Napier 2de097f7ae Merge "Fix MonkeyRunner SDK documentation generation." 2010-08-27 09:10:30 -07:00
Steve Block e3425a0220 Increase the Retouch buffer size from 550,000 to 600,000
The WebKit merge to r66079 built with JSC JavaScript engine triggers the
overflow.

Change-Id: Ifcb92aa019cfb0e7a93d667e15a792554fc0f676
2010-08-27 13:18:46 +01:00
Ying Wang a97039890e am ae553143: Refactor a bit.
Merge commit 'ae5531434877478985186dd0fb7ffefa12a74e52' into gingerbread-plus-aosp

* commit 'ae5531434877478985186dd0fb7ffefa12a74e52':
  Refactor a bit.
2010-08-26 16:07:12 -07:00
Ying Wang ae55314348 Refactor a bit.
Change-Id: I4573e7a5239536f49571d9222865e2526da573c8
2010-08-26 16:04:09 -07:00
Ying Wang cef82129e1 am aa6dbe21: Try to fix system.img in update zip file.
Merge commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6' into gingerbread-plus-aosp

* commit 'aa6dbe2144196bb6f9c1b6b539126250f9ef8af6':
  Try to fix system.img in update zip file.
2010-08-26 15:25:53 -07:00
Ying Wang aa6dbe2144 Try to fix system.img in update zip file.
Change-Id: Ic4f1c7478a22b1f8134ac768904e437fcfea700a
2010-08-26 15:16:22 -07:00
Hristo Bojinov dafb042755 Turn on ASLR by default. The "-a" option now takes an argument (on/off).
Change-Id: I4ddc70f2087c23586fc6aaaff3bb862f83d9779d
2010-08-26 14:37:42 -07:00
Ben Dodson a2eed2ce03 Merge "Continue to use search.html for site searching" 2010-08-26 09:44:03 -07:00
Ying Wang f5127dfc3d am 485bd44d: am d421f57d: Fix mkyaffs2image extra flags in the release tools.
Merge commit '485bd44d0d78f9f612075e17db1adb281741c84f'

* commit '485bd44d0d78f9f612075e17db1adb281741c84f':
  Fix mkyaffs2image extra flags in the release tools.
2010-08-25 21:21:43 -07:00
Ying Wang 485bd44d0d am d421f57d: Fix mkyaffs2image extra flags in the release tools.
Merge commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d' into gingerbread-plus-aosp

* commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d':
  Fix mkyaffs2image extra flags in the release tools.
2010-08-25 21:19:29 -07:00
Ying Wang d421f57d22 Fix mkyaffs2image extra flags in the release tools.
Change-Id: I806e3e85ef89941edf04352331e25730c491c470
2010-08-25 20:39:41 -07:00
Bill Napier b47386bb27 Fix MonkeyRunner SDK documentation generation.
Turns out that find doesn't like being passed paths that don't exist, so
don't do that.

Change-Id: I155cf48625513d1bcbd29329f1949967889dc9cc
2010-08-25 18:16:13 -07:00
Ying Wang 1c19026961 am f11fc5f0: am fb0a347b: Disable building OTA package if there is no kernel.
Merge commit 'f11fc5f098ab8481887cbbbbb4246f63837b61c9'

* commit 'f11fc5f098ab8481887cbbbbb4246f63837b61c9':
  Disable building OTA package if there is no kernel.
2010-08-25 16:40:44 -07:00
Ying Wang f11fc5f098 am fb0a347b: Disable building OTA package if there is no kernel.
Merge commit 'fb0a347b747a91173c8a9f845a0362e3f8a9701f' into gingerbread-plus-aosp

* commit 'fb0a347b747a91173c8a9f845a0362e3f8a9701f':
  Disable building OTA package if there is no kernel.
2010-08-25 16:13:08 -07:00
Ying Wang fb0a347b74 Disable building OTA package if there is no kernel.
Change-Id: I9a10cba92dd7f9cccd8cca58a5fa2d3a8b4620eb
2010-08-25 16:06:06 -07:00
Ying Wang 3c3f69a123 resolved conflicts for merge of 480250d3 to master
Change-Id: Ic55950f4b92c7029fd2ff62976cba0d4d738fc23
2010-08-25 15:52:51 -07:00
Ying Wang 480250d3ae am 68bb6517: Show command lines run by releasetools.
Merge commit '68bb65177cc6839e985c0a54343f44494de61d62' into gingerbread-plus-aosp

* commit '68bb65177cc6839e985c0a54343f44494de61d62':
  Show command lines run by releasetools.
2010-08-25 15:40:29 -07:00
Ying Wang 68bb65177c Show command lines run by releasetools.
Change-Id: Ic204e6738781c191cd6cefefdb351f8a156b2309
2010-08-25 15:23:21 -07:00
Ying Wang eb85d8d78e am eed6860d: am 4de6b5bf: Fix mkbootimg parameters for releasetools.
Merge commit 'eed6860d388f1761405d7165cb4d72e1f038b8a6'

* commit 'eed6860d388f1761405d7165cb4d72e1f038b8a6':
  Fix mkbootimg parameters for releasetools.
2010-08-25 15:13:07 -07:00