OSDN Git Service
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
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: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
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: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: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
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
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".
Ying Wang [Thu, 3 Apr 2014 08:31:27 +0000 (08:31 +0000)]
am
88e1a110: am
680e0370: am
59ff6009: Merge "Unset _JAVA_OPTIONS before running "java -version"."
* commit '
88e1a1103acaf5e61fd11a7c006a0c465214ac78':
Unset _JAVA_OPTIONS before running "java -version".
Ji-Hwan Lee [Thu, 3 Apr 2014 05:23:40 +0000 (14:23 +0900)]
Add handheld_core_hardware.xml to telephony base
Bug:
13683526
Change-Id: I8085fa1abfa460213c3c9fe2a63217ee16b9ff8a
Dirk Dougherty [Thu, 3 Apr 2014 02:18:48 +0000 (02:18 +0000)]
am
31bfe838: am
5fe1b387: am
812d3d47: am
08032409: Add basic support for rendering dynamic content on pages.
* commit '
31bfe8385f671e2571acf64aeda6aa9c2fa0b3f5':
Add basic support for rendering dynamic content on pages.
Dirk Dougherty [Thu, 3 Apr 2014 02:11:16 +0000 (02:11 +0000)]
am
5fe1b387: am
812d3d47: am
08032409: Add basic support for rendering dynamic content on pages.
* commit '
5fe1b387aace96990723c16e3e23a27b166483c5':
Add basic support for rendering dynamic content on pages.
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".
Greg Hackmann [Thu, 3 Apr 2014 01:49:30 +0000 (01:49 +0000)]
am
b3f2dac1: am
0fd37501: am
f518e838: am
f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit '
b3f2dac1e07e43a57227e39f00474c82006eba7a':
Revert "HACK: disable emulator on x86_64"
Ying Wang [Thu, 3 Apr 2014 01:47:18 +0000 (01:47 +0000)]
Merge "Unset _JAVA_OPTIONS before running "java -version"."
Greg Hackmann [Thu, 3 Apr 2014 01:41:16 +0000 (01:41 +0000)]
am
0fd37501: am
f518e838: am
f1750876: Merge "Revert "HACK: disable emulator on x86_64""
* commit '
0fd37501c4610783c53a6f8d4000ba7a230f61df':
Revert "HACK: disable emulator on x86_64"
Geremy Condra [Thu, 3 Apr 2014 01:16:42 +0000 (18:16 -0700)]
Add verity dev keys to build.
These will be used when making images from your dev machine.
Change-Id: Ib1c894f6874a8e1a7d3d6e8133c8e897d40080d4
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:52:24 +0000 (17:52 +0000)]
am
9871d2e2: am
0396b102: am
578f7ec4: am
45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '
9871d2e270781e3254d9b1b82d7e1e6a949172a3':
aosp_arm64: increase userdata image size
Colin Cross [Wed, 2 Apr 2014 17:44:54 +0000 (17:44 +0000)]
am
0396b102: am
578f7ec4: am
45db0e05: Merge "aosp_arm64: increase userdata image size"
* commit '
0396b10235ece43be797e48673ec05c4cf4c74d7':
aosp_arm64: increase userdata image size
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
Torne (Richard Coles) [Wed, 2 Apr 2014 17:37:20 +0000 (17:37 +0000)]
am
dc74b380: am
e4915bbe: am
59d0c658: am
c783b9bd: Merge "Add GYP as a target type that requires 2nd arch."
* commit '
dc74b380409ac9d78cdd19eb28c203ebeb8db5aa':
Add GYP as a target type that requires 2nd arch.
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
Torne (Richard Coles) [Wed, 2 Apr 2014 17:31:04 +0000 (17:31 +0000)]
am
e4915bbe: am
59d0c658: am
c783b9bd: Merge "Add GYP as a target type that requires 2nd arch."
* commit '
e4915bbebbaaeb337df5dec87b82c18d186a6bfb':
Add GYP as a target type that requires 2nd arch.
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:39:00 +0000 (12:39 +0000)]
am
775da50d: am
bfc9b30d: (-s ours) am
81fc969b: am
cf352c5d: Merge "Add warning message for java6 builds."
* commit '
775da50dfc022e34676a020a14e500741d902a54':
Add warning message for java6 builds.
Narayan Kamath [Wed, 2 Apr 2014 12:34:28 +0000 (12:34 +0000)]
am
bfc9b30d: (-s ours) am
81fc969b: am
cf352c5d: Merge "Add warning message for java6 builds."
* commit '
bfc9b30d36cfbd5c01a0ff0aa7333f81e2033003':
Add warning message for java6 builds.
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 11:17:57 +0000 (11:17 +0000)]
am
797741ad: am
839d2829: (-s ours) am
35200762: am
e28df19e: Merge "Call "java[c] -version" only once"
* commit '
797741adcacf8919f71d4da3e13d64f5ed19d427':
Call "java[c] -version" only once
Narayan Kamath [Wed, 2 Apr 2014 11:11:58 +0000 (11:11 +0000)]
am
839d2829: (-s ours) am
35200762: am
e28df19e: Merge "Call "java[c] -version" only once"
* commit '
839d2829bcf2ddc7aaf04f6305b4b6858962896d':
Call "java[c] -version" only once
Narayan Kamath [Wed, 2 Apr 2014 11:08:59 +0000 (11:08 +0000)]
am
1d671c23: am
823f0ba6: (-s ours) am
0239220a: am
2f5de9f5: Merge "Bring main.mk in sync with "
* commit '
1d671c236ab7018c2534f7a4e0a0c7fe62bf53b6':
Bring main.mk in sync with master.
Narayan Kamath [Wed, 2 Apr 2014 11:05:22 +0000 (11:05 +0000)]
am
823f0ba6: (-s ours) am
0239220a: am
2f5de9f5: Merge "Bring main.mk in sync with "
* commit '
823f0ba6b8b52566d453d4770ac4e09f89b90842':
Bring main.mk in sync with master.
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:17:53 +0000 (09:17 +0000)]
am
108df578: am
7e28c074: am
4ca6e2e5: am
38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '
108df578615bac826cb57ffc80ce7c94bcc534f0':
Use debug versions of dex2oat explicitly.
Nicolas Geoffray [Wed, 2 Apr 2014 09:09:40 +0000 (09:09 +0000)]
am
7e28c074: am
4ca6e2e5: am
38c0ac73: Merge "Use debug versions of dex2oat explicitly."
* commit '
7e28c0742794e0866cfdd19a586f9e5c9b6cfbb4':
Use debug versions of dex2oat explicitly.
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 [Wed, 2 Apr 2014 00:15:38 +0000 (00:15 +0000)]
am
cc733968: am
7e739e54: am
83695037: am
e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '
cc73396810288ae3b8301f94569944a6334806aa':
Remove redundant my_target_global_ldflags
Tim Murray [Wed, 2 Apr 2014 00:10:05 +0000 (00:10 +0000)]
am
a6e629e8: am
7ebce18a: am
0cad8ee2: am
572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM."
* commit '
a6e629e8d5b78ec6521901082f2a4514ffb6e6bc':
Always use prebuilt clang, even if we're explicitly building clang/LLVM.
Dmitriy Ivanov [Wed, 2 Apr 2014 00:08:31 +0000 (00:08 +0000)]
am
7e739e54: am
83695037: am
e44e8b0f: Merge "Remove redundant my_target_global_ldflags"
* commit '
7e739e549bcf7db349d9280321149b4e6839b5ab':
Remove redundant my_target_global_ldflags
OSDN Git Service
