summaryrefslogtreecommitdiffstats
path: root/target
Commit message (Collapse)AuthorAgeFilesLines
* am 6f2bb44b: am c1ab82ae: Merge "Use stagefright (instead of OpenCore) ↵James Dong2010-06-241-0/+3
|\ | | | | | | | | | | | | | | | | authoring engine by default -rebased" into gingerbread Merge commit '6f2bb44b4b3551738c429a25f99e42aca8913f4f' * commit '6f2bb44b4b3551738c429a25f99e42aca8913f4f': Use stagefright (instead of OpenCore) authoring engine by default
| * am c1ab82ae: Merge "Use stagefright (instead of OpenCore) authoring engine ↵James Dong2010-06-241-0/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | by default -rebased" into gingerbread Merge commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b' into gingerbread-plus-aosp * commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b': Use stagefright (instead of OpenCore) authoring engine by default
| | * Use stagefright (instead of OpenCore) authoring engine by defaultJames Dong2010-06-241-0/+3
| | | | | | | | | | | | | | | | | | -rebased Change-Id: Ic184789eb4fb99b0e7cd5883bbe1267f903bc834
* | | am c55bb9ec: am f2bab487: Merge "Remove now unnecessary property overrides ↵Andreas Huber2010-06-241-7/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | to opt into stagefright." into gingerbread Merge commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e' * commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e': Remove now unnecessary property overrides to opt into stagefright.
| * | am f2bab487: Merge "Remove now unnecessary property overrides to opt into ↵Andreas Huber2010-06-241-7/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | stagefright." into gingerbread Merge commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a' into gingerbread-plus-aosp * commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a': Remove now unnecessary property overrides to opt into stagefright.
| | * Remove now unnecessary property overrides to opt into stagefright.Andreas Huber2010-06-231-7/+0
| | | | | | | | | | | | | | | Change-Id: I9810030e5576ac5a9cb31fcf0ce3f0baa96f6f40 related-to-bug: 2370115
* | | resolved conflicts for merge of 56791ebe to masterYing Wang2010-06-151-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: I7463636796f1262fd92af839102dc58d562259f7
| * | am c01cf7b9: resolved conflicts for merge of 2b8d2383 to gingerbreadYing Wang2010-06-151-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Merge commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6' into gingerbread-plus-aosp * commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6': Add a tapas command. Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
| | * resolved conflicts for merge of 2b8d2383 to gingerbreadYing Wang2010-06-151-1/+1
| | |\ | | | | | | | | | | | | Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
| | | * Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.Joe Onorato2010-06-101-1/+1
| | | | | | | | | | | | | | | | Change-Id: I79e6f60e009dad3a48709962347441e4ca0c337a
* | | | am 9f431335: merge from froyo-plus-aospThe Android Open Source Project2010-06-141-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '9f431335ab377396713b8b386ad7539b2b28eff5' * commit '9f431335ab377396713b8b386ad7539b2b28eff5': generic.mk: Replaced AlarmClock with newer DeskClock App
| * | | merge from froyo-plus-aospThe Android Open Source Project2010-06-141-1/+1
| |\ \ \ | | |/ / | |/| | | | | | Change-Id: Ie8f2b137de580bfb23a1bdee513a8a20075e40a3
| | * | merge from open-source masterThe Android Open Source Project2010-06-141-1/+1
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I058f809f7e7eb69a757cb75f934a3630dfd7d777
| | | * | generic.mk: Replaced AlarmClock with newer DeskClock AppChristian Mehlmauer2010-05-222-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I2afe4876b1dd7e9e9200e27ba64eebe4a34065fb
* | | | | am a65ecab3: am 13a90e3a: Add SystemUI.apk to the generic build.Joe Onorato2010-06-021-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Add SystemUI.apk to the generic build.Joe Onorato2010-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I03d92d93fbcb51808a096fb7d48c1b693efa777d
* | | | | am eabec90b: am f8e9fb3b: Merge "Atomic/SMP update." into krakenAndy McFadden2010-06-021-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Atomic/SMP update." into krakenAndy McFadden2010-06-021-0/+3
| |\ \ \ \
| | * | | | Atomic/SMP update.Andy McFadden2010-06-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added "TARGET_CPU_SMP := true" to simulator configuration, since it's likely the simulator will be running on SMP hardware. Change-Id: I7527895abe70ffaece5c52fd3ffcfe4b0d698fd2
| * | | | | am b93e03cb: am 52911309: Cherry-pick unbundled build changes from masterYing Wang2010-06-021-0/+7
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | | | | | | Merge commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5' into kraken * commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5': Cherry-pick unbundled build changes from master
| | * | | am 52911309: Cherry-pick unbundled build changes from masterYing Wang2010-06-021-0/+7
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | Merge commit '529113098350c026ec521258d4c6fba51f285a48' into froyo-plus-aosp * commit '529113098350c026ec521258d4c6fba51f285a48': Cherry-pick unbundled build changes from master
| | | * | Cherry-pick unbundled build changes from masterYing Wang2010-05-261-0/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
* | | | | am eae2720b: am 3a212f0f: am 0c5363c8: am 8e5605a7: Add QuickSearchBox to ↵Xavier Ducrohet2010-05-261-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | the SDK build.
| * | | | am 0c5363c8: am 8e5605a7: Add QuickSearchBox to the SDK build.Xavier Ducrohet2010-05-251-1/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0c5363c8571eef11eeb21a575da941565c34191e' into kraken * commit '0c5363c8571eef11eeb21a575da941565c34191e': Add QuickSearchBox to the SDK build.
| | * | | am 8e5605a7: Add QuickSearchBox to the SDK build.Xavier Ducrohet2010-05-251-1/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7' into froyo-plus-aosp * commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7': Add QuickSearchBox to the SDK build.
| | | * | Add QuickSearchBox to the SDK build.Xavier Ducrohet2010-05-251-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia0cc7b4cd8245d368685d50cf32cd21875cbdbbf
* | | | | am 3388f183: am 588d529e: Merge "Make Vorbis decoding through stagefright ↵Andreas Huber2010-05-251-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | the default." into kraken
| * | | | Make Vorbis decoding through stagefright the default.Andreas Huber2010-05-251-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I4273b766024f5363fdd05c3d30d0c71209679950
* | | | | am 8a0a937b: am ed43e3d7: Merge "Set no camera default for ↵Chih-Chung Chang2010-05-233-0/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | emulator/generic/sim builds." into kraken
| * | | | Merge "Set no camera default for emulator/generic/sim builds." into krakenChih-Chung Chang2010-05-233-0/+9
| |\ \ \ \
| | * | | | Set no camera default for emulator/generic/sim builds.Chih-Chung Chang2010-05-103-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3c75d093bb48a9d10952d587c3e48bbcc227f139
* | | | | | Support for unbundled app buildYing Wang2010-05-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this CL, run "make APP-{appname}" to build unbundled app in the unbundled app src tree. See http://b/issue?id=2667113 Change-Id: I1d753db795142508bc841ae66b4408220ab687c5
* | | | | | am bc2f9318: am 57b44e52: am bc12cd04: merge from open-source masterThe Android Open Source Project2010-05-144-1/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am bc12cd04: merge from open-source masterThe Android Open Source Project2010-05-144-1/+25
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'bc12cd04b878a9c3520abd21600c2078c930adc3' into kraken * commit 'bc12cd04b878a9c3520abd21600c2078c930adc3': Use a different kernel boot line for the disk installer. Use a property to enable the eth0 LAN port on the emulator
| | * | | merge from open-source masterThe Android Open Source Project2010-05-144-1/+25
| | |\ \ \ | | | | |/ | | | |/| | | | | | Change-Id: I0dd123dde8f0da42a99313cffed6a48d30e38381
| | | * | Merge "Use a different kernel boot line for the disk installer."Jean-Baptiste Queru2010-05-141-1/+3
| | | |\ \
| | | | * | Use a different kernel boot line for the disk installer.Bruce Beare2010-05-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b20386a24e1141bfe2a252b635243c235d46865
| | | * | | Use a property to enable the eth0 LAN port on the emulatorBruce Beare2010-05-053-0/+22
| | | |/ / | | | | | | | | | | | | | | | Change-Id: I26f4ec7fac9b7a8ad3013914967cf0f8fdec91ff
* | | | | am ccb0c7cd: am 7c1a018f: am f9e275b0: merge from open-source masterThe Android Open Source Project2010-05-054-11/+79
|\ \ \ \ \ | |/ / / /
| * | | | am f9e275b0: merge from open-source masterThe Android Open Source Project2010-05-054-11/+79
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f9e275b0c785aa8ed83606e5b98f37d2050a528e' into kraken * commit 'f9e275b0c785aa8ed83606e5b98f37d2050a528e': Add support for x86 VirtualBox Emulation
| | * | | merge from open-source masterThe Android Open Source Project2010-05-054-11/+79
| | |\ \ \ | | | |/ / | | | | | | | | | | Change-Id: Ie06ab3b2424480706c644f1a803a6e3de400f15d
| | | * | Add support for x86 VirtualBox EmulationBruce Beare2010-05-054-11/+79
| | | | | | | | | | | | | | | | | | | | | | | | | To make a VirtualBox install image, make installer_img
* | | | | am 58248935: am cf28b803: am ae4e1455: merge from open-source masterThe Android Open Source Project2010-05-037-0/+328
|\ \ \ \ \ | |/ / / /
| * | | | am ae4e1455: merge from open-source masterThe Android Open Source Project2010-05-037-0/+328
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6' into kraken * commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6': Adapt to new location of libcore Make expr more POSIXy generic_x86 support Remove obsolete machine-setup.html reference.
| | * | | merge from open-source masterThe Android Open Source Project2010-05-037-0/+328
| | |\ \ \ | | | |/ / | | | | | | | | | | Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
| | | * | generic_x86 supportBruce Beare2010-04-287-0/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add in Makefiles and support files for x86 builds Based on changes by: wonjong.lee <wonjong.lee@windriver.com> Additional changes by: Mark Gross <mark.gross@intel.com> Additional changes by: Bruce Beare <brucex.j.beare@intel.com> Change-Id: Id087411b282b1b68a0251e7f9cbbdde183549787 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
| | | * | Add provisioning app in the generic buildJean-Baptiste Queru2010-03-041-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iffdd4d21a3c55e7a73d58289fda31ac8a27a18ac
| | | * | merge from open-source masterJean-Baptiste Queru2009-12-211-1/+1
| | | |\ \
| | | | * | Enable building for simulatorRavi K Yenduri2009-12-101-1/+1
| | | | | |
| | | | * | eclair snapshotJean-Baptiste Queru2009-11-137-13/+32
| | | | | |
generated by cgit v1.1 at 2024-12-26 19:57:27 +0000