Ben Cheng
c760ecbd22
am 9cbf732f
: am 98bb9d6c
: am d957d6bb
: Merge "Use aarch64-linux-android-4.9 for arm64 build."
...
* commit '9cbf732fa345a1ef8d540b8934a59502d7fdd627':
Use aarch64-linux-android-4.9 for arm64 build.
2014-04-10 16:43:08 +00:00
Ben Cheng
9cbf732fa3
am 98bb9d6c
: am d957d6bb
: Merge "Use aarch64-linux-android-4.9 for arm64 build."
...
* commit '98bb9d6cbe081ecf1ddbfad8d00f498a506e1bf2':
Use aarch64-linux-android-4.9 for arm64 build.
2014-04-10 16:39:02 +00:00
Ben Cheng
98bb9d6cbe
am d957d6bb
: Merge "Use aarch64-linux-android-4.9 for arm64 build."
...
* commit 'd957d6bbdb29fccae74f3511251cae22376550af':
Use aarch64-linux-android-4.9 for arm64 build.
2014-04-10 16:36:06 +00:00
Ben Cheng
d957d6bbdb
Merge "Use aarch64-linux-android-4.9 for arm64 build."
2014-04-10 16:33:51 +00:00
Ben Cheng
6154690d86
Use aarch64-linux-android-4.9 for arm64 build.
...
Change-Id: I63e1b54947326fb5da07af7691d4729bcbf99ac1
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7
2014-04-09 15:58:08 -07:00
Jeff Sharkey
26e1a28e7f
Pass OEM property list to OTA tools, thumbprint.
...
The OTA generation scripts need to know what system properties to
read from the OEM partition, so pass along from product definition.
Also define "thumbprint" which is only the build-specific parts of
the fingerprint. (Thumbs are smaller than fingers.)
Bug: 13367676
Change-Id: Iae051dcd2b1c67a7c8554d8ae318a4c54a86d614
2014-04-09 15:00:36 -07:00
Ying Wang
9ef2bee21a
am 09ba20ce
: am fd251b33
: am 1a4676a1
: Merge "Increase the maximum javac heap size again."
...
* commit '09ba20ce647472ca6f5692bcf6eb5477fc3a818d':
Increase the maximum javac heap size again.
2014-04-09 21:37:16 +00:00
Ying Wang
09ba20ce64
am fd251b33
: am 1a4676a1
: Merge "Increase the maximum javac heap size again."
...
* commit 'fd251b33abd2de9c288d56993978dc36976198a7':
Increase the maximum javac heap size again.
2014-04-09 21:34:12 +00:00
Ying Wang
fd251b33ab
am 1a4676a1
: Merge "Increase the maximum javac heap size again."
...
* commit '1a4676a17c5483c04f347a4e58890640a71c8368':
Increase the maximum javac heap size again.
2014-04-09 21:32:16 +00:00
Ying Wang
1a4676a17c
Merge "Increase the maximum javac heap size again."
2014-04-09 21:29:19 +00:00
Ying Wang
d81d71a020
Increase the maximum javac heap size again.
...
Change-Id: Ic3422650ea22977f3dcfd74505cb287ff6543c2d
2014-04-09 14:27:29 -07:00
Narayan Kamath
ed1c119375
am 6c0fba0f
: am ae44bb55
: am 94147a91
: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
...
* commit '6c0fba0f989ce9755a4f4303149355dd0d4ea60d':
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
2014-04-09 16:19:44 +00:00
Narayan Kamath
6c0fba0f98
am ae44bb55
: am 94147a91
: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
...
* commit 'ae44bb55bd39ba66ad3882c7e63bf188600ffe14':
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
2014-04-09 16:14:38 +00:00
Narayan Kamath
ae44bb55bd
am 94147a91
: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
...
* commit '94147a919b1148d8a128a99b33f3c938d87452c7':
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
2014-04-09 16:11:01 +00:00
Narayan Kamath
94147a919b
Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
2014-04-09 16:08:31 +00:00
Narayan Kamath
e6243e176b
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
...
We no longer provide this function in bionic. All callers
should be moved over to pthread_condattr_setclock().
Change-Id: Iccd3384b40de423f7d5f9521b6d8073bf8bdea42
2014-04-09 16:08:09 +00:00
Jeff Sharkey
491055df99
Merge "Import OEM build properties, if defined."
2014-04-09 15:44:06 +00:00
Jon Boekenoogen
13a3424450
am 0f2e5657
: am 9ccadc82
: am a8245d1d
: Merge "ggrep" into klp-ub-dev
...
* commit '0f2e5657d4818806a6ffc6be4069d9978b22f1e2':
ggrep
2014-04-09 14:10:06 +00:00
Jon Boekenoogen
0f2e5657d4
am 9ccadc82
: am a8245d1d
: Merge "ggrep" into klp-ub-dev
...
* commit '9ccadc8246c6c805265046ce02cb5e42c9cc2ee9':
ggrep
2014-04-09 14:03:35 +00:00
Narayan Kamath
110ea46e09
resolved conflicts for merge of 8af7e8ed
to master
...
Change-Id: Ib427b36e133e29d1c2e9cea065e4e63c1e2e2122
2014-04-09 12:33:03 +01:00
Jon Boekenoogen
9ccadc8246
am a8245d1d
: Merge "ggrep" into klp-ub-dev
...
* commit 'a8245d1dc1746a8cd26aead8c15aa05c9b703455':
ggrep
2014-04-09 09:27:33 +00:00
Narayan Kamath
8af7e8ed3e
resolved conflicts for merge of 1852237a
to klp-modular-dev-plus-aosp
...
Change-Id: I09a8a4e95fc956392a0c61f38bd12332149a8d96
2014-04-09 10:03:41 +01:00
Narayan Kamath
1852237a1b
am cf61a7a0
: Merge "Add 32 / 64 bit abi lists to system properties."
...
* commit 'cf61a7a0db4361689f0ee583fbbe7b3a0519a538':
Add 32 / 64 bit abi lists to system properties.
2014-04-09 08:50:28 +00:00
Narayan Kamath
cf61a7a0db
Merge "Add 32 / 64 bit abi lists to system properties."
2014-04-09 08:48:04 +00:00
Jon Boekenoogen
a8245d1dc1
Merge "ggrep" into klp-ub-dev
2014-04-09 04:20:02 +00:00
Narayan Kamath
7303ebda84
Add 32 / 64 bit abi lists to system properties.
...
Introduce ro.product.cpu.abilist32 / abilist64, which are
comma separated lists of the 32 and 64 bit ABIs that the
device supports. These properties are used by the zygote and
system server to determine what ABI an app should be
started with.
This changes move abilist related make steps out of envsetup.mk
and into config.mk because they depend on variables set by
core/combo/***. Additionally, config.mk performs a few additional
cleanups of these variables (like stripping them) after the
inclusion of envsetup.mk so this seems like a better place to
put them.
bug: 13647418
Change-Id: I3db39bdd761220c5b4966f651892fb592396f9a1
2014-04-08 17:40:40 +01:00
Alan Viverette
38568b424d
Preserve symlinked OUT_DIR by only clearing contents
...
Change-Id: I824ecd46d7fd31885024ff20cf5cbd52e2cbb713
2014-04-07 18:55:05 -07:00
Dirk Dougherty
eed8e1a2f6
am 049808e3
: am d031b4de
: am 98cc173c
: am 46b443ac
: Adjust opacity for non-hover states and a few others.
...
* commit '049808e3263bb347e6a1eced99b348f98174c636':
Adjust opacity for non-hover states and a few others.
2014-04-08 01:19:07 +00:00
Dirk Dougherty
049808e326
am d031b4de
: am 98cc173c
: am 46b443ac
: Adjust opacity for non-hover states and a few others.
...
* commit 'd031b4de79308fa347ae6b38f552e535a9ecef64':
Adjust opacity for non-hover states and a few others.
2014-04-08 01:13:15 +00:00
Dirk Dougherty
d031b4de79
am 98cc173c
: am 46b443ac
: Adjust opacity for non-hover states and a few others.
...
* commit '98cc173c165fa2141426464a4205441617ba3bd2':
Adjust opacity for non-hover states and a few others.
2014-04-08 01:08:06 +00:00
Dirk Dougherty
98cc173c16
am 46b443ac
: Adjust opacity for non-hover states and a few others.
...
* commit '46b443acbdd80cf41352b68f4f482de4cf729cba':
Adjust opacity for non-hover states and a few others.
2014-04-08 01:01:29 +00:00
Ying Wang
ad7fdf3b88
am c9c3ed22
: am 5d33de08
: am bdac8cf1
: Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found""
...
* commit 'c9c3ed2299b9bfcbea032245080ed3250daa4acf':
Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
2014-04-07 22:52:34 +00:00
Ying Wang
0fd79215b3
am 25c0096b
: am b55bb77e
: am 1b08226a
: Merge "Different bootclasspath for droiddoc."
...
* commit '25c0096bd3ce0f34de5907dc4ef64f48c944c50e':
Different bootclasspath for droiddoc.
2014-04-07 22:52:34 +00:00
Ying Wang
c9c3ed2299
am 5d33de08
: am bdac8cf1
: Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found""
...
* commit '5d33de08196b5c77a58a3e3a045a1b3bf31e09a7':
Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
2014-04-07 22:48:38 +00:00
Ying Wang
25c0096bd3
am b55bb77e
: am 1b08226a
: Merge "Different bootclasspath for droiddoc."
...
* commit 'b55bb77ef260f97337be7f15dc9c1433f2ddce98':
Different bootclasspath for droiddoc.
2014-04-07 22:48:37 +00:00
Ying Wang
5d33de0819
am bdac8cf1
: Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found""
...
* commit 'bdac8cf148bab0e0ff9d8d51ab202ccb3adfcae8':
Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
2014-04-07 22:42:57 +00:00
Ying Wang
b55bb77ef2
am 1b08226a
: Merge "Different bootclasspath for droiddoc."
...
* commit '1b08226afa693646facbd718be2b4a657c837dc2':
Different bootclasspath for droiddoc.
2014-04-07 22:42:57 +00:00
Ying Wang
db70e23fc1
am be835b6f
: am 90219d98
: am cb733bc5
: Merge "Fix droiddoc generation."
...
* commit 'be835b6f3eae780557369ac9cf2fdfacec6a2874':
Fix droiddoc generation.
2014-04-07 22:42:29 +00:00
Ying Wang
bdac8cf148
Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found""
2014-04-07 22:41:22 +00:00
Ying Wang
1b08226afa
Merge "Different bootclasspath for droiddoc."
2014-04-07 22:39:06 +00:00
Ying Wang
be835b6f3e
am 90219d98
: am cb733bc5
: Merge "Fix droiddoc generation."
...
* commit '90219d985fd784be5bcee8ce7b62aa41f41d0dd7':
Fix droiddoc generation.
2014-04-07 22:36:43 +00:00
Ying Wang
90219d985f
am cb733bc5
: Merge "Fix droiddoc generation."
...
* commit 'cb733bc564d974cfd3fe08be1d0e5c06cd85911f':
Fix droiddoc generation.
2014-04-07 22:31:18 +00:00
Ying Wang
cb733bc564
Merge "Fix droiddoc generation."
2014-04-07 22:26:10 +00:00
Ying Wang
5b6b46459c
Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
...
It seems to be a javac/javadoc bug.
See https://code.google.com/p/doclava/issues/detail?id=38
sun.util.resources.OpenListResourceBundle is a class defined in the host rt.jar,
but sometimes on some platform javadoc/javac can't find it.
-XDignore.symbol.file tells javadoc/javac to skip the stubs file ct.sym
and link against rt.jar directly.
Change-Id: I3930f7399fc14b2d6b43c29f737fa90f37515aff
2014-04-07 15:19:33 -07:00
Ying Wang
584d8adbea
Different bootclasspath for droiddoc.
...
- If it's host module, don't set bootclasspath;
- If it's arget module,
- It can build against the API stubs;
- It can build against a historical SDK version;
- It can build against core.jar
Change-Id: Id1ec3ba624bc38068b206ad7173f4facf590e021
2014-04-07 15:14:50 -07:00
Narayan Kamath
f122d41b75
Fix droiddoc generation.
...
We want javadoc generated from the standard libraries
we supply and not the host standard libraries.
This also has the side effect of fixing javadoc generation
for java7 APIs that android introduced, while compiling
with java6.
bug: 8992787
Change-Id: Idebc7e12c7743a43b425ef4971f4482719fd480d
2014-04-07 15:08:18 -07:00
Jon Boekenoogen
cbca56fb72
ggrep
...
Add ggrep to search Gradle files more easily. Similar
to jgrep, cgrep, mgrep, etc...
Change-Id: I9f0bc74560c1df4c369216eabdb9e825bcb6fe75
2014-04-07 21:05:38 +00:00
Scott Kennedy
98029d9dcb
am ee16b2c2
: am 2452774c
: am 62eb51af
: Keep Parcelable CREATOR fields
...
* commit 'ee16b2c23cd787f0f60e81a3b2704ceb3d9f4f6f':
Keep Parcelable CREATOR fields
2014-04-07 19:32:40 +00:00
Scott Kennedy
ee16b2c23c
am 2452774c
: am 62eb51af
: Keep Parcelable CREATOR fields
...
* commit '2452774c0be2d6ebf2d433045d172787c90772ca':
Keep Parcelable CREATOR fields
2014-04-07 19:09:11 +00:00
Scott Kennedy
2452774c0b
am 62eb51af
: Keep Parcelable CREATOR fields
...
* commit '62eb51af23b5f0ac43a8f596582d469fe5e3a375':
Keep Parcelable CREATOR fields
2014-04-07 19:02:54 +00:00