Raphael Moll
9024690d41
am 0861af4a: am 9791e6ea: am 7e58a5fa: Merge "Merge 960ad4e095
from master_open." into honeycomb
...
* commit '0861af4ab577d62896d74638549c3c944ab0a192':
Merge 960ad4e095
from master_open.
2011-03-24 10:32:09 -07:00
Raphael Moll
0861af4ab5
am 9791e6ea: am 7e58a5fa: Merge "Merge 960ad4e095
from master_open." into honeycomb
...
* commit '9791e6ea170a6c6a2fc042a24d50af06c7238d83':
Merge 960ad4e095
from master_open.
2011-03-24 10:22:53 -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
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
David Turner
86ed1dbaa7
am 75724826: Merge "sdk: Add pc-bios files for IA qemu emulator"
...
* commit '757248269bfbe2390a2d04e1d69fb5a0742f3025':
sdk: Add pc-bios files for IA qemu emulator
2011-03-21 18:09:49 -07:00
David Turner
757248269b
Merge "sdk: Add pc-bios files for IA qemu emulator"
2011-03-21 15:23:17 -07:00
Jesse Wilson
2ad721bcc7
Add a 'dalvik' shell script.
...
Change-Id: I141607d8b021a4b27c059d32391cc96f554c5ac7
http://b/4128077
2011-03-17 16:57:14 -07:00
Iliyan Malchev
0cafe839e0
build: pass --strip-all, not --strip-debug to strip
...
Option --strip-all will remove the static symbol section in addition to debug
symbols. We do not need the static symbol table in libraries installed on the
target.
Change-Id: I7a52d22f5b45aa727f31bfd9af796b289528caef
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-17 10:09:59 -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
4361552b21
Merge "Fix bug 4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs" into honeycomb-mr1
2011-03-16 20:34:31 -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
Doug Zongker
d37720cdf6
am 095dbffd: am 5d4808db: put extra recovery keys in the product definition
...
* commit '095dbffd605eb1bb602b028000aab4494288c6f6':
put extra recovery keys in the product definition
2011-03-16 12:35:26 -07:00
Doug Zongker
095dbffd60
am 5d4808db: put extra recovery keys in the product definition
...
* commit '5d4808db1630048f6eb0610b75af01c9fc877412':
put extra recovery keys in the product definition
2011-03-16 11:17:24 -07:00
Doug Zongker
5d4808db16
put extra recovery keys in the product definition
...
Change-Id: I71637cd578b24891c10171aa59406848649be703
2011-03-16 07:52:25 -07:00
Ying Wang
3b07a2ac82
am 3c6a62a3: am eb68729b: am 080ed92e: Merge "Close inherited PIPE before doing work" into gingerbread
...
* commit '3c6a62a329fd818a4d57250811686a740690d798':
Close inherited PIPE before doing work
2011-03-15 18:36:13 -07:00
Ying Wang
3c6a62a329
am eb68729b: am 080ed92e: Merge "Close inherited PIPE before doing work" into gingerbread
...
* commit 'eb68729bf3e4080119fb06ffce6a79a9fcee1f32':
Close inherited PIPE before doing work
2011-03-15 18:30:29 -07:00
Ying Wang
eb68729bf3
am 080ed92e: Merge "Close inherited PIPE before doing work" into gingerbread
...
* commit '080ed92e77fc7c24ca3bac1a1dc06057390bfdb8':
Close inherited PIPE before doing work
2011-03-15 18:21:20 -07:00
Ying Wang
080ed92e77
Merge "Close inherited PIPE before doing work" into gingerbread
2011-03-15 17:49:05 -07:00
Joe Onorato
192c90b445
Merge "Make jgrep, mgrep, etc not recurse into .repo and .git directories."
2011-03-15 14:21:25 -07:00
Joe Onorato
f50e84bed9
Make jgrep, mgrep, etc not recurse into .repo and .git directories.
...
Change-Id: I6683146311b09f58154601f4a4eec6d26fb90450
2011-03-15 14:15:46 -07:00
Xavier Ducrohet
5551535ffa
am 3509469b: am 4216a8c9: Add the host notice file to the SDK platform-tools folder.
...
* commit '3509469b43976cddf2ec4fc8a1020722dc214caf':
Add the host notice file to the SDK platform-tools folder.
2011-03-15 13:53:08 -07:00
Xavier Ducrohet
3509469b43
am 4216a8c9: Add the host notice file to the SDK platform-tools folder.
...
* commit '4216a8c94e320b7025acd6bf99bac4f9ae45c5c7':
Add the host notice file to the SDK platform-tools folder.
2011-03-15 13:50:56 -07:00
Ying Wang
d18769c4c5
Merge "Move screen density config from PRODUCT_LOCALES to PRODUCT_AAPT_CONFIG"
2011-03-15 13:40:02 -07:00
Xavier Ducrohet
4216a8c94e
Add the host notice file to the SDK platform-tools folder.
...
Change-Id: Id9e789fed635c6e5b43254f8ef6ec353302ca1be
2011-03-15 13:28:40 -07:00
Ying Wang
4f1ab92aac
Move screen density config from PRODUCT_LOCALES to PRODUCT_AAPT_CONFIG
...
With this change, PRODUCT_LOCALES will contain only locales.
Other aapt config flags, such as *dpi, small/normal/large/xlarge,
should go to PRODUCT_AAPT_CONFIGS.
Bug: 4086309
Change-Id: I922f153d79777a9522c542a3907111193b40e7b7
2011-03-15 13:19:30 -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
David 'Digit' Turner
8c675d2293
am 16e7050c: am e9b1d0ee: am f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"
...
* commit '16e7050cbaa292c0f36275cdb4c56f357cbfa79a':
Allow win_sdk build with USE_CCACHE=1
2011-03-15 04:13:24 -07:00
David 'Digit' Turner
16e7050cba
am e9b1d0ee: am f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"
...
* commit 'e9b1d0eee715895f156c8e2601d5b1996919da6d':
Allow win_sdk build with USE_CCACHE=1
2011-03-15 04:09:34 -07:00
David 'Digit' Turner
e9b1d0eee7
am f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"
...
* commit 'f8f95fc8b1a1eb19812fc55b230da3bfbe5272e5':
Allow win_sdk build with USE_CCACHE=1
2011-03-15 03:59:52 -07:00
David 'Digit' Turner
f8f95fc8b1
Merge "Allow win_sdk build with USE_CCACHE=1"
2011-03-15 03:31:19 -07:00
David 'Digit' Turner
55aad08663
Allow win_sdk build with USE_CCACHE=1
...
This patch allows the Window sdk build (lunch sdk-eng; make win_sdk)
to work properly when USE_CCACHE is defined in the environment.
There is no Windows ccache prebuilt, but since we're cross-compiling
from Linux, detect it and use the linux prebuilt binary instead.
Note: Depends on https://review.source.android.com//#change,21755
for a complete solution to the problem.
Change-Id: I0b1b59efae86ee7114225258c9ecf9f257913347
2011-03-15 01:01:32 +01:00
Ying Wang
374b3256d2
Make a copy of symbol files after prelinking is removed.
...
Change-Id: I1628b54fc747154d48f213c634b081e43eb41696
2011-03-14 11:44:57 -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
Raphael Moll
0469678719
am 2cfffcb6: am 8755e2b2: am e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
...
* commit '2cfffcb606b5f1310a0678a16367af48f564bab9':
Fix find-jdk-tools-jar to be cygwin-friendly.
2011-03-11 16:08:34 -08:00
Raphael Moll
2cfffcb606
am 8755e2b2: am e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
...
* commit '8755e2b2c21dd54063fcb62c26c4a2d3575610cf':
Fix find-jdk-tools-jar to be cygwin-friendly.
2011-03-11 16:05:53 -08:00
Raphael Moll
8755e2b2c2
am e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
...
* commit 'e84739e942d19955248e1fc1ce966d56543eaf0e':
Fix find-jdk-tools-jar to be cygwin-friendly.
2011-03-10 12:46:12 -08:00
Raphael Moll
e84739e942
Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
2011-03-10 12:29:20 -08:00
Dianne Hackborn
66e76e7aad
am 8046557f: am 59daa2bc: It\'s a new version!
...
* commit '8046557f94a651373bd471780fd845c73a044017':
It's a new version!
2011-03-09 18:34:04 -08:00
Dianne Hackborn
8046557f94
am 59daa2bc: It\'s a new version!
...
* commit '59daa2bc61ff0992f792a50dd413dcedd6359cf4':
It's a new version!
2011-03-09 18:31:37 -08:00
Dianne Hackborn
59daa2bc61
It's a new version!
...
Change-Id: Ic0740e3250ad7805188f919cdb0cc63b6aa17423
2011-03-09 18:20:40 -08:00
Ying Wang
eb6e294feb
am f8a7ff19: resolved conflicts for merge of 123995f9
to honeycomb-plus-aosp
...
* commit 'f8a7ff191af760ee01e5c31f154f0dbc7abfef7e':
Dist build.prop in sdk builds.
2011-03-09 17:05:10 -08:00
Ying Wang
f8a7ff191a
resolved conflicts for merge of 123995f9
to honeycomb-plus-aosp
...
Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf
2011-03-09 17:02:35 -08:00