OSDN Git Service
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
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
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
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
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: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: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: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 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: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."
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
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"
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 01:57:25 +0000 (01:57 +0000)]
am
680e0370: am
59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
* commit '
680e037007fd0f4207a4734b8fccce17a91ee682':
Unset _JAVA_OPTIONS before running "java -version".
Ying Wang [Thu, 3 Apr 2014 01:51:19 +0000 (01:51 +0000)]
am
59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
* commit '
59ff600927033db50ab4ef131ef198c686a5a65b':
Unset _JAVA_OPTIONS before running "java -version".
Ying Wang [Thu, 3 Apr 2014 01:47:18 +0000 (01:47 +0000)]
Merge "Unset _JAVA_OPTIONS before running "java -version"."
Ying Wang [Thu, 3 Apr 2014 01:15:10 +0000 (18:15 -0700)]
Unset _JAVA_OPTIONS before running "java -version".
Unfortunately the previous approach of grepping out java version before
"head -n 1" clash with the effort of running "java -version" only once.
Change-Id: Ic78719c3bf1a54a45342d74bbbfa8e83bbc1bce1
Dirk Dougherty [Wed, 2 Apr 2014 23:35:43 +0000 (23:35 +0000)]
am
812d3d47: am
08032409: Add basic support for rendering dynamic content on pages.
* commit '
812d3d478be650f5b5bb1dfe00d6131986c26886':
Add basic support for rendering dynamic content on pages.
Dirk Dougherty [Wed, 2 Apr 2014 23:32:20 +0000 (23:32 +0000)]
am
08032409: Add basic support for rendering dynamic content on pages.
* commit '
08032409b4dd29740e1c8e703eada0d1ce86e58c':
Add basic support for rendering dynamic content on pages.
Greg Hackmann [Wed, 2 Apr 2014 23:04:57 +0000 (23:04 +0000)]
am
f518e838: am
f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit '
f518e8380cc5d4e1a25ca5fad161a7cd7e7e78dd':
Revert "HACK: disable emulator on x86_64"
Greg Hackmann [Wed, 2 Apr 2014 22:58:07 +0000 (22:58 +0000)]
am
f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit '
f17508760898e0debeb4ae7ff6455d664577c647':
Revert "HACK: disable emulator on x86_64"
Greg Hackmann [Wed, 2 Apr 2014 22:53:45 +0000 (22:53 +0000)]
Merge "Revert "HACK: disable emulator on x86_64""
Dirk Dougherty [Sat, 15 Feb 2014 18:14:35 +0000 (10:14 -0800)]
Add basic support for rendering dynamic content on pages.
Change-Id: If3ba4f71771a01043ec6d544e3b4a9222ba35daf
Colin Cross [Wed, 2 Apr 2014 17:39:56 +0000 (17:39 +0000)]
am
578f7ec4: am
45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '
578f7ec487c2c00581cdc9807d0d24883ba4406a':
aosp_arm64: increase userdata image size
Colin Cross [Wed, 2 Apr 2014 17:34:30 +0000 (17:34 +0000)]
am
45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '
45db0e058a8b0177b442b195a6ca5590525fb701':
aosp_arm64: increase userdata image size
Colin Cross [Wed, 2 Apr 2014 17:28:21 +0000 (17:28 +0000)]
Merge "aosp_arm64: increase userdata image size"
Torne (Richard Coles) [Wed, 2 Apr 2014 17:27:53 +0000 (17:27 +0000)]
am
59d0c658: am
c783b9bd: Merge "Add GYP as a target type that requires 2nd arch."
* commit '
59d0c658847d3c8118de46d2d7fa1fa3bfc563d2':
Add GYP as a target type that requires 2nd arch.
Torne (Richard Coles) [Wed, 2 Apr 2014 17:24:42 +0000 (17:24 +0000)]
am
c783b9bd: Merge "Add GYP as a target type that requires 2nd arch."
* commit '
c783b9bda96a6fc97076bb877645255fb01596fb':
Add GYP as a target type that requires 2nd arch.
Torne (Richard Coles) [Wed, 2 Apr 2014 17:20:10 +0000 (17:20 +0000)]
Merge "Add GYP as a target type that requires 2nd arch."
Colin Cross [Wed, 2 Apr 2014 16:16:37 +0000 (09:16 -0700)]
aosp_arm64: increase userdata image size
Increase userdata image size to allow make tests to builds with
extra tests to fit.
Change-Id: I2fea99d5a39816e78595215481b60ee51eb9182f
Narayan Kamath [Wed, 2 Apr 2014 12:26:38 +0000 (12:26 +0000)]
am
81fc969b: am
cf352c5d: Merge "Add warning message for java6 builds."
* commit '
81fc969b65fb4cc7dc9f5698aa8c37c657f853ef':
Add warning message for java6 builds.
Narayan Kamath [Wed, 2 Apr 2014 12:23:28 +0000 (12:23 +0000)]
am
cf352c5d: Merge "Add warning message for java6 builds."
* commit '
cf352c5d7e1482cc80be4eb2bbe99041a2345f8e':
Add warning message for java6 builds.
Narayan Kamath [Wed, 2 Apr 2014 12:19:49 +0000 (12:19 +0000)]
Merge "Add warning message for java6 builds."
Narayan Kamath [Mon, 17 Feb 2014 18:09:13 +0000 (18:09 +0000)]
Add warning message for java6 builds.
The instruction URL has been amended and a few additional
details have been added.
(cherry picked from
8c06afdea3d3c422d653b40fd19d5e3d4be64af2)
Change-Id: Icaffc3b13ed881ac7e29f2021ed31eb1f877a5ab
Narayan Kamath [Wed, 2 Apr 2014 10:57:13 +0000 (10:57 +0000)]
am
35200762: am
e28df19e: Merge "Call "java[c] -version" only once"
* commit '
35200762980aa2c0f90e73e38af94fd29b50f91f':
Call "java[c] -version" only once
Narayan Kamath [Wed, 2 Apr 2014 10:57:13 +0000 (10:57 +0000)]
am
0239220a: am
2f5de9f5: Merge "Bring main.mk in sync with "
* commit '
0239220a67f168fa30703e07750d1f4907dc99bf':
Bring main.mk in sync with master.
Narayan Kamath [Wed, 2 Apr 2014 10:51:15 +0000 (10:51 +0000)]
am
e28df19e: Merge "Call "java[c] -version" only once"
* commit '
e28df19e0e553f1590e304c02b19559dbee48098':
Call "java[c] -version" only once
Narayan Kamath [Wed, 2 Apr 2014 10:51:14 +0000 (10:51 +0000)]
am
2f5de9f5: Merge "Bring main.mk in sync with "
* commit '
2f5de9f50460bbd369abd4218e746553f15f24fb':
Bring main.mk in sync with master.
Narayan Kamath [Wed, 2 Apr 2014 10:48:33 +0000 (10:48 +0000)]
Merge "Call "java[c] -version" only once"
Ying Wang [Wed, 13 Nov 2013 23:05:15 +0000 (15:05 -0800)]
Call "java[c] -version" only once
and print out the full output if error occurs.
Bug:
11672548
(cherry picked from
7b66d366bf5c469130f71d0870424fcd265e0301)
Change-Id: I8e2f2ffa2f28146405273b04667efe3c8d1c03ad
Narayan Kamath [Wed, 2 Apr 2014 10:45:06 +0000 (10:45 +0000)]
Merge "Bring main.mk in sync with master."
Torne (Richard Coles) [Wed, 2 Apr 2014 10:26:44 +0000 (11:26 +0100)]
Add GYP as a target type that requires 2nd arch.
"GYP" class targets are used by external/chromium_org for gyp's "none"
type. The processing in these targets needs a separate intermediate
directory for the primary/secondary architecture, so add it to the list
in intermediates-dir-for along with libraries/executables.
Change-Id: Id05899c83b45ed0647dfbfa6b0b2e7f61b04348b
Nicolas Geoffray [Wed, 2 Apr 2014 09:02:12 +0000 (09:02 +0000)]
am
4ca6e2e5: am
38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '
4ca6e2e52832d894b6387120e8b1c447121b5135':
Use debug versions of dex2oat explicitly.
Nicolas Geoffray [Wed, 2 Apr 2014 08:50:03 +0000 (08:50 +0000)]
am
38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '
38c0ac7386f1956cf06079960886275c483e0706':
Use debug versions of dex2oat explicitly.
Nicolas Geoffray [Wed, 2 Apr 2014 08:45:55 +0000 (08:45 +0000)]
Merge "Use debug versions of dex2oat explicitly."
Dmitriy Ivanov [Tue, 1 Apr 2014 23:59:48 +0000 (23:59 +0000)]
am
83695037: am
e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '
836950372ba00a8e65158e84ce9f35edd25c48ec':
Remove redundant my_target_global_ldflags
Dmitriy Ivanov [Tue, 1 Apr 2014 23:55:45 +0000 (23:55 +0000)]
am
e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '
e44e8b0fbeaa52a3ff2ac84d6a804a2883103d7e':
Remove redundant my_target_global_ldflags
Dmitriy Ivanov [Tue, 1 Apr 2014 23:51:11 +0000 (23:51 +0000)]
Merge "Remove redundant my_target_global_ldflags"
Dmitriy Ivanov [Tue, 1 Apr 2014 23:36:21 +0000 (16:36 -0700)]
Remove redundant my_target_global_ldflags
* Fix: my_target_global_ldflags is defined in binary.mk
so they effectivelly override previous definition
Change-Id: I9c7d9bde82c3a6d25a94ae109fa71ecaa33640b0
Tim Murray [Tue, 1 Apr 2014 23:32:25 +0000 (23:32 +0000)]
am
0cad8ee2: am
572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '
0cad8ee2226d3af8dab854f26da405b15b3655ce':
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
Tim Murray [Tue, 1 Apr 2014 23:28:58 +0000 (23:28 +0000)]
am
572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '
572e9accc05c467d74d3f4fbf2dbc05b8424e302':
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
Tim Murray [Tue, 1 Apr 2014 23:24:56 +0000 (23:24 +0000)]
Merge "Always use prebuilt clang, even if we're explicitly building clang/LLVM."
Tim Murray [Mon, 24 Mar 2014 21:36:42 +0000 (14:36 -0700)]
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
This is needed for self-hosting Clang/LLVM.
bug
13588226
Change-Id: Ic98adc2b174b12ce046b7b65bbc28901a766a485
Brian Carlstrom [Tue, 1 Apr 2014 18:47:16 +0000 (11:47 -0700)]
resolved conflicts for merge of
cece45d2 to klp-modular-dev-plus-aosp
Change-Id: Ibec9bab6ec9d46787f521fdaa6a033106d667e76
Brian Carlstrom [Tue, 1 Apr 2014 18:27:32 +0000 (18:27 +0000)]
am
5e5d26b1: am
47e60739: Merge "cortex-a7 supports div"
* commit '
5e5d26b1efc6cb73e80e09598ab606678524ff21':
cortex-a7 supports div
Brian Carlstrom [Tue, 1 Apr 2014 18:23:35 +0000 (18:23 +0000)]
am
47e60739: Merge "cortex-a7 supports div"
* commit '
47e6073979254ef4fbc60554079b2bf19ac32ab1':
cortex-a7 supports div
Brian Carlstrom [Tue, 1 Apr 2014 18:11:22 +0000 (18:11 +0000)]
Merge "cortex-a7 supports div"
Brian Carlstrom [Mon, 31 Mar 2014 23:58:09 +0000 (16:58 -0700)]
cortex-a7 supports div
(cherry picked from commit
cece45d22652ca0d8a57a6cb03c5ca2a915a9a07)
Change-Id: I9975171ef2c2cd3a9481fa0896473fec684095f3
Narayan Kamath [Tue, 1 Apr 2014 16:33:26 +0000 (16:33 +0000)]
am
2c9552b7: am
aafbbe7e: Merge "Add a default value for ro.zygote."
* commit '
2c9552b78486ae1592303932dc70e00ff487d76f':
Add a default value for ro.zygote.
Narayan Kamath [Tue, 1 Apr 2014 16:26:40 +0000 (16:26 +0000)]
am
aafbbe7e: Merge "Add a default value for ro.zygote."
* commit '
aafbbe7e8a3a8056c483b6b516c4900cbd3b095e':
Add a default value for ro.zygote.
Narayan Kamath [Tue, 1 Apr 2014 16:21:58 +0000 (16:21 +0000)]
Merge "Add a default value for ro.zygote."
Narayan Kamath [Tue, 1 Apr 2014 12:00:10 +0000 (13:00 +0100)]
Bring main.mk in sync with master.
These lines were removed in aosp in commit
e2d27887b
but a bad merge conflict resolution left them in master.
Subsequent changes on master started using these variables
so they're being brought back.
Change-Id: Ic8f3c295130c47eb0d66057880f9d4f70c89af94
Nicolas Geoffray [Tue, 25 Mar 2014 11:14:26 +0000 (11:14 +0000)]
Use debug versions of dex2oat explicitly.
Change-Id: Ie7c238908a5739af752a08fec1a04914026a8f96
Ying Wang [Tue, 1 Apr 2014 03:05:06 +0000 (03:05 +0000)]
am
9cfefe13: am
6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit '
9cfefe13aeb3295605ea47040767261df95d2cda':
Add intel to the vendor whitelist
Ying Wang [Tue, 1 Apr 2014 02:58:51 +0000 (02:58 +0000)]
am
6a9f2b12: Merge "Add intel to the vendor whitelist"
* commit '
6a9f2b1250e276267ce146777fbe6084f8fa7a3f':
Add intel to the vendor whitelist
Ying Wang [Tue, 1 Apr 2014 02:51:49 +0000 (02:51 +0000)]
Merge "Add intel to the vendor whitelist"
Daniel Leung [Thu, 6 Mar 2014 19:14:14 +0000 (11:14 -0800)]
Add intel to the vendor whitelist
Change-Id: I91d6ff72629523050b4f26c2d731cac90ef49348
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Reviewed-by: Jovanovic, Radivoje <radivoje.jovanovic@intel.com>
Reviewed-by: Boie, Andrew P <andrew.p.boie@intel.com>
Reviewed-by: Kumar-mayernik, Nisha <nisha.kumar-mayernik@intel.com>
Reviewed-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Tested-by: Gumbel, Matthew K <matthew.k.gumbel@intel.com>
Ying Wang [Tue, 1 Apr 2014 00:15:50 +0000 (00:15 +0000)]
am
4714d3d7: am
b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set."
* commit '
4714d3d7a604391d174049a7a595e80ebab2da18':
Fix java version detection when _JAVA_OPTIONS is set.
Ying Wang [Tue, 1 Apr 2014 00:11:00 +0000 (00:11 +0000)]
am
b34af41e: Merge "Fix java version detection when _JAVA_OPTIONS is set."
* commit '
b34af41e578b1bbc02470d01593c45fe8b04588b':
Fix java version detection when _JAVA_OPTIONS is set.
Brian Carlstrom [Mon, 31 Mar 2014 23:58:09 +0000 (16:58 -0700)]
cortex-a7 supports div
Change-Id: Id06fe4af3a71bbb8beee4d1846f1917d87664033