OSDN Git Service
Ben Cheng [Thu, 10 Apr 2014 17:26:57 +0000 (17:26 +0000)]
am
335c76d8: am
c77ffa89: am
add6c037: am
13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
* commit '
335c76d886b7e4ea241f3c02bab2cf38074fe9e4':
Revert "Use aarch64-linux-android-4.9 for arm64 build."
Ben Cheng [Thu, 10 Apr 2014 17:24:46 +0000 (17:24 +0000)]
am
c77ffa89: am
add6c037: am
13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
* commit '
c77ffa8923d95f8bd4639bf9e810b0c981481e54':
Revert "Use aarch64-linux-android-4.9 for arm64 build."
Ben Cheng [Thu, 10 Apr 2014 17:21:49 +0000 (17:21 +0000)]
am
add6c037: am
13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
* commit '
add6c03742a61209030491f4afb1b7a37b9ddb7d':
Revert "Use aarch64-linux-android-4.9 for arm64 build."
Ben Cheng [Thu, 10 Apr 2014 17:18:26 +0000 (17:18 +0000)]
am
13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
* commit '
13eaf184f6e5c803f52f5003ace36bafe64671c9':
Revert "Use aarch64-linux-android-4.9 for arm64 build."
Ben Cheng [Thu, 10 Apr 2014 17:14:57 +0000 (17:14 +0000)]
Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""
Ben Cheng [Thu, 10 Apr 2014 17:14:01 +0000 (17:14 +0000)]
Revert "Use aarch64-linux-android-4.9 for arm64 build."
This reverts commit
6154690d8615995b961530479ddc1a34946efe49.
Change-Id: I7427ad6ca1f74ad632229348bac31ebdbc0590ad
Ben Cheng [Thu, 10 Apr 2014 16:47:14 +0000 (16:47 +0000)]
am
c760ecbd: am
9cbf732f: am
98bb9d6c: am
d957d6bb: Merge "Use aarch64-linux-android-4.9 for arm64 build."
* commit '
c760ecbd2204200c55d0be585c113ae0dbfb7286':
Use aarch64-linux-android-4.9 for arm64 build.
Ben Cheng [Thu, 10 Apr 2014 16:43:08 +0000 (16:43 +0000)]
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.
Ben Cheng [Thu, 10 Apr 2014 16:39:02 +0000 (16:39 +0000)]
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.
Ben Cheng [Thu, 10 Apr 2014 16:36:06 +0000 (16:36 +0000)]
am
d957d6bb: Merge "Use aarch64-linux-android-4.9 for arm64 build."
* commit '
d957d6bbdb29fccae74f3511251cae22376550af':
Use aarch64-linux-android-4.9 for arm64 build.
Ben Cheng [Thu, 10 Apr 2014 16:33:51 +0000 (16:33 +0000)]
Merge "Use aarch64-linux-android-4.9 for arm64 build."
Ben Cheng [Wed, 9 Apr 2014 22:56:47 +0000 (15:56 -0700)]
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
Jeff Sharkey [Wed, 9 Apr 2014 22:10:00 +0000 (22:10 +0000)]
am
26e1a28e: Pass OEM property list to OTA tools, thumbprint.
* commit '
26e1a28e7f9aa22b37ec7d98dab0de5c93202ab0':
Pass OEM property list to OTA tools, thumbprint.
Jeff Sharkey [Fri, 21 Mar 2014 23:20:05 +0000 (16:20 -0700)]
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
Ying Wang [Wed, 9 Apr 2014 21:40:31 +0000 (21:40 +0000)]
am
9ef2bee2: am
09ba20ce: am
fd251b33: am
1a4676a1: Merge "Increase the maximum javac heap size again."
* commit '
9ef2bee21a04b7c53fa16aef58aa0f2ef548fbd5':
Increase the maximum javac heap size again.
Ying Wang [Wed, 9 Apr 2014 21:37:16 +0000 (21:37 +0000)]
am
09ba20ce: am
fd251b33: am
1a4676a1: Merge "Increase the maximum javac heap size again."
* commit '
09ba20ce647472ca6f5692bcf6eb5477fc3a818d':
Increase the maximum javac heap size again.
Ying Wang [Wed, 9 Apr 2014 21:34:12 +0000 (21:34 +0000)]
am
fd251b33: am
1a4676a1: Merge "Increase the maximum javac heap size again."
* commit '
fd251b33abd2de9c288d56993978dc36976198a7':
Increase the maximum javac heap size again.
Ying Wang [Wed, 9 Apr 2014 21:32:16 +0000 (21:32 +0000)]
am
1a4676a1: Merge "Increase the maximum javac heap size again."
* commit '
1a4676a17c5483c04f347a4e58890640a71c8368':
Increase the maximum javac heap size again.
Ying Wang [Wed, 9 Apr 2014 21:29:19 +0000 (21:29 +0000)]
Merge "Increase the maximum javac heap size again."
Ying Wang [Wed, 9 Apr 2014 21:27:29 +0000 (14:27 -0700)]
Increase the maximum javac heap size again.
Change-Id: Ic3422650ea22977f3dcfd74505cb287ff6543c2d
Narayan Kamath [Wed, 9 Apr 2014 16:24:55 +0000 (16:24 +0000)]
am
ed1c1193: am
6c0fba0f: am
ae44bb55: am
94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
* commit '
ed1c1193758c86773ff6b45a11db8bfc49b35d3e':
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
Narayan Kamath [Wed, 9 Apr 2014 16:19:44 +0000 (16:19 +0000)]
am
6c0fba0f: am
ae44bb55: am
94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
* commit '
6c0fba0f989ce9755a4f4303149355dd0d4ea60d':
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
Narayan Kamath [Wed, 9 Apr 2014 16:14:38 +0000 (16:14 +0000)]
am
ae44bb55: am
94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
* commit '
ae44bb55bd39ba66ad3882c7e63bf188600ffe14':
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
Narayan Kamath [Wed, 9 Apr 2014 16:11:01 +0000 (16:11 +0000)]
am
94147a91: Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
* commit '
94147a919b1148d8a128a99b33f3c938d87452c7':
Stop defining HAVE_TIMEDWAIT_MONOTONIC.
Narayan Kamath [Wed, 9 Apr 2014 16:08:30 +0000 (16:08 +0000)]
Merge "Stop defining HAVE_TIMEDWAIT_MONOTONIC."
Narayan Kamath [Mon, 3 Mar 2014 19:31:10 +0000 (19:31 +0000)]
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
Jeff Sharkey [Wed, 9 Apr 2014 15:46:26 +0000 (15:46 +0000)]
am
491055df: Merge "Import OEM build properties, if defined."
* commit '
491055df99d9d3ebf9006f073a54292ef7724ec5':
Import OEM build properties, if defined.
Jeff Sharkey [Wed, 9 Apr 2014 15:44:06 +0000 (15:44 +0000)]
Merge "Import OEM build properties, if defined."
Jon Boekenoogen [Wed, 9 Apr 2014 14:22:36 +0000 (14:22 +0000)]
Jon Boekenoogen [Wed, 9 Apr 2014 14:10:06 +0000 (14:10 +0000)]
Jon Boekenoogen [Wed, 9 Apr 2014 14:03:35 +0000 (14:03 +0000)]
am
9ccadc82: am
a8245d1d: Merge "ggrep" into klp-ub-dev
* commit '
9ccadc8246c6c805265046ce02cb5e42c9cc2ee9':
ggrep
Narayan Kamath [Wed, 9 Apr 2014 12:14:49 +0000 (12:14 +0000)]
am
110ea46e: resolved conflicts for merge of
8af7e8ed to master
* commit '
110ea46e096b2aff0afb60224406fb76699308c7':
Add 32 / 64 bit abi lists to system properties.
Narayan Kamath [Wed, 9 Apr 2014 11:33:03 +0000 (12:33 +0100)]
resolved conflicts for merge of
8af7e8ed to master
Change-Id: Ib427b36e133e29d1c2e9cea065e4e63c1e2e2122
Jon Boekenoogen [Wed, 9 Apr 2014 09:27:33 +0000 (09:27 +0000)]
am
a8245d1d: Merge "ggrep" into klp-ub-dev
* commit '
a8245d1dc1746a8cd26aead8c15aa05c9b703455':
ggrep
Narayan Kamath [Wed, 9 Apr 2014 09:03:41 +0000 (10:03 +0100)]
resolved conflicts for merge of
1852237a to klp-modular-dev-plus-aosp
Change-Id: I09a8a4e95fc956392a0c61f38bd12332149a8d96
Narayan Kamath [Wed, 9 Apr 2014 08:50:28 +0000 (08:50 +0000)]
am
cf61a7a0: Merge "Add 32 / 64 bit abi lists to system properties."
* commit '
cf61a7a0db4361689f0ee583fbbe7b3a0519a538':
Add 32 / 64 bit abi lists to system properties.
Narayan Kamath [Wed, 9 Apr 2014 08:48:03 +0000 (08:48 +0000)]
Merge "Add 32 / 64 bit abi lists to system properties."
Jon Boekenoogen [Wed, 9 Apr 2014 04:20:01 +0000 (04:20 +0000)]
Merge "ggrep" into klp-ub-dev
Alan Viverette [Wed, 9 Apr 2014 01:23:05 +0000 (01:23 +0000)]
am
38568b42: Preserve symlinked OUT_DIR by only clearing contents
* commit '
38568b424d3139c6d590f9b3d7961e16b8795dc2':
Preserve symlinked OUT_DIR by only clearing contents
Narayan Kamath [Mon, 7 Apr 2014 10:01:54 +0000 (11:01 +0100)]
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
Alan Viverette [Tue, 25 Mar 2014 00:24:35 +0000 (17:24 -0700)]
Preserve symlinked OUT_DIR by only clearing contents
Change-Id: I824ecd46d7fd31885024ff20cf5cbd52e2cbb713
Dirk Dougherty [Tue, 8 Apr 2014 01:25:30 +0000 (01:25 +0000)]
am
eed8e1a2: am
049808e3: am
d031b4de: am
98cc173c: am
46b443ac: Adjust opacity for non-hover states and a few others.
* commit '
eed8e1a2f607573c5768c0fdeb2c3ec133b1e8d1':
Adjust opacity for non-hover states and a few others.
Dirk Dougherty [Tue, 8 Apr 2014 01:19:07 +0000 (01:19 +0000)]
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.
Dirk Dougherty [Tue, 8 Apr 2014 01:13:15 +0000 (01:13 +0000)]
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.
Dirk Dougherty [Tue, 8 Apr 2014 01:08:06 +0000 (01:08 +0000)]
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.
Dirk Dougherty [Tue, 8 Apr 2014 01:01:29 +0000 (01:01 +0000)]
am
46b443ac: Adjust opacity for non-hover states and a few others.
* commit '
46b443acbdd80cf41352b68f4f482de4cf729cba':
Adjust opacity for non-hover states and a few others.
Ying Wang [Mon, 7 Apr 2014 22:58:07 +0000 (22:58 +0000)]
am
ad7fdf3b: am
c9c3ed22: am
5d33de08: am
bdac8cf1: Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found""
* commit '
ad7fdf3b8868bbad7760ae94ff71139ea32fb8d5':
Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found"
Ying Wang [Mon, 7 Apr 2014 22:58:06 +0000 (22:58 +0000)]
am
0fd79215: am
25c0096b: am
b55bb77e: am
1b08226a: Merge "Different bootclasspath for droiddoc."
* commit '
0fd79215b38fcb341dfc2625a70937fdfe579369':
Different bootclasspath for droiddoc.
Ying Wang [Mon, 7 Apr 2014 22:52:34 +0000 (22:52 +0000)]
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"
Ying Wang [Mon, 7 Apr 2014 22:52:34 +0000 (22:52 +0000)]
am
25c0096b: am
b55bb77e: am
1b08226a: Merge "Different bootclasspath for droiddoc."
* commit '
25c0096bd3ce0f34de5907dc4ef64f48c944c50e':
Different bootclasspath for droiddoc.
Ying Wang [Mon, 7 Apr 2014 22:49:28 +0000 (22:49 +0000)]
am
db70e23f: am
be835b6f: am
90219d98: am
cb733bc5: Merge "Fix droiddoc generation."
* commit '
db70e23fc15bb6c7ba1f6dd7f18197f73d55826c':
Fix droiddoc generation.
Ying Wang [Mon, 7 Apr 2014 22:48:38 +0000 (22:48 +0000)]
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"
Ying Wang [Mon, 7 Apr 2014 22:48:37 +0000 (22:48 +0000)]
am
b55bb77e: am
1b08226a: Merge "Different bootclasspath for droiddoc."
* commit '
b55bb77ef260f97337be7f15dc9c1433f2ddce98':
Different bootclasspath for droiddoc.
Ying Wang [Mon, 7 Apr 2014 22:42:57 +0000 (22:42 +0000)]
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"
Ying Wang [Mon, 7 Apr 2014 22:42:57 +0000 (22:42 +0000)]
am
1b08226a: Merge "Different bootclasspath for droiddoc."
* commit '
1b08226afa693646facbd718be2b4a657c837dc2':
Different bootclasspath for droiddoc.
Ying Wang [Mon, 7 Apr 2014 22:42:29 +0000 (22:42 +0000)]
am
be835b6f: am
90219d98: am
cb733bc5: Merge "Fix droiddoc generation."
* commit '
be835b6f3eae780557369ac9cf2fdfacec6a2874':
Fix droiddoc generation.
Ying Wang [Mon, 7 Apr 2014 22:41:21 +0000 (22:41 +0000)]
Merge "Fix javadoc error "class file for sun.util.resources.OpenListResourceBundle not found""
Ying Wang [Mon, 7 Apr 2014 22:39:06 +0000 (22:39 +0000)]
Merge "Different bootclasspath for droiddoc."
Ying Wang [Mon, 7 Apr 2014 22:36:43 +0000 (22:36 +0000)]
am
90219d98: am
cb733bc5: Merge "Fix droiddoc generation."
* commit '
90219d985fd784be5bcee8ce7b62aa41f41d0dd7':
Fix droiddoc generation.
Ying Wang [Mon, 7 Apr 2014 22:31:18 +0000 (22:31 +0000)]
am
cb733bc5: Merge "Fix droiddoc generation."
* commit '
cb733bc564d974cfd3fe08be1d0e5c06cd85911f':
Fix droiddoc generation.
Ying Wang [Mon, 7 Apr 2014 22:26:10 +0000 (22:26 +0000)]
Merge "Fix droiddoc generation."
Ying Wang [Mon, 7 Apr 2014 22:19:33 +0000 (15:19 -0700)]
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
Ying Wang [Mon, 7 Apr 2014 22:14:50 +0000 (15:14 -0700)]
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
Narayan Kamath [Fri, 25 Oct 2013 14:55:46 +0000 (15:55 +0100)]
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
Jon Boekenoogen [Mon, 7 Apr 2014 17:57:38 +0000 (10:57 -0700)]
ggrep
Add ggrep to search Gradle files more easily. Similar
to jgrep, cgrep, mgrep, etc...
Change-Id: I9f0bc74560c1df4c369216eabdb9e825bcb6fe75
Scott Kennedy [Mon, 7 Apr 2014 19:37:20 +0000 (19:37 +0000)]
am
98029d9d: am
ee16b2c2: am
2452774c: am
62eb51af: Keep Parcelable CREATOR fields
* commit '
98029d9dcb596fdb45ccf11c7a5075137af75628':
Keep Parcelable CREATOR fields
Scott Kennedy [Mon, 7 Apr 2014 19:32:40 +0000 (19:32 +0000)]
am
ee16b2c2: am
2452774c: am
62eb51af: Keep Parcelable CREATOR fields
* commit '
ee16b2c23cd787f0f60e81a3b2704ceb3d9f4f6f':
Keep Parcelable CREATOR fields
Scott Kennedy [Mon, 7 Apr 2014 19:09:11 +0000 (19:09 +0000)]
am
2452774c: am
62eb51af: Keep Parcelable CREATOR fields
* commit '
2452774c0be2d6ebf2d433045d172787c90772ca':
Keep Parcelable CREATOR fields
Scott Kennedy [Mon, 7 Apr 2014 19:02:54 +0000 (19:02 +0000)]
am
62eb51af: Keep Parcelable CREATOR fields
* commit '
62eb51af23b5f0ac43a8f596582d469fe5e3a375':
Keep Parcelable CREATOR fields
Dirk Dougherty [Sun, 6 Apr 2014 22:27:33 +0000 (15:27 -0700)]
Adjust opacity for non-hover states and a few others.
Change-Id: I8a6dee3e25bc8e6c3f1ca19d4e68037df5ce9b91
Scott Kennedy [Mon, 7 Apr 2014 18:25:47 +0000 (11:25 -0700)]
Keep Parcelable CREATOR fields
Change-Id: I64451134a9d11d17307ef4d8ea923df5fe5e37ed
Ying Wang [Sat, 5 Apr 2014 04:01:35 +0000 (04:01 +0000)]
am
b29d44e6: am
821b37d8: am
0df45b08: am
260942fa: Merge "Build with java7 by default."
* commit '
b29d44e619b2f588a931b7a09f22caf867d5d9a2':
Build with java7 by default.
Ying Wang [Sat, 5 Apr 2014 03:53:52 +0000 (03:53 +0000)]
am
821b37d8: am
0df45b08: am
260942fa: Merge "Build with java7 by default."
* commit '
821b37d8174f2497153dfb8fcde7b8f84618e111':
Build with java7 by default.
Ying Wang [Sat, 5 Apr 2014 01:53:59 +0000 (01:53 +0000)]
am
0df45b08: am
260942fa: Merge "Build with java7 by default."
* commit '
0df45b0898710a2e7ddd723fae450ad701a4614d':
Build with java7 by default.
Ying Wang [Sat, 5 Apr 2014 01:50:50 +0000 (01:50 +0000)]
am
260942fa: Merge "Build with java7 by default."
* commit '
260942fa826052f24455dbaf74e54189efb44e8b':
Build with java7 by default.
Ying Wang [Sat, 5 Apr 2014 01:46:20 +0000 (01:46 +0000)]
Merge "Build with java7 by default."
Narayan Kamath [Tue, 1 Apr 2014 13:16:26 +0000 (14:16 +0100)]
Build with java7 by default.
All introduce a flag LEGACY_USE_JAVA6 to force java6 builds.
This is an unsupported configuration, and provided temporarily
to iron out regressions and compare build output (if required.).
- Increment the version check sequence number.
- Move a more specific check (OpenJDK vs non OpenJDK) after
the more general version check.
- Update the link in the version check error message to the
"initializing" page instead of the "download" page. The latter
talks about repo, mainly.
bug:
8992787
Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d
Conflicts:
core/main.mk
Ying Wang [Fri, 4 Apr 2014 23:30:57 +0000 (23:30 +0000)]
am
7d43b0f6: am
f90ef06f: am
73c1422d: am
b5956468: Merge "Disable host -fPIE if BUILD_HOST_static is set."
* commit '
7d43b0f6a5b3516bf70f27c2e5f22be357c2ae68':
Disable host -fPIE if BUILD_HOST_static is set.
Ying Wang [Fri, 4 Apr 2014 23:25:19 +0000 (23:25 +0000)]
am
f90ef06f: am
73c1422d: am
b5956468: Merge "Disable host -fPIE if BUILD_HOST_static is set."
* commit '
f90ef06f0847f2adba3248859376775112ab1a81':
Disable host -fPIE if BUILD_HOST_static is set.
Ying Wang [Fri, 4 Apr 2014 23:19:20 +0000 (23:19 +0000)]
am
73c1422d: am
b5956468: Merge "Disable host -fPIE if BUILD_HOST_static is set."
* commit '
73c1422dd297553948ebfc4603fe852aa9a0336a':
Disable host -fPIE if BUILD_HOST_static is set.
Ying Wang [Fri, 4 Apr 2014 23:16:06 +0000 (23:16 +0000)]
am
b5956468: Merge "Disable host -fPIE if BUILD_HOST_static is set."
* commit '
b5956468e4cbfbd3a97fa6775b81406c4c949e22':
Disable host -fPIE if BUILD_HOST_static is set.
Ying Wang [Fri, 4 Apr 2014 23:10:27 +0000 (23:10 +0000)]
Merge "Disable host -fPIE if BUILD_HOST_static is set."
Doug Zongker [Fri, 4 Apr 2014 21:57:07 +0000 (21:57 +0000)]
am
f12362a1: Merge "select recovery assets based on target density"
* commit '
f12362a1a1cddeaebe740f08937985039900ee25':
select recovery assets based on target density
Doug Zongker [Fri, 4 Apr 2014 21:51:58 +0000 (21:51 +0000)]
Merge "select recovery assets based on target density"
Doug Zongker [Fri, 4 Apr 2014 20:51:15 +0000 (13:51 -0700)]
select recovery assets based on target density
Recovery now has different res-*dpi directories for different display
densities. Select one based on the highest density specified in
PRODUCT_AAPT_CONFIG.
Change-Id: Ieb0657a08e5df87f914fdda78a038cbbf82619e9
Ying Wang [Fri, 4 Apr 2014 21:37:33 +0000 (14:37 -0700)]
Disable host -fPIE if BUILD_HOST_static is set.
It turns out -static doesn't work with -fPIE.
Bug:
13568878
Change-Id: I66951a5517dece1c5f4f22c329cf703bd99b5163
Ying Wang [Fri, 4 Apr 2014 20:51:49 +0000 (20:51 +0000)]
am
01e91869: Merge "Build with java7 by default."
* commit '
01e9186925d24834f5943d71b91459a9f472a11a':
Build with java7 by default.
Ying Wang [Fri, 4 Apr 2014 20:45:31 +0000 (20:45 +0000)]
Merge "Build with java7 by default."
Steve Moyer [Fri, 4 Apr 2014 16:58:48 +0000 (16:58 +0000)]
am
79980b47: am
2482da64: (-s ours) am
90b089de: (-s ours) am
b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
79980b471453743cff71a4a41609d0a12523c490':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Fri, 4 Apr 2014 16:50:47 +0000 (16:50 +0000)]
am
2482da64: (-s ours) am
90b089de: (-s ours) am
b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
2482da64f875566a4a0bf30ac2a45ed860efeb1d':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Fri, 4 Apr 2014 16:42:57 +0000 (16:42 +0000)]
am
90b089de: (-s ours) am
b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
90b089de4c1e9ffe3bc13c7aa615c75579214abd':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Fri, 4 Apr 2014 16:36:18 +0000 (16:36 +0000)]
am
b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk"
* commit '
b9d6f6f15c7ea54a55f892654a450fff609b1f5f':
DO NOT MERGE: Combine emulator test projects into a single apk
Steve Moyer [Fri, 4 Apr 2014 16:32:06 +0000 (16:32 +0000)]
Merge "DO NOT MERGE: Combine emulator test projects into a single apk"
Narayan Kamath [Tue, 1 Apr 2014 13:16:26 +0000 (14:16 +0100)]
Build with java7 by default.
All introduce a flag LEGACY_USE_JAVA6 to force java6 builds.
This is an unsupported configuration, and provided temporarily
to iron out regressions and compare build output (if required.).
- Increment the version check sequence number.
- Move a more specific check (OpenJDK vs non OpenJDK) after
the more general version check.
- Update the link in the version check error message to the
"initializing" page instead of the "download" page. The latter
talks about repo, mainly.
bug:
8992787
Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d
Geremy Condra [Fri, 4 Apr 2014 01:54:24 +0000 (01:54 +0000)]
am
8cc491cf: Merge "Add verity dev keys to build."
* commit '
8cc491cff3e4e1bf0d007d592c3db087cc26ec5c':
Add verity dev keys to build.
Ji-Hwan Lee [Fri, 4 Apr 2014 01:54:24 +0000 (01:54 +0000)]
am
b2876247: Merge "Add handheld_core_hardware.xml to telephony base"
* commit '
b287624716f67032d0384d7fc37479c5030b61f9':
Add handheld_core_hardware.xml to telephony base
Geremy Condra [Fri, 4 Apr 2014 00:49:51 +0000 (00:49 +0000)]
Merge "Add verity dev keys to build."
Ji-Hwan Lee [Fri, 4 Apr 2014 00:24:44 +0000 (00:24 +0000)]
Merge "Add handheld_core_hardware.xml to telephony base"
Steve Moyer [Fri, 7 Feb 2014 19:46:08 +0000 (11:46 -0800)]
DO NOT MERGE: Combine emulator test projects into a single apk
SmsTest, GpsLocationTest, ConnectivityTest -> EmulatorSmokeTests
Conflicts:
target/product/sdk.mk
Change-Id: Ia5add1bc6360c27f84aab8f32b30c312435b1871
Ying Wang [Thu, 3 Apr 2014 08:40:52 +0000 (08:40 +0000)]
am
8700eb60: am
88e1a110: am
680e0370: am
59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
* commit '
8700eb6049f176045d5a231b944ba27d3eb728ea':
Unset _JAVA_OPTIONS before running "java -version".