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
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