David 'Digit' Turner
6e7926a6cd
am 55a461c9: am f245dd79: Merge "full_x86-eng: Ensure we copy the PC bios files."
...
* commit '55a461c9b1ab92bf6250650afcacc8de85c1e01a':
full_x86-eng: Ensure we copy the PC bios files.
2011-04-26 10:24:22 -07:00
David 'Digit' Turner
f245dd7975
Merge "full_x86-eng: Ensure we copy the PC bios files."
2011-04-25 23:25:38 -07:00
Dima Zavin
7fbe6bc99e
generic_no_telephony: always include stub audio/audio_policy HALs
...
Change-Id: Ib48e622b2fb137e24517cb31e6c46b3795296b45
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-22 09:49:22 -07:00
Raphael
6d3bbf5678
am 5e3ce397: resolved conflicts for merge of 854354be
to honeycomb-plus-aosp
...
* commit '5e3ce3972c5f5245115c1f3ed95efab66150d457':
Add swtmenubar.jar to SDK
2011-04-15 17:25:55 -07:00
Raphael
5e3ce3972c
resolved conflicts for merge of 854354be
to honeycomb-plus-aosp
...
Change-Id: Iabd1ac0b63276067b094939b237c6e695fff0c9f
2011-04-15 17:13:44 -07:00
Raphael Moll
24434460b6
Add swtmenubar.jar to SDK
...
Change-Id: Ia46337875cb78bb6a01731008b9acbfa4657d0a9
2011-04-14 21:25:02 -07:00
David 'Digit' Turner
495283735e
full_x86-eng: Ensure we copy the PC bios files.
...
This change ensures that building full_x86-eng will copy the
Bios files to the right location. This is necessary to launch
"emulator-x86" after building the system images.
Before this patch, one had to make the copy manually. Note that
sdk_x86-eng does not need this (the files are actually taken care
of in build/target/product/sdk.mk so will be copied even in case
of the ARM sdk build).
Change-Id: If70adead27c7997694ebc30561005d26a7358c34
2011-04-14 17:34:40 +02:00
Chih-Chung Chang
f7e0235f77
Change from old Gallery3D to new GalleryNew3D.
...
Change-Id: I9da1f97acc3f15ea62aa10aaa46590c67ee2ff70
2011-04-07 16:02:23 +08:00
Vladimir Chtchetkine
2aced2dc94
Fix ADB, and a typo in BoardConfig.mk
...
Added an instruction to copy init.vbox_x86.rc to the output's root.
This is required to properly setup networking and other stuff inside
the emulator.
Change-Id: I84b11b048120a59109aa95d4f18d496a3c874911
2011-04-05 17:28:43 -07:00
Vladimir Chtchetkine
47113792e5
Increate system image size for vbox_x86 target
...
Default system image size of 128M is too small to contain
everything to run Android in VBox.
Change-Id: I1d08051e170817c846660d88203908d090fc4652
2011-04-04 13:41:16 -07:00
Vladimir Chtchetkine
cd4801a07c
Fix the build
...
Change-Id: I9eedff42d4855c1f2668509cc19d388735fb57aa
2011-04-04 09:48:48 -07:00
Vladimir Chtchetkine
769c2efb95
Merge "Fix build scripts for vbox_x86 target"
2011-04-04 09:40:24 -07:00
Brian Carlstrom
bb7c6d88c6
Tracking merge of dalvik-dev to master
...
git cherry-pick --no-commit 5fac8d8f7096d8a950acad1ad0a8b963cef72e03
git cherry-pick --no-commit 1a8210710b46a0796ff2f8e76b6beb3a54f89019
git cherry-pick --no-commit 4fe2ac9f7284b838393aec8f0f48caef2510fd46
git cherry-pick --no-commit 7beb710a8f976fc4cb1e8be780644386870c4975
Change-Id: Ib10348e5509c906c6b95fa4accd6a18900bfe748
2011-04-01 15:45:58 -07:00
Vladimir Chtchetkine
78305ea16f
Fix build scripts for vbox_x86 target
...
Change-Id: Ia1f2bf9f05fcd8f07b240e15c7c01a80c6ca6829
2011-04-01 08:24:25 -07:00
Raphael
9b4660a1c6
resolved conflicts for merge of db0d59d1
to honeycomb-plus-aosp
...
Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
2011-03-25 15:13:55 -07:00
Ying Wang
507c3eac6a
Merge "x86: qemu emulator is the default build target"
2011-03-25 14:30:25 -07:00
Brett Chabot
0ada73f39f
am 27c782bf: am 50a06fe3: am dd8edfdb: Manual cherry pick of build more sdklib tests.
...
* commit '27c782bfcdbec689fc7d195fe485e6f2c623e7cf':
Manual cherry pick of build more sdklib tests.
2011-03-24 19:07:18 -07:00
Brett Chabot
27c782bfcd
am 50a06fe3: am dd8edfdb: Manual cherry pick of build more sdklib tests.
...
* commit '50a06fe30e17acdb9a20c3c58f869d59d8c1b563':
Manual cherry pick of build more sdklib tests.
2011-03-24 19:05:35 -07:00
Brett Chabot
50a06fe30e
am dd8edfdb: Manual cherry pick of build more sdklib tests.
...
* commit 'dd8edfdb1ebdc5717357564fe42586d090e2bbe0':
Manual cherry pick of build more sdklib tests.
2011-03-24 19:02:44 -07:00
Brett Chabot
dd8edfdb1e
Manual cherry pick of build more sdklib tests.
...
Original description from open master:
-----------
Add more sdk lib tests to sdk build.
Also fix whitespace issues introduced by last commit.
Change-Id: Ifdede823b99b210ad6a48513e8522b4f660537cf
2011-03-24 11:26:29 -07:00
Bruce Beare
08ee4287cc
x86: qemu emulator is the default build target
...
Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-03-24 10:55:22 -07:00
Raphael Moll
9791e6ea17
am 7e58a5fa: Merge "Merge 960ad4e095
from master_open." into honeycomb
...
* commit '7e58a5fa66f905a4524267cd1a9328d8046b3280':
Merge 960ad4e095
from master_open.
2011-03-24 10:04:06 -07:00
Raphael Moll
7e58a5fa66
Merge "Merge 960ad4e095
from master_open." into honeycomb
2011-03-24 09:54:38 -07:00
Brett Chabot
381dc94401
Add more sdk lib tests to sdk build.
...
Also fix whitespace issues introduced by last commit.
Change-Id: I579abcd5f8bc743ee7fa0206307af9347e7352dc
2011-03-23 23:04:21 -07:00
Brett Chabot
01b1087809
am 29040f6d: am deab07f3: am d42aadb1: Add ddmlib-tests.jar to sdk build.
...
* commit '29040f6ddb44960cdf3fe830c5838bd5bca893da':
Add ddmlib-tests.jar to sdk build.
2011-03-23 22:23:00 -07:00
Brett Chabot
29040f6ddb
am deab07f3: am d42aadb1: Add ddmlib-tests.jar to sdk build.
...
* commit 'deab07f31b673481ef92c6044835b579be5e2483':
Add ddmlib-tests.jar to sdk build.
2011-03-23 22:21:04 -07:00
Brett Chabot
deab07f31b
am d42aadb1: Add ddmlib-tests.jar to sdk build.
...
* commit 'd42aadb1ebbc1aef1551b4aa4c525ef54cd5433d':
Add ddmlib-tests.jar to sdk build.
2011-03-23 22:18:26 -07:00
Brett Chabot
d42aadb1eb
Add ddmlib-tests.jar to sdk build.
...
Change-Id: Ib681389a1f1e2ead30808cef3c74dd5da9dea4d0
2011-03-23 22:12:41 -07:00
Bruce Beare
66330ac800
Merge 960ad4e095
from master_open.
...
Original commit msg:
sdk: Add pc-bios files for IA qemu emulator
Change-Id: I7f66a192975dc201a5f886e6a5e02b0ca9fbdee0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-03-23 15:17:23 -07:00
David Turner
6f8ab7cefc
am 6d712c4e: am 86ed1dba: am 75724826: Merge "sdk: Add pc-bios files for IA qemu emulator"
...
* commit '6d712c4eac8b49c6b5a5b9ee80c0421b17bc9a2f':
sdk: Add pc-bios files for IA qemu emulator
2011-03-23 14:10:52 -07:00
David Turner
6d712c4eac
am 86ed1dba: am 75724826: Merge "sdk: Add pc-bios files for IA qemu emulator"
...
* commit '86ed1dbaa74e1c5b21f98dbb74f2b600a9025470':
sdk: Add pc-bios files for IA qemu emulator
2011-03-23 14:05:58 -07:00
Brett Chabot
06f180f764
Add ddmlib-tests.jar to sdk build.
...
Change-Id: Ifc7cc59726066f869504a338d3025bffdeaa6785
2011-03-22 20:38:57 -07:00
Jesse Wilson
2ad721bcc7
Add a 'dalvik' shell script.
...
Change-Id: I141607d8b021a4b27c059d32391cc96f554c5ac7
http://b/4128077
2011-03-17 16:57:14 -07:00
Jean-Michel Trivi
28149769b3
am c28cdd12: am 4361552b: Merge "Fix bug 4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs" into honeycomb-mr1
...
* commit 'c28cdd120e3294a9c6fbb863db685ddd000b183b':
Fix bug 4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs
2011-03-16 20:39:51 -07:00
Jean-Michel Trivi
c28cdd120e
am 4361552b: Merge "Fix bug 4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs" into honeycomb-mr1
...
* commit '4361552b218871fd61bc7d1f5fe50522da2c399e':
Fix bug 4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs
2011-03-16 20:37:37 -07:00
Jean-Michel Trivi
e410564714
Fix bug 4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs
...
Add the new libraries on the system
Change-Id: Ifc7259c45dfb7a4e584a822793811f4119ed5535
2011-03-16 17:30:22 -07:00
Bruce Beare
960ad4e095
sdk: Add pc-bios files for IA qemu emulator
...
Change-Id: Ia919ff57295cd020810989f241da713210bc8720
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-03-15 07:47:48 -07:00
Bruce Beare
18a130e98a
x86: qemu emulator is the default build target
...
Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
2011-03-15 07:47:48 -07:00
Iliyan Malchev
b375e71d30
build: remove prelinker build build system
...
This patch removes support for prelinking from the build system. By now, the
prelinker has outlived its usefulness for several reasons. Firstly, the
speedup that it afforded in the early days of Android is now nullified by the
speed of hardware, as well as by the presence of Zygote. Secondly, the space
savings that come with prelinking (measued at 17MB on a recent honeycomb
stingray build) are no longer important either. Thirdly, prelinking reduces
the effectiveness of Address-Space-Layout Randomization. Finally, since it is
not part of the gcc suite, the prelinker needs to be maintained separately.
The patch deletes apriori, soslim, lsd, isprelinked, and iself from the source
tree. It also removes the prelink map.
LOCAL_PRELINK_MODULE becomes a no-op. Individual Android.mk will get cleaned
separately. Support for prelinking will have to be removed from the recovery
code and from the dynamic loader as well.
Change-Id: I5839c9c25f7772d5183eedfe20ab924f2a7cd411
2011-03-12 14:59:46 -08:00
Ed Heyl
8e84514ef5
resolved conflicts for merge of 51de6437
to honeycomb-plus-aosp
...
Change-Id: Ie076ccd04fc02fdc6753b4787bcf5ac12f167d4e
2011-03-05 09:31:29 -08:00
David Turner
6b11b58a4a
am dfa82c43: am faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target"
...
* commit 'dfa82c438f5557c5bae3b8f8ae2dc8444edc8036':
x86: Add in the VirtualBox emulator as a separate build target
2011-03-05 09:20:33 -08:00
David Turner
9edd4fa0a6
Merge "x86: sdk_x86 build target"
2011-03-04 12:25:47 -08:00
David Turner
faa6820066
Merge "x86: Add in the VirtualBox emulator as a separate build target"
2011-03-04 11:41:02 -08:00
Ying Wang
cdd1dc0a6f
am 1fe8c892: am 65265492: Don\'t clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
...
* commit '1fe8c89298df6433c2f70b8ae093b90bd12eb760':
Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
2011-03-02 12:54:55 -08:00
Wink Saville
9423f913ab
am 6d85b7c7: am 243d9ae2: am 4d67e916: am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
...
* commit '6d85b7c774d224825f7ecd6e7819499daadc4c78':
WAPPushManager, WAP Push over SMS message handler
2011-03-02 12:53:40 -08:00
Ying Wang
1fe8c89298
am 65265492: Don\'t clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
...
* commit '652654927da52f9d1d0e75b69be44701686f79e7':
Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
2011-03-01 14:56:57 -08:00
Ying Wang
652654927d
Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
...
We are deprecating use of AndroidBoard.mk. To move add-radio-file to
Android.mk, cleaning INSTALLED_RADIOIMAGE_TARGET may clean the radio
target set by other Android.mks that get included before
target/board/Android.mk.
Bug: 3500660
Change-Id: Iee19c40c18f0e9ec23bad4b6ab0e600756af615a
2011-03-01 14:16:58 -08:00
Wink Saville
6d85b7c774
am 243d9ae2: am 4d67e916: am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
...
* commit '243d9ae28ce30dda98bc024794218f1a8b21e85f':
WAPPushManager, WAP Push over SMS message handler
2011-03-01 13:48:38 -08:00
Bruce Beare
5636301f78
x86: sdk_x86 build target
...
Change-Id: I3876246ddf884ffd09ff0f8e3e300dffb4a332f0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-03-01 13:04:23 -08:00
Bruce Beare
ba366c4fb3
x86: Add in the VirtualBox emulator as a separate build target
...
Change-Id: Icff81a757952b7652d171bc95773e177c4fd7772
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2011-03-01 13:04:21 -08:00
Wink Saville
4d67e91644
am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
...
* commit 'd09b2e552788cc90813e930e3912651e053c657c':
WAPPushManager, WAP Push over SMS message handler
2011-03-01 12:39:42 -08:00
Marc Blank
784f377fee
Add Exchange to build targets
...
Change-Id: I24c661140e1129ff2e47a1dbbafe5d9040bc08a3
2011-02-25 11:18:47 -08:00
Wink Saville
d09b2e5527
Merge "WAPPushManager, WAP Push over SMS message handler"
2011-02-23 18:23:21 -08:00
Ying Wang
5371de12df
Fix generic_x86 image sizes.
...
The image build tools only accept decimals.
Change-Id: I4fc3d32a9528bdad4cfb9381cff344a1a1b6b6d5
2011-02-09 10:50:55 -08:00
Kenny Root
773f315bd8
Add system image size for X86
...
It was defaulting to 128M which was slightly too small for all the
applications. Increasing to 150M fits the resulting image.
Change-Id: I55957c54fbdb77090487c08ed3948988621978b3
2011-02-08 07:45:46 -08:00
Jean-Baptiste Queru
4b35d1aba0
Fix x86 build.
...
Change-Id: I22dc39a68911e1b5846c20e63c0f8c59521ea7f5
2011-02-03 09:55:47 -08:00
The Android Open Source Project
3b6bf4484e
Mass merge from gingerbread - do not merge
...
Change-Id: Idbfeda9c0a9720d894352747c01754ed2c90c44d
2011-01-30 12:39:46 -08:00
Eric Fischer
2cbc3bb1fb
am 54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
...
* commit '54a6b731da4029237410f04c1b6cb9b64bf2783f':
Flesh out the languages_full list with recently added locales.
2011-01-29 09:27:42 -08:00
Jean-Baptiste Queru
12d87a3e3c
am ef7c96c9: am d3966412: am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
...
* commit 'ef7c96c988a0c68c387bcbe7efa498c7066f4c34':
Add dnsproxyd to keep in sync with base init.rc
2011-01-29 08:35:14 -08:00
Jean-Baptiste Queru
ef7c96c988
am d3966412: am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
...
* commit 'd39664126ed27b816e91312d28b76218f6bd5efb':
Add dnsproxyd to keep in sync with base init.rc
2011-01-29 08:01:57 -08:00
Jean-Baptiste Queru
d39664126e
am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
...
* commit 'ab81ffe2defa3294e09b70372e2179db2377c894':
Add dnsproxyd to keep in sync with base init.rc
2011-01-27 13:57:47 -08:00
Bruce Beare
d59072d4d4
Add dnsproxyd to keep in sync with base init.rc
...
Change-Id: I8785cb5a5297c3cc6f3b0152fcae578a9ea89e89
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-01-27 13:32:47 -08:00
Robert Greenwalt
824bc51ee8
am 75e557d1: am b6c2b1c6: Fix SDK connectivity.
...
* commit '75e557d11331afaca818ec60a75c3a62253d9542':
Fix SDK connectivity.
2011-01-24 17:51:14 -08:00
Robert Greenwalt
75e557d113
am b6c2b1c6: Fix SDK connectivity.
...
* commit 'b6c2b1c62706689410b5d3818aacd6d3103b9b7a':
Fix SDK connectivity.
2011-01-24 17:48:52 -08:00
Robert Greenwalt
b6c2b1c627
Fix SDK connectivity.
...
Re-add the phone apk to the sdk build.
bug:3380122
Change-Id: I0b011557aba95fbe9be24d4356eddde4b163b80f
2011-01-24 16:32:18 -08:00
Brian Swetland
7cc2440994
make TINY_ANDROID build without the presence of frameworks/* and development/*
...
Change-Id: I795e27a9ce837b193c6d8d0516e2f523c17214e2
2011-01-23 18:56:08 -08:00
Eric Fischer
59ef5747bf
am e6e583ff: am 7dfc1270: am 54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
...
* commit 'e6e583ffab4fd272ceb0c190223dd9e710336542':
Flesh out the languages_full list with recently added locales.
2011-01-21 14:40:26 -08:00
Eric Fischer
e6e583ffab
am 7dfc1270: am 54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
...
* commit '7dfc1270967c96be6dcd58fb7770c07482a7e90d':
Flesh out the languages_full list with recently added locales.
2011-01-21 14:37:20 -08:00
Ying Wang
611a4b25c1
am 04a4d9ad: am 04e1f31d: Move videoeditor libraries to generic_no_telephony.mk.
...
* commit '04a4d9ade8c3ac18476c0f5a934e4efc6365fee8':
Move videoeditor libraries to generic_no_telephony.mk.
2011-01-19 10:35:02 -08:00
Ying Wang
04e1f31dfd
Move videoeditor libraries to generic_no_telephony.mk.
...
Change-Id: I8ea2058b79ccfda3114ba64b4e43c175a0fe086c
2011-01-19 10:28:05 -08:00
Eric Fischer
7dfc127096
am 54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
...
* commit '54a6b731da4029237410f04c1b6cb9b64bf2783f':
Flesh out the languages_full list with recently added locales.
2011-01-18 15:35:46 -08:00
Xavier Ducrohet
e9d77db619
am 155776bf: am a17fe58b: Update SDK app list.
...
* commit '155776bf06ece56db27abf84da9cbe5260c2cf36':
Update SDK app list.
2011-01-18 10:22:48 -08:00
Xavier Ducrohet
a17fe58b46
Update SDK app list.
...
Change-Id: I1a99b0bd716f90688aea9b9db20e393a91ad8ad2
2011-01-18 10:10:32 -08:00
Xavier Ducrohet
7bfa4a352e
am 0e581c25: am aafe93b1: Merge "Add librs_jni to the sdk product packages." into honeycomb
...
* commit '0e581c25d44afdf619e1903a5b471df7a69c073f':
Add librs_jni to the sdk product packages.
2011-01-18 09:54:23 -08:00
Dharmaray Kundargi
52288359b6
am fd5aca8b: am c86bcf5f: Merge "add videoeditor libraries to make" into honeycomb
...
* commit 'fd5aca8bb196e24b8b9c8189e2389f4f9087f804':
add videoeditor libraries to make
2011-01-17 23:30:57 -08:00
Xavier Ducrohet
92cbc443ec
Add librs_jni to the sdk product packages.
...
This is similar to 88e76ceca0
but the SDK build does not extend generic_no_telephony.
Change-Id: Id01178b2a89d002aca52d57ad7c9dfb4e1184216
2011-01-17 16:39:36 -08:00
Dharmaray Kundargi
c86bcf5f16
Merge "add videoeditor libraries to make" into honeycomb
2011-01-17 10:52:26 -08:00
David 'Digit' Turner
d0202e5390
am 665aefdd: am 1fa29fc9: Merge "Add librs_jni to the generic product packages." into honeycomb
...
* commit '665aefdd2a47abe7abff61a83e78a2e4470ca004':
Add librs_jni to the generic product packages.
2011-01-16 23:04:13 -08:00
Dharmaray Kundargi
21d812fd69
add videoeditor libraries to make
...
Change-Id: I024f087bd026f709fdbfc1272c79166ad9bf5bcd
2011-01-16 16:45:20 -08:00
David 'Digit' Turner
88e76ceca0
Add librs_jni to the generic product packages.
...
Without this, HC cannot start under emulation (because some RenderScript-related
classes fail to preload properly during the boot, killing Zygote, even if they
are later never used).
Change-Id: I825051603425df59b9677875eba0ae2a811649ee
2011-01-17 00:15:34 +01:00
Eric Fischer
1c81f3b01e
Flesh out the languages_full list with recently added locales.
...
Change-Id: I8c43feba15f03e0b204b2d3ef136ea6e6e2e4fe2
2011-01-14 15:23:23 -08:00
Jesse Wilson
7eff81df2a
Move apache-xml to external. (project 3 of 4)
...
Change-Id: Ib65348e4203e6ac653e9fe81369b21dad06b5b58
http://b/3351604
2011-01-13 17:21:58 -08:00
noda
ee8fe64709
WAPPushManager, WAP Push over SMS message handler
...
The WAPPushManager is a new, optional service for handling WAP Push
over SMS messages. This service allows a carrier to designate a high
priority handler for specific WAP Push over SMS messages without
affecting other WAP Push over SMS, binary SMS, or SMS text messages.
It is also optional, so that it can be configured out of the target
image resulting in no change in the WAP Push over SMS handling
behavior compared to the current AOSP.
- This patch adds the WAPPushManager to the core build.
Change-Id: Ib139a9dca8b18d4cd50b70c041a346584ef96279
2011-01-07 02:46:57 +09:00
Jason parks
a1e48dc30f
Add the CryptKeeper to the build.
...
Change-Id: I094c5f24cd7f9f1241d301984badd15b38eef33a
2011-01-05 14:51:42 -06:00
Jean-Baptiste Queru
229c35eed4
am 41c423da: am 96d3e9b3: Merge "generic_x86 builds don\'t need/use the sparse ext4 format."
...
* commit '41c423da9df557b87e8db490b3ed4d4b34470423':
generic_x86 builds don't need/use the sparse ext4 format.
2010-12-29 16:02:14 -08:00
Jean-Baptiste Queru
9326ab155e
am 827c662d: am e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"
...
* commit '827c662d8f145e5a0492838c951dad5d96716c71':
Use ext4 file system for generic_x86 userdata partition
2010-12-29 16:02:12 -08:00
Jean-Baptiste Queru
fb6172cf7b
am 4bd05717: am 670ccf2c: Merge "GB Updates for init.rc and boot command line"
...
* commit '4bd05717e2156a0eeb9de81de3e8595b560f2627':
GB Updates for init.rc and boot command line
2010-12-29 16:02:09 -08:00
Bruce Beare
4c0115d0b7
generic_x86 builds don't need/use the sparse ext4 format.
...
Change-Id: I62973b131a728c3862be4642e2d49d0fa61555ac
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-28 15:33:27 -08:00
Bruce Beare
1e906eff26
Use ext4 file system for generic_x86 userdata partition
...
Change-Id: I05710c2bda521b35712513bc219fc73ed00e4617
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-28 14:48:24 -08:00
Bruce Beare
5f276fff11
GB Updates for init.rc and boot command line
...
Change-Id: I0638c8834fccbdc94ec99e7592a75b6972cb53b8
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-28 14:48:23 -08:00
Brian Carlstrom
bf66dd3485
Scrub the set of dalvik modules that are built by default
...
Bug: 3009435
Change-Id: I20d88df665e48aa74c20cef7e236de377cd0d14b
2010-12-14 22:35:10 -08:00
Daniel Sandler
87c983ca57
Protips: End of line.
...
Bug: 3248626
Change-Id: Iecf180f64df492a3bd907697cb0778e60031ed8a
2010-12-13 12:46:17 -05:00
Kenny Root
696180ecda
Add installd to PRODUCT_PACKAGES
...
Another change adds the "optional" tag to installd, so moving it here
and removing it from the grandfathered list.
Change-Id: I035ffd527d007cf104c15890509976fc9b99d216
2010-12-03 11:00:40 -08:00
Jeff Brown
cbc0f4442e
Delete the tuttle keymaps.
...
These files have been obsolete for years.
Change-Id: I489d22799dd0fd476b6afe296e24434d437ea75b
2010-11-23 16:48:26 -08:00
Jeff Brown
99aacc211e
Use prebuilt keymaps in frameworks/base/data/keyboards.
...
Change-Id: I847167abaf5538a45f40df0ed5d69c9848284871
2010-11-18 00:08:24 -08:00
Xavier Ducrohet
6a5b27a4e2
Temp disabling of some apps in SDK build.
...
Change-Id: Ib8495cfe935ab96997f19e9af5a93ebbb99493ab
2010-11-15 18:31:48 -08:00
Xavier Ducrohet
63ae1fa6bb
Temporarily remove some apps from the SDK build.
...
Change-Id: Ic23449ee144f0bf4ba4a208e8742a7db31d1b8a4
2010-11-02 18:35:45 -07:00
Xavier Ducrohet
d4dfc2b923
Add the fonts to the SDK system image.
...
Change-Id: I905e42b8ca44901adc15b083689c2252a18ce130
2010-11-02 13:59:40 -07:00
Jean-Baptiste Queru
bbd03141b4
resolved conflicts for merge of cbc479c3
to master
...
Change-Id: Ie421c405d2a52f6c7f1d65f44e0576e32842a559
2010-10-24 14:02:10 -07:00
Jean-Baptiste Queru
cbc479c3a6
Set defauilt ringtone and default notification in full builds
...
Change-Id: Ia5c76d393d428dffc72cb8440720fa0f0884e401
2010-10-24 13:31:17 -07:00
Jean-Baptiste Queru
5002433ba8
resolved conflicts for merge of cd3bd740
to master
...
Change-Id: I07aaf337e325b1cec652497f2630b5c42096f9a5
2010-10-24 06:08:24 -07:00
Jean-Baptiste Queru
cd3bd7402f
Use the new list of all audio files
...
Change-Id: Ic510c243dde616cca3374f6aa6a2835690cf6818
2010-10-22 18:56:30 -07:00
Jean-Baptiste Queru
5024299a51
Delete obsolete full_no_telephony.mk
...
Change-Id: I944209ce5dc70cd1f43a9204faff38bc367d923f
2010-10-22 16:47:37 -07:00
Jean-Baptiste Queru
cfbcd758d8
Improve setup of base products.
...
Split telephony into its own product, so that we can easily
add telephony support to any configuration without pulling
anything else. Use it from generic.
Split the "full" family between a (no-telephony) base,
a telephony version of the same (both of which can be used
as a starting point for on-device builds), and the true classic
full which is an emulator build.
Change-Id: I616d34f2a29415b8ec997173f8e893c312ade5c2
2010-10-22 16:47:31 -07:00
Jean-Baptiste Queru
68f21cdc71
Minor cleanup - DO NOT MERGE
...
Change-Id: I0fc4e3c45ae5a545f1a02ed974bc3c7500286e22
2010-10-22 16:13:20 -07:00
Jean-Baptiste Queru
dd46ad41ff
Clean up full config - DO NOT MERGE
...
This splits the existing full.mk in two parts:
-One is the device-independent full_base.mk
-The other is the emulator-specific device.mk
This way we'll be able to inherit from full_base.mk
for on-device builds without any emulator-specific
files getting in the way.
Change-Id: Ieb1f4ed47988c8fff119ff53f1f374032da3752d
2010-10-22 15:00:24 -07:00
Ying Wang
663c9f2d59
resolved conflicts for merge of e67944ee
to master
...
Change-Id: I9284d5a5df6fc963bc4c70c87a505857f41c93af
2010-10-22 14:41:17 -07:00
Ying Wang
e67944ee12
Switch Unbundled apps from generic.mk to full.mk.
...
Change-Id: I7aaaef8f2032590d55ccec77621c6b3f4c121f9a
2010-10-22 14:14:59 -07:00
Jean-Baptiste Queru
40d2e65e3b
am 040e8cf0: Fix list of locales (bad country codes).
2010-10-22 13:02:38 -07:00
Jean-Baptiste Queru
040e8cf01b
Fix list of locales (bad country codes).
...
DA->DK, SV->SE
Change-Id: I7bc7f64905ecd583e1a7ca5b43a8fffd5f3ba383
2010-10-22 12:34:32 -07:00
Jean-Baptiste Queru
09fa73b3c3
resolved conflicts for merge of 8928ef8b
to master
...
Change-Id: I0c2fa435b38266f71651756570926c4b1488b57e
2010-10-22 12:29:27 -07:00
Jean-Baptiste Queru
6c75cb3752
am 0332f0ac: Truly default to the full config.
2010-10-22 12:12:52 -07:00
Jean-Baptiste Queru
8928ef8b4c
Make a full list of locales available
...
Use it for the sim build and full build.
Change-Id: I64dfa7ac1b374529ef5f0c1460dd35171311115e
2010-10-22 10:49:23 -07:00
Jean-Baptiste Queru
0332f0ac1e
Truly default to the full config.
...
It is much better than generic for emulator-based work.
Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
2010-10-22 10:03:49 -07:00
Nick Pelly
ecabc59361
am b4977f59: am e07a9d4a: Always install libnfc_ndef.
...
Merge commit 'b4977f5980fb4045fc12fbb630823ee8deb814d7'
* commit 'b4977f5980fb4045fc12fbb630823ee8deb814d7':
Always install libnfc_ndef.
2010-10-17 11:17:24 -07:00
Nick Pelly
b4977f5980
am e07a9d4a: Always install libnfc_ndef.
...
Merge commit 'e07a9d4aa4afd27461877fbfd4b132a5c6c34954' into gingerbread-plus-aosp
* commit 'e07a9d4aa4afd27461877fbfd4b132a5c6c34954':
Always install libnfc_ndef.
2010-10-15 18:21:29 -07:00
Nick Pelly
e07a9d4aa4
Always install libnfc_ndef.
...
libnfc_ndef is the (very small) library to implement NDEF message parsing.
Change-Id: Iab39a0904e1be2eb1fb07ef9f5cef5095c8a5b7b
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:16:40 -07:00
Xavier Ducrohet
bf4643e2df
am 1aff79ad: Add SystemUI (notification bar) to SDK build.
...
Merge commit '1aff79ad44bc4fd6aa5ec2d0922afe5a6bcf455d' into gingerbread-plus-aosp
* commit '1aff79ad44bc4fd6aa5ec2d0922afe5a6bcf455d':
Add SystemUI (notification bar) to SDK build.
2010-10-13 22:53:45 -07:00
Xavier Ducrohet
1aff79ad44
Add SystemUI (notification bar) to SDK build.
...
Change-Id: I3f7001bfcf4ce61a523f7b24f61117225362b5a0
2010-10-13 17:26:29 -07:00
Bill Napier
3dfe7f1d89
am 00b31bee: am fcab8402: Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
...
Merge commit '00b31bee97eb739b03eedddf1cd07a86b50259d8'
* commit '00b31bee97eb739b03eedddf1cd07a86b50259d8':
Add in MonkeyRunner target (and dependent libs) to SDK build.
2010-10-12 16:27:42 -07:00
Joe Onorato
439d9a09f9
resolved conflicts for merge of a0eb715a
to master
...
Change-Id: I6341ca672906de3c21800730ac28ba90ecab51ca
2010-10-11 17:12:46 -07:00
Bill Napier
00b31bee97
am fcab8402: Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
...
Merge commit 'fcab84025edd6ff0a7b1f380b75b99297e0b7c31' into gingerbread-plus-aosp
* commit 'fcab84025edd6ff0a7b1f380b75b99297e0b7c31':
Add in MonkeyRunner target (and dependent libs) to SDK build.
2010-10-11 15:30:09 -07:00
Bill Napier
8921ea6982
am 04345cb1: Add in MonkeyRunner target (and dependent libs) to SDK build.
...
Merge commit '04345cb1147f220c67410c16b362223b1e8952f7'
* commit '04345cb1147f220c67410c16b362223b1e8952f7':
Add in MonkeyRunner target (and dependent libs) to SDK build.
2010-10-11 10:21:10 -07:00
Xavier Ducrohet
a0eb715ab0
am 747bc08a: Merge "Add all languages to the SDK image." into gingerbread
...
Merge commit '747bc08a8e78c47395bcc72811bb3e81fb7e557b' into gingerbread-plus-aosp
* commit '747bc08a8e78c47395bcc72811bb3e81fb7e557b':
Add all languages to the SDK image.
2010-10-10 14:37:00 -07:00
Xavier Ducrohet
747bc08a8e
Merge "Add all languages to the SDK image." into gingerbread
2010-10-10 14:31:10 -07:00
Xavier Ducrohet
8d3559ee91
Add all languages to the SDK image.
...
Change-Id: I5d715fdc7f802a55786fff73863bbbc108c780d4
2010-10-10 14:14:49 -07:00
Bill Napier
0e9473acfb
Add in MonkeyRunner target (and dependent libs) to SDK build.
...
Change-Id: I396635324cf9d2e590513228f5de5cea9df4dfd3
2010-10-10 12:06:57 -07:00
Bill Napier
04345cb114
Add in MonkeyRunner target (and dependent libs) to SDK build.
...
Change-Id: I6aa0b1e48dfd0017b3c68fb3b25c02b703ecbd53
2010-10-08 17:37:29 -07:00
Jean-Baptiste Queru
9e0892c350
Cherry-pick 547b902e
...
"am d29f5df3: Merge "Add TTS language files to the full build." into gingerbread"
Change-Id: Iea988350124dacf085244addf34a6f216b58cf77
2010-10-08 07:39:07 -07:00
Jean-Baptiste Queru
be24f6f800
Cheryr-pick of 424de177
...
"resolved conflicts for merge of 0f085e5a
to gingerbread-plus-aosp"
Change-Id: If2932eeb7a6f0420edf52ac343901afd68ce11fa
2010-10-08 07:32:59 -07:00
Jean-Baptiste Queru
547b902e99
am d29f5df3: Merge "Add TTS language files to the full build." into gingerbread
...
Merge commit 'd29f5df3663acb01f88347b67056d969e2d49d15' into gingerbread-plus-aosp
* commit 'd29f5df3663acb01f88347b67056d969e2d49d15':
Add TTS language files to the full build.
2010-10-07 15:48:02 -07:00
Jean-Baptiste Queru
424de1779d
resolved conflicts for merge of 0f085e5a
to gingerbread-plus-aosp
...
Change-Id: If89721a5ee86b9ce27a2235ecd75f3eceec7def7
2010-10-07 15:00:12 -07:00
Jean-Baptiste Queru
0b44f50d5f
Add TTS language files to the full build.
...
Bug: 3065214
Change-Id: I5c324965e693fe26d686b92d869e33facc92c762
2010-10-06 08:05:44 -07:00
Dianne Hackborn
3afdaa8507
am 3367df34: am 2f85f654: Merge "Add location shared library to core build." into gingerbread
...
Merge commit '3367df348cb8b3bd6f6ff834d5cbfebfaf20e444'
* commit '3367df348cb8b3bd6f6ff834d5cbfebfaf20e444':
Add location shared library to core build.
2010-09-28 17:40:09 -07:00
Dianne Hackborn
3367df348c
am 2f85f654: Merge "Add location shared library to core build." into gingerbread
...
Merge commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5' into gingerbread-plus-aosp
* commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5':
Add location shared library to core build.
2010-09-28 17:19:25 -07:00
Dianne Hackborn
588fab8bbc
Add location shared library to core build.
...
Change-Id: I3ea62e2fb29611337044d4c3c10f756fb5d35f43
2010-09-28 14:25:05 -07:00
Jean-Baptiste Queru
05496fff27
resolved conflicts for merge of 9bfa95cf
to master
...
Change-Id: I70cfcd1de8a9d56900f81c174e33e433bae0508d
2010-09-28 07:20:52 -07:00
Jean-Baptiste Queru
9bfa95cfff
am 6bc232a1: Merge "Don\'t reference CarHome and CarHomeLauncher" into gingerbread
...
Merge commit '6bc232a11621740d14f517218d2599a714fb451f' into gingerbread-plus-aosp
* commit '6bc232a11621740d14f517218d2599a714fb451f':
Don't reference CarHome and CarHomeLauncher
2010-09-27 17:28:24 -07:00
Jean-Baptiste Queru
102b8f46a5
Don't reference CarHome and CarHomeLauncher
...
They're not actually part of AOSP
Change-Id: Iacb832173be7faa8ea22f74ca25e1fd68ef1dbdb
2010-09-27 17:04:41 -07:00
Jean-Baptiste Queru
8666dd63c7
Explicitly handle bluetooth files.
...
This also allows to separate smartphone and nonsmartphone variants.
Change-Id: Icbd7c78a866bae32f060607f8a898d59fcd45830
2010-09-27 15:35:33 -07:00
Mathias Agopian
e93e533218
add screencap to PRODUCT_PACKAGES
...
Change-Id: Ibe0a436e80082788dfab9d43a45c99d9a87633aa
2010-09-26 18:52:23 -07:00
Jean-Baptiste Queru
a737b8371d
Explicitly request ip-up-vpn
...
Change-Id: I05c1a3f75e9a2b9040fda3e00f0b659c613968b1
2010-09-26 10:07:09 -07:00
Ying Wang
44f4021041
Add wpa_supplicant.conf to the core.mk
...
Note that wpa_supplicant.conf will only be built only if the wpa_supplicant_conf.mk
is included with some conditionals.
Bug: 3003508
Change-Id: I3d1a705c5ff5fd23a8828d5aa756ab2e4edcf4d2
2010-09-24 11:14:16 -07:00
Jesse Wilson
fed45d859a
am 77070aa7: am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
...
Merge commit '77070aa757806d1617d707db4d2bd7931b2353fc'
* commit '77070aa757806d1617d707db4d2bd7931b2353fc':
Turn dalvikvm host builds on by default when linux is the host OS.
2010-09-22 13:53:41 -07:00
Jesse Wilson
77070aa757
am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
...
Merge commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e' into gingerbread-plus-aosp
* commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e':
Turn dalvikvm host builds on by default when linux is the host OS.
2010-09-22 11:55:29 -07:00
Jesse Wilson
ce7d5023c3
Turn dalvikvm host builds on by default when linux is the host OS.
...
Previously host builds were only enabled under user and user-debug
builds. This will make it easier for Androids to find out if they've
inadvertently broken host compatibility in native code.
Change-Id: Id1f2d5e189c4c1b6462fe03bab1b0f75e98a599c
2010-09-22 11:39:18 -07:00
Ying Wang
03e76ace38
Add a new layer generic_no_telephony.mk
...
Bug: 2994028
Change-Id: I2a1831bb8dd1245c6cc0116738c118fe895b6e43
2010-09-21 16:28:29 -07:00
Steve Howard
a188df5cd7
am 1a297b84: am 1020d271: Add new downloads UI to core build.
...
Merge commit '1a297b84c8e293a7cd7e2e743d4bf5d0068d8fba'
* commit '1a297b84c8e293a7cd7e2e743d4bf5d0068d8fba':
Add new downloads UI to core build.
2010-09-20 11:57:10 -07:00
Steve Howard
1a297b84c8
am 1020d271: Add new downloads UI to core build.
...
Merge commit '1020d271c67b062e95b61c4eb9f1f5168e2b6197' into gingerbread-plus-aosp
* commit '1020d271c67b062e95b61c4eb9f1f5168e2b6197':
Add new downloads UI to core build.
2010-09-20 11:52:57 -07:00
Steve Howard
1020d271c6
Add new downloads UI to core build.
...
Change-Id: I96a3bb10beb6c1ec9c48baa2e2039aab7c421b09
2010-09-20 11:44:54 -07:00
Brian Carlstrom
6821dbad65
Only turn host build on for linux
...
Change-Id: I2d3b16f7881ad82cf272a40213dd4e173f54baa0
2010-09-16 22:49:10 -07:00
Brian Carlstrom
cec75adb64
am c05d0000: Only turn host build on for linux
...
Merge commit 'c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2' into gingerbread-plus-aosp
* commit 'c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2':
Only turn host build on for linux
2010-09-16 22:13:50 -07:00
Brian Carlstrom
c05d0000bb
Only turn host build on for linux
...
Change-Id: I595948b159bc6a2bf295fd11ab831f978e38c799
2010-09-16 21:49:01 -07:00
Jesse Wilson
8caaeddcc0
resolved conflicts for merge of d9de6588
to master
...
Change-Id: I3d7d6744b4f0d7c10bf001c87c0abbb4cb6885ef
2010-09-16 17:57:47 -07:00
Jesse Wilson
d9de658868
am 852f43bd: Include dalvik+libcore dependencies in core product definitions.
...
Merge commit '852f43bd29da34ff15799b88c3db166428cea6d8' into gingerbread-plus-aosp
* commit '852f43bd29da34ff15799b88c3db166428cea6d8':
Include dalvik+libcore dependencies in core product definitions.
2010-09-16 17:48:29 -07:00
Jesse Wilson
852f43bd29
Include dalvik+libcore dependencies in core product definitions.
...
Also conditionally include host-only dependencies when the host is
being built.
Change-Id: I0e8c9c1bef5ee60d4c1ce1c158f41b7642f9a8f2
2010-09-16 15:34:00 -07:00
Jean-Baptiste Queru
1eeec7cb41
am 24ab0f58: am 85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread
...
Merge commit '24ab0f58f45fe27ddb48e279c1e0be8105dc8f96'
* commit '24ab0f58f45fe27ddb48e279c1e0be8105dc8f96':
Allow devices without AndroidBoard.mk
2010-09-15 17:53:46 -07:00
Jean-Baptiste Queru
24ab0f58f4
am 85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread
...
Merge commit '85f351d1f925b265c401f1992b57dc028d462453' into gingerbread-plus-aosp
* commit '85f351d1f925b265c401f1992b57dc028d462453':
Allow devices without AndroidBoard.mk
2010-09-15 12:56:42 -07:00
Jean-Baptiste Queru
3f4e53aa25
Allow devices without AndroidBoard.mk
...
A long time ago, Android.mk in devices had the same semantics
as the current AndroidBoard.mk. This eventually caused problems
(as it didn't allow having a true Android.mk there) so we switched,
and left an error behind in case people were still using the old
semantics (i.e. having an Android.mk but no AndroidBoard.mk).
Fast forward a few years to the present: we're finding that we want
to get rid of AndroidBoard.mk, so there are devices that will have
Android.mk but not AndroidBoard.mk. As this is becoming a legitimate
case, the error for it is removed, and the include for AndroidBoard.mk
is made optional.
Change-Id: Ic683419d4aaab122259715e0112660d2a6359e91
2010-09-15 11:59:33 -07:00
Jean-Baptiste Queru
12722d34c8
Merge "Explicitly manage fonts and ICU data"
2010-09-15 09:53:05 -07:00
Ying Wang
8e052ff521
am f6332cfa: am b125c81c: Refine the comment.
...
Merge commit 'f6332cfaf2b64e0c7436bd80c8b9cb145c0ff5b1'
* commit 'f6332cfaf2b64e0c7436bd80c8b9cb145c0ff5b1':
Refine the comment.
2010-09-15 07:06:36 -07:00
Jean-Baptiste Queru
c9c3fd3043
Explicitly manage fonts and ICU data
...
Change-Id: I2fa61378956ccc230b4268b4cc201e7e9950f111
2010-09-14 14:42:10 -07:00
Jean-Baptiste Queru
30dfc9a6b8
Revert "Explicitly manage fonts and ICU data"
...
This reverts commit b315d46bc8
.
2010-09-14 14:08:00 -07:00
Jean-Baptiste Queru
b315d46bc8
Explicitly manage fonts and ICU data
...
Change-Id: If08edf37f06d9978326202797c52a0cae2f71d3e
2010-09-14 13:01:08 -07:00
Jean-Baptiste Queru
0dfe1884ba
merge dd1d0016
to master
...
Change-Id: Ib83cd76a959fa6209f4920021d3dbf5d61fa6b8e
2010-09-14 09:52:29 -07:00
Ying Wang
f6332cfaf2
am b125c81c: Refine the comment.
...
Merge commit 'b125c81cfcf9aea02c05f292c9eceb4e0bd66c87' into gingerbread-plus-aosp
* commit 'b125c81cfcf9aea02c05f292c9eceb4e0bd66c87':
Refine the comment.
2010-09-14 09:43:03 -07:00
Ying Wang
dd1d00163c
am 69de539a: Add host modules needed by SDK build.
...
Merge commit '69de539a091bc035e0e2d67f2282450a6b4966bd' into gingerbread-plus-aosp
* commit '69de539a091bc035e0e2d67f2282450a6b4966bd':
Add host modules needed by SDK build.
2010-09-14 09:43:01 -07:00
Ying Wang
b125c81cfc
Refine the comment.
...
The host tools include script as well as native binaries.
Change-Id: I8bdd62bf5117ac71e2607d2cb4cd7b08bcbe7b14
2010-09-13 18:33:31 -07:00
Ying Wang
69de539a09
Add host modules needed by SDK build.
...
Since host module tag is defaulted to optional now, we have to explicitly
add those modules to the SDK product config file.
Change-Id: I8f6c4dcb17ef7716ae3590d6e96ddd5d07cc0582
2010-09-13 18:11:11 -07:00
Dmitry Shmidt
738dbba83d
Add "ip" utility to all builds
...
Change-Id: Iad392d127bd7f6ee014710a9c7479e3aaa92e743
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-13 16:54:37 -07:00
Jean-Baptiste Queru
fe648a9f58
manual merge
...
Change-Id: Iafb6e494f28050c960185656d4d630a6c27b6efe
2010-09-01 06:33:19 -07:00
Jean-Baptiste Queru
eba22a05cb
am 85fd5030: Revert "Fixed problem with keymap files copied to target"
...
Merge commit '85fd5030b11d412f345b0ed039aa9912c7973aea' into gingerbread-plus-aosp
* commit '85fd5030b11d412f345b0ed039aa9912c7973aea':
Revert "Fixed problem with keymap files copied to target"
2010-09-01 06:23:50 -07:00
Jean-Baptiste Queru
85fd5030b1
Revert "Fixed problem with keymap files copied to target"
...
This reverts commit c90449f2a8
.
2010-09-01 06:10:40 -07:00
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
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
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
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
Jean-Baptiste Queru
d7312f4f63
am f7a6ead0: Manual merge
...
Merge commit 'f7a6ead075a9b1edc85eeeca646ced42f112f331'
* commit 'f7a6ead075a9b1edc85eeeca646ced42f112f331':
For the generic board, set /system/bin/sh to mksh to test the transition
2010-08-25 10:05:10 -07:00
Jean-Baptiste Queru
f7a6ead075
Manual merge
...
Change-Id: Ie74c9c4931d3a1ec34bbdf4307d98c8e66c9ddd5
2010-08-25 10:01:35 -07:00
Thorsten Glaser
3d00a8c5ff
For the generic board, set /system/bin/sh to mksh to test the transition
...
Change-Id: I778bae4060dd404e82fbf9dd5b8a2024c8268402
2010-08-24 18:08:59 -07:00
Jean-Baptiste Queru
7cf1214093
Use all known locales in full build
...
Also use more audio files
Change-Id: Iab42123239c30012b0d918b5a4b484b5fc878faf
2010-08-10 09:51:47 -07:00
Christian Mehlmauer
5022d63cd2
Replaced AlarmClock with DeskClock
...
Change-Id: I1a9b9ce79b5b16709fe2d89638285633801b6d24
2010-07-23 20:09:54 +02:00
Xavier Ducrohet
2c6d410dac
Add SystemUi to the SDK build.
...
Change-Id: I84eb98c0b3fdaeb9e06c934ea5f4bdcf078cb7f1
2010-07-22 18:31:10 -07:00
The Android Open Source Project
79960bbaf0
am fa2d8ace: merge from open-source master
...
Merge commit 'fa2d8ace56b8f7b150da3b86d00263a9266e9208'
* commit 'fa2d8ace56b8f7b150da3b86d00263a9266e9208':
Add full_x86 product.
2010-07-16 13:06:24 -07:00
The Android Open Source Project
fa2d8ace56
merge from open-source master
...
Change-Id: Ib0c0f02bb8fc87c3221fd9d2387a46b579a8ce40
2010-07-16 13:03:44 -07:00
Jean-Baptiste Queru
6c2df3e98b
Add full_x86 product.
...
By inheriting from full, this will be more self-maintaining, and
automatically gets a better-configured variant (e.g. it has locales,
a date format, etc...).
Change-Id: I67b6c2d9f9b7d20cb89154906c3f3d6a5391c838
2010-07-15 14:04:39 -07:00
The Android Open Source Project
dd0af2517c
am 1778b4b1: merge from open-source master
...
Merge commit '1778b4b11effa15b3b540a5153f68127a9ec6adb'
* commit '1778b4b11effa15b3b540a5153f68127a9ec6adb':
Move buildspec vars to BoardConfig.mk
2010-07-12 15:22:50 -07:00
The Android Open Source Project
1778b4b11e
merge from open-source master
...
Change-Id: I333595755ed96c753b3f01ef6715a230eee94e0d
2010-07-12 15:01:01 -07:00
The Android Open Source Project
fee7fe7c74
am c9d11861: merge from open-source master
...
Merge commit 'c9d118615161d8b94d4abedac86e3bdf510b251b'
* commit 'c9d118615161d8b94d4abedac86e3bdf510b251b':
Allow TARGET_ARCH to be set from BoardConfig.mk
2010-07-12 14:46:34 -07:00
The Android Open Source Project
c9d1186151
merge from open-source master
...
Change-Id: Iad583004b67ce1ef0651e81b57c2c95632da9845
2010-07-12 14:43:29 -07:00
Bruce Beare
cce6f923aa
Move buildspec vars to BoardConfig.mk
...
Change-Id: I48ed4b55e91aae51076d9c609b44bf9fa24c3ecd
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 11:32:37 -07:00
Bruce Beare
b73dc6690b
Allow TARGET_ARCH to be set from BoardConfig.mk
...
Change-Id: I66aed78b763d238719822257c1f4f35301247df6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 09:42:10 -07:00
The Android Open Source Project
62e010989f
am e9dc6ca1: merge from open-source master
...
Merge commit 'e9dc6ca1c0553a4cd4e4f36e376b0a533059af1f'
* commit 'e9dc6ca1c0553a4cd4e4f36e376b0a533059af1f':
Update to latest (froyo) init.rc
2010-07-09 14:36:59 -07:00
The Android Open Source Project
e9dc6ca1c0
merge from open-source master
...
Change-Id: I04fcaf990b9d0db7235ef34c3be717437bf96e19
2010-07-09 14:34:52 -07:00
Bruce Beare
df49c50c52
Update to latest (froyo) init.rc
...
Change-Id: Ibbf5427261dbb84cdc28c6de931e65c8cac547a6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-08 12:12:29 -07:00
James Dong
e63763087d
am 6f2bb44b: am c1ab82ae: Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread
...
Merge commit '6f2bb44b4b3551738c429a25f99e42aca8913f4f'
* commit '6f2bb44b4b3551738c429a25f99e42aca8913f4f':
Use stagefright (instead of OpenCore) authoring engine by default
2010-06-24 11:59:12 -07:00
James Dong
6f2bb44b4b
am c1ab82ae: Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread
...
Merge commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b' into gingerbread-plus-aosp
* commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b':
Use stagefright (instead of OpenCore) authoring engine by default
2010-06-24 11:57:25 -07:00
James Dong
d891654b0c
Use stagefright (instead of OpenCore) authoring engine by default
...
-rebased
Change-Id: Ic184789eb4fb99b0e7cd5883bbe1267f903bc834
2010-06-24 09:53:35 -07:00