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
2e8283d9bc
x86: the -mbionic flag is needed for IA builds.
...
Change-Id: I00c75f37d7ea46b9f8ad3d7b2ff7094477ff0916
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-03-15 07:47:49 -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
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
Chih-Wei Huang
e73c4bbc50
Use my-dir in a consistent way as others
...
Change-Id: I3fd0cc58b48d621b431d7dd05fb689c1917b530d
2011-03-11 11:48:48 +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
Ying Wang
123995f9e1
am be188caf
: Dist build.prop in sdk builds.
...
* commit 'be188cafd21c7356cc33ae042661b682d0536e8b':
Dist build.prop in sdk builds.
2011-03-09 16:47:27 -08:00
Ed Heyl
51b8edb517
am 122b3d19
: (-s ours) am f50b9c4c
: resolved conflicts for merge of 24297cab
to gingerbread-plus-aosp
...
* commit '122b3d196beee18363309fef803389f5b8db7f40':
version bump for new release (please don't merge)
2011-03-08 18:40:22 -08:00
Raphael Moll
4de32c69c7
Fix find-jdk-tools-jar to be cygwin-friendly.
...
Change-Id: I9cf2035026725fd1ba8a014b484262ed1acc1df4
2011-03-08 14:29:25 -08:00
Ed Heyl
122b3d196b
am f50b9c4c
: resolved conflicts for merge of 24297cab
to gingerbread-plus-aosp
...
* commit 'f50b9c4c85d2e6481f20c76cd14d8ac9f5f776f1':
version bump for new release (please don't merge)
2011-03-08 14:28:26 -08:00
Ed Heyl
f50b9c4c85
resolved conflicts for merge of 24297cab
to gingerbread-plus-aosp
...
Change-Id: Ia10a4601b7156f6379d1663d811af45103ff81ff
2011-03-08 14:12:25 -08:00
Ying Wang
be188cafd2
Dist build.prop in sdk builds.
...
Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d
2011-03-08 14:05:51 -08:00
Ed Heyl
24297cabf4
Merge "version bump for new release (please don't merge)" into gingerbread
2011-03-08 12:35:20 -08:00
Ed Heyl
3c83a5aeb9
version bump for new release (please don't merge)
...
Change-Id: I94081a1288da434811a1ddaa8a7b7b5da13d9341
2011-03-07 18:08:24 -08:00
David Turner
1c908fa188
am b9c627c6
: am 0683a773
: Merge "x86: Use GCC 4.4.3"
...
* commit 'b9c627c6a0c6f0af57d0912175bfc739b0eb6249':
x86: Use GCC 4.4.3
2011-03-07 13:45:59 -08:00
David Turner
b9c627c6a0
am 0683a773
: Merge "x86: Use GCC 4.4.3"
...
* commit '0683a77348f2a0a529a8e2bcfdf4b6dc6b4c5f5b':
x86: Use GCC 4.4.3
2011-03-07 13:35:02 -08:00
Ying Wang
64a8eb1118
am 58222219
: am 9238d44c
: Only copy once even if the first matched src:dest pair appears more than once.
...
* commit '582222190f8168bdedf6cfeb986f7e4201f6540a':
Only copy once even if the first matched src:dest pair appears more than once.
2011-03-07 11:10:07 -08:00
Ying Wang
70d6ec5f9b
resolved conflicts for merge of 0a1f3236
to honeycomb-plus-aosp
...
Change-Id: I6596f4a65a99eed98bdca2d8a6840bc378297b6d
2011-03-07 11:07:12 -08:00
Scott Main
71704a690d
am 73b09799
: am e8f40264
: Merge "docs: update android market icon" into honeycomb
...
* commit '73b0979941a87f5b0bb079b3960038df5db214cb':
docs: update android market icon
2011-03-07 10:55:01 -08:00
Scott Main
73b0979941
am e8f40264
: Merge "docs: update android market icon" into honeycomb
...
* commit 'e8f402640b278b234594fd68dc5bab4ac94a334e':
docs: update android market icon
2011-03-07 10:51:43 -08:00
Scott Main
e8f402640b
Merge "docs: update android market icon" into honeycomb
2011-03-07 10:44:54 -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
Scott Main
54056ffc52
am 2e426cf0
: am 3ab162e7
: docs: script update to account for double-nested list items when scrolling sidenav into view
...
* commit '2e426cf07ce61c00acdb477c6c049b0c1f92f082':
docs: script update to account for double-nested list items when scrolling sidenav into view
2011-03-05 09:27:30 -08:00
Scott Main
2e426cf07c
am 3ab162e7
: docs: script update to account for double-nested list items when scrolling sidenav into view
...
* commit '3ab162e71cbe88ec4d2207c39b9f3d2d7f4c965c':
docs: script update to account for double-nested list items when scrolling sidenav into view
2011-03-05 09:24:41 -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
Ying Wang
582222190f
am 9238d44c
: Only copy once even if the first matched src:dest pair appears more than once.
...
* commit '9238d44c92b355bac6b7a13b23f298336338bf3d':
Only copy once even if the first matched src:dest pair appears more than once.
2011-03-04 17:13:08 -08:00
Ying Wang
0a1f3236e3
am a73b6561
: Drop support for target files with no recovery.fstab.
...
* commit 'a73b6561cee39ad416f4af327dbe72ec565d2423':
Drop support for target files with no recovery.fstab.
2011-03-04 17:13:04 -08:00
David Turner
0683a77348
Merge "x86: Use GCC 4.4.3"
2011-03-04 16:39:26 -08:00
Ying Wang
9238d44c92
Only copy once even if the first matched src:dest pair appears more than once.
...
Change-Id: I476923007dac1174371d6e6526d72182eb6c7243
2011-03-04 15:10:15 -08:00