Ying Wang
7c7a8f023a
Merge "Sort the results of findleaves again."
2011-08-19 09:24:44 -07:00
Ishida, Haruyasu
58e52b434b
Sort the results of findleaves again.
...
Commit d36e945
changed findleaves.py to sort the output files so that
the order is deterministic and won't cause spurious build errors when
files happen to be listed (and hence read) in different order on
e.g. add/remove the makefiles.
This correction broke after commit 4820a94
because the conversion to
a set with set() in order to remove duplicates came after sort() and
potentially altered the order of the elements.
This commit fixes makes sure findleaves.py is guaranteed to return
a sorted filename list without duplicates.
Change-Id: Ifd96d04d45641fe43d4cc4739f78a2d4d25cc212
2011-08-19 08:14:53 +02:00
Raphael Moll
7d9fe51747
Merge "Add sdk/rule_api to the Windows build paths."
2011-08-17 11:06:39 -07:00
Raphael Moll
408c7f8a8f
Add sdk/rule_api to the Windows build paths.
...
Change-Id: I4976b50d829e4b26b4f9935a1a184937dd115198
2011-08-16 19:40:03 -07:00
Ying Wang
3f5326fd9f
Merge "sha module is deprecated"
2011-08-10 17:50:05 -07:00
david
cad0bb9f62
sha module is deprecated
...
This patch removes the deprecated warnings from the python
scripts.
Change-Id: I052a0aab3fb28dd1d78de1307edafda6b6c35e5f
2011-08-10 17:48:04 -07:00
Raphael Moll
dceb46559e
Merge "Add sdk/assetstudio to the Windows build paths."
2011-07-29 13:50:51 -07:00
Raphael Moll
667ec86a33
Add sdk/assetstudio to the Windows build paths.
...
Change-Id: Ide8d418aa25cf39852a25e08fd2a27c7882586e7
2011-07-29 13:04:53 -07:00
Kenny Root
4880b43665
am 62a2b188
: Merge "Avoid complaining about empty directories"
...
* commit '62a2b1882fb95e960b5889b46fe8f669ddc7c8ac':
Avoid complaining about empty directories
2011-07-18 13:45:15 -07:00
Kenny Root
62a2b1882f
Merge "Avoid complaining about empty directories"
2011-07-18 13:41:25 -07:00
Kenny Root
7546d613af
Avoid complaining about empty directories
...
Change-Id: If46bffd1c4e6b94f2e476b2d7d506ef337bbf8e1
2011-07-18 13:12:31 -07:00
Kenny Root
099aa4cf4d
am b8a1c89b
: Merge "Only include "[a-z]*.bash" files for completion"
...
* commit 'b8a1c89b3a848ea343c897b33e77455dc2f98119':
Only include "[a-z]*.bash" files for completion
2011-07-18 11:54:15 -07:00
Kenny Root
b8a1c89b3a
Merge "Only include "[a-z]*.bash" files for completion"
2011-07-18 11:44:26 -07:00
Kenny Root
85cb556e2e
Only include "[a-z]*.bash" files for completion
...
Some people were using case-insensitive filesystems which broke when
including simply [a-z]* since it matched the uppercase files. Use this
to filter only the actual bash scripts.
Change-Id: Ibfdcf2c091a154f0485545537a044667783a19f7
2011-07-18 11:15:31 -07:00
Kenny Root
8985d03378
am 88dcfccb
: Merge "Add bash completion to envsetup"
...
* commit '88dcfccb5b064735177e1a87f578d6c734b47bc7':
Add bash completion to envsetup
2011-07-15 14:50:05 -07:00
Kenny Root
88dcfccb5b
Merge "Add bash completion to envsetup"
2011-07-15 14:41:14 -07:00
Kenny Root
52aa81cab9
Add bash completion to envsetup
...
Change-Id: I0b4d74e72deede42d7e5f229593d79417f16bb55
2011-07-15 11:22:31 -07:00
Jaikumar Ganesh
eb0a62cb26
am b399f5e8
: Merge "Rename health shared library."
...
* commit 'b399f5e81e2a644776f163e499df5bd0a38fe272':
Rename health shared library.
2011-07-08 11:34:46 -07:00
Jaikumar Ganesh
b399f5e81e
Merge "Rename health shared library."
2011-07-08 11:25:33 -07:00
Jaikumar Ganesh
19efd6f11f
Rename health shared library.
...
Change-Id: Ibd95333433bc2fb12322a9683bb3e0c0176dbce9
2011-07-08 11:20:49 -07:00
David 'Digit' Turner
6236d356a0
am b92c7a2c
: am cac8e557
: Merge "sdk: provide ABI-dependent atree files"
...
* commit 'b92c7a2c1293d2921739a4d7210b4a0d1c99156b':
sdk: provide ABI-dependent atree files
2011-06-23 13:08:35 -07:00
David 'Digit' Turner
b92c7a2c12
am cac8e557
: Merge "sdk: provide ABI-dependent atree files"
...
* commit 'cac8e55714424d385da5b40e5952dc539e510454':
sdk: provide ABI-dependent atree files
2011-06-23 12:54:41 -07:00
David 'Digit' Turner
cac8e55714
Merge "sdk: provide ABI-dependent atree files"
2011-06-23 12:18:49 -07:00
David 'Digit' Turner
1844701942
am 4b227c70
: am f9f83ed1
: Merge "emulator: Enable dex-preoptimization"
...
* commit '4b227c708c1014bd773085ae275275744f239435':
emulator: Enable dex-preoptimization
2011-06-23 05:07:30 -07:00
David 'Digit' Turner
4b227c708c
am f9f83ed1
: Merge "emulator: Enable dex-preoptimization"
...
* commit 'f9f83ed19e83313ffaf542b148886bcb860ca12e':
emulator: Enable dex-preoptimization
2011-06-23 04:49:56 -07:00
David 'Digit' Turner
f9f83ed19e
Merge "emulator: Enable dex-preoptimization"
2011-06-23 04:24:50 -07:00
David 'Digit' Turner
77ec16ae9e
sdk: provide ABI-dependent atree files
...
This patch allows development/sdk/ to provide ABI-specific .atree
files. This is useful to copy prebuilt CPU model-specific files
to the SDK platform image directory.
This is needed to deal with the fact that for ARMv7 platform builds,
the kernel image to use is prebuilt/android-arm/kernel-qemu-armv7 instead
of prebuilt/android-arm/kernel/qemu
Change-Id: Icdca751852c01421fccf196436a9bc1114ea90f7
2011-06-23 12:49:02 +02:00
David 'Digit' Turner
fa112f9822
am c134712f
: am 04b49109
: Merge "Turn-off implicit GNU Make RC/SCCS rules"
...
* commit 'c134712ffa9e6617df46334a6293ddd80e05cf98':
Turn-off implicit GNU Make RC/SCCS rules
2011-06-22 15:53:31 -07:00
David 'Digit' Turner
c134712ffa
am 04b49109
: Merge "Turn-off implicit GNU Make RC/SCCS rules"
...
* commit '04b49109710f74c59fb65b09b2028e5de7901f67':
Turn-off implicit GNU Make RC/SCCS rules
2011-06-22 15:28:56 -07:00
David 'Digit' Turner
04b4910971
Merge "Turn-off implicit GNU Make RC/SCCS rules"
2011-06-22 14:40:52 -07:00
David 'Digit' Turner
456d16cb89
emulator: Enable dex-preoptimization
...
This enables the Dex pre-optimization for emulator-specific builds.
The idea is to speed up the initial boot sequence of an SDK AVD by
avoiding the costly on-device preopt pass that is performed otherwise
the first time the AVD is launched.
Benchmarking shows reductions in first boot time from 1m30s to 40s
on a 2.4GHz Xeon when emulating the AOSP master ToT.
Change-Id: I67a9ce9791220c202817864c6e83dc8fd9cbc027
2011-06-22 23:23:46 +02:00
David 'Digit' Turner
52d697d432
Turn-off implicit GNU Make RC/SCCS rules
...
This small patch prevents GNU Make from stating RCS and SCCS
specific files on the filesystem. This makes the output of
"make -d" slightly more readable, and also reduces the no-change
time on AOSP master by a bit less than a second on average.
Change-Id: Ifa50ace32e8689717956d7247b0d6f53ef72b7a1
2011-06-22 23:18:57 +02:00
Raphael Moll
8508a07352
am 6e65ddb2
: am cb84196f
: Merge "Lunch: don\'t use a toolchain that doesn\'t exist."
...
* commit '6e65ddb20aa82522b3fdc72c87d365f22e9a43ed':
Lunch: don't use a toolchain that doesn't exist.
2011-06-22 10:40:08 -07:00
Raphael Moll
d660540563
am 7f5a314a
: am 169c19cc
: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
...
* commit '7f5a314ab6dacb72eb37c87e064b21dbd44ccc7b':
Envsetup: Cygwin doesn't have 'ps -o command'.
2011-06-22 10:40:01 -07:00
Raphael Moll
6e65ddb20a
am cb84196f
: Merge "Lunch: don\'t use a toolchain that doesn\'t exist."
...
* commit 'cb84196f3ae966b2a4a0d16f0cc314a855b6dad6':
Lunch: don't use a toolchain that doesn't exist.
2011-06-22 10:35:22 -07:00
Raphael Moll
7f5a314ab6
am 169c19cc
: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
...
* commit '169c19ccb566d72a8ea142afb2550f9c54c5fea9':
Envsetup: Cygwin doesn't have 'ps -o command'.
2011-06-22 10:35:20 -07:00
Raphael Moll
cb84196f3a
Merge "Lunch: don't use a toolchain that doesn't exist."
2011-06-22 10:18:20 -07:00
Raphael Moll
169c19ccb5
Merge "Envsetup: Cygwin doesn't have 'ps -o command'."
2011-06-22 10:17:02 -07:00
Raphael Moll
c639c787a0
Lunch: don't use a toolchain that doesn't exist.
...
"lunch sdk-eng" on cygwin tries to use a gcc.exe from the
prebuild arm toolchain, but it doesn't exist. This prevents
from setting variables to point on a gcc toolchain if there
is none for the given arch.
Change-Id: I3b72220663687f9fdaacc050899aef00632f2c3c
2011-06-21 06:11:05 -07:00
Raphael Moll
70a86b0fb7
Envsetup: Cygwin doesn't have 'ps -o command'.
...
Running build/envsetup.sh on cygwin always shows a
warning since there is no 'ps -o command' option.
Bash already sets SHELL=/bin/bash so we can rely on that if present.
Change-Id: I145b42508985735ba61d2b53b216ecc56e321943
2011-06-20 16:03:14 -07:00
David 'Digit' Turner
4f9479bfdb
am 683e8e17
: am 04b963a1
: Merge "emulator: Build emulator platform images as ARMv7-A"
...
* commit '683e8e17f7c20b54da74c05b3a044f46d4b3bddf':
emulator: Build emulator platform images as ARMv7-A
2011-06-20 09:04:39 -07:00
David 'Digit' Turner
683e8e17f7
am 04b963a1
: Merge "emulator: Build emulator platform images as ARMv7-A"
...
* commit '04b963a1c037a7e9e8b5fb46603e009965293d9d':
emulator: Build emulator platform images as ARMv7-A
2011-06-20 08:47:29 -07:00
David 'Digit' Turner
04b963a1c0
Merge "emulator: Build emulator platform images as ARMv7-A"
2011-06-20 06:56:36 -07:00
Jean-Baptiste Queru
cc7dccc815
am 91ba5de8
: am 1894085d
: Merge "Tweak prelink map even more"
...
* commit '91ba5de815d7bec3b7e72ddf2c5b063f42b7211b':
Tweak prelink map even more
2011-06-17 14:12:30 -07:00
Jean-Baptiste Queru
91ba5de815
am 1894085d
: Merge "Tweak prelink map even more"
...
* commit '1894085d6e765878a928d901d1c91b16f9616d96':
Tweak prelink map even more
2011-06-17 14:08:22 -07:00
Jean-Baptiste Queru
1894085d6e
Merge "Tweak prelink map even more"
2011-06-17 13:50:05 -07:00
Jean-Baptiste Queru
7751f426fe
Tweak prelink map even more
...
Change-Id: I83149194f8c4e0193274f9c74d9718cecba82cb0
2011-06-17 13:20:32 -07:00
Jean-Baptiste Queru
ea54b50e56
am f3659c8b
: am 36c1f10d
: Merge "Relax the constraint of 64bit build environment."
...
* commit 'f3659c8b0a1cf60d5bcd28d8a1c0e39716f4060f':
Relax the constraint of 64bit build environment.
2011-06-17 12:23:21 -07:00
Jean-Baptiste Queru
af1b618c0d
am c5e5d989
: am 9d7590b9
: Merge "Tweak prelink map"
...
* commit 'c5e5d9897f6fc18123a8f5d15a90152019979a22':
Tweak prelink map
2011-06-17 12:21:37 -07:00
Jean-Baptiste Queru
f3659c8b0a
am 36c1f10d
: Merge "Relax the constraint of 64bit build environment."
...
* commit '36c1f10dee646935d73106a01b1d50628b9a2dcb':
Relax the constraint of 64bit build environment.
2011-06-17 12:02:44 -07:00