OSDN Git Service
Ying Wang [Thu, 20 Mar 2014 20:18:38 +0000 (20:18 +0000)]
am
c5a56344: am
1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '
c5a563447a68c30dd998b7cd6f8f8c30693edc37':
Remove the redundant DISABLE_DEXPREOPT
Ying Wang [Thu, 20 Mar 2014 20:14:12 +0000 (13:14 -0700)]
am
1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '
1c43aaea07fdf2665f1d2305fe16cb29811b32ee':
Remove the redundant DISABLE_DEXPREOPT
Ying Wang [Thu, 20 Mar 2014 20:11:04 +0000 (20:11 +0000)]
Merge "Remove the redundant DISABLE_DEXPREOPT"
Ying Wang [Thu, 20 Mar 2014 19:57:19 +0000 (12:57 -0700)]
Remove the redundant DISABLE_DEXPREOPT
To disable dexpreopt, use just:
WITH_DEXPREOPT=false
Change-Id: I5804f3774f8ec50eb16c5336776dbce0c28b16d9
Ying Wang [Thu, 20 Mar 2014 19:36:32 +0000 (19:36 +0000)]
am
9ce34617: am
4f9d6f57: Merge "Fix embedded build"
* commit '
9ce34617a001338093b0de85443925a37a967f0d':
Fix embedded build
Ying Wang [Thu, 20 Mar 2014 19:28:30 +0000 (12:28 -0700)]
am
4f9d6f57: Merge "Fix embedded build"
* commit '
4f9d6f57fdea05904c6f45c7799aa7a0d0a32457':
Fix embedded build
Ying Wang [Thu, 20 Mar 2014 19:25:09 +0000 (19:25 +0000)]
Merge "Fix embedded build"
Ying Wang [Thu, 20 Mar 2014 19:13:10 +0000 (12:13 -0700)]
Fix embedded build
1) Disable dexpreopt if DALVIK_VM_LIB isn't set up by the product.
2) DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is moved to config.mk,
for it's only decided by target arch.
3) Move Java module input from embedded.mk to base.mk.
Change-Id: Ife70b0cd8cee2e5c92f356c808affa56f494b49a
Glenn Kasten [Wed, 19 Mar 2014 21:44:07 +0000 (21:44 +0000)]
am
b614ef1e: am
cb902fff: Merge "A few other removals for the 64 bit blacklist."
* commit '
b614ef1eef10815652451c332954a6a6ee6f02ba':
A few other removals for the 64 bit blacklist.
Glenn Kasten [Wed, 19 Mar 2014 21:36:43 +0000 (14:36 -0700)]
am
cb902fff: Merge "A few other removals for the 64 bit blacklist."
* commit '
cb902fff82487a63e36e94105db79d4312ea4736':
A few other removals for the 64 bit blacklist.
Glenn Kasten [Wed, 19 Mar 2014 21:32:22 +0000 (21:32 +0000)]
Merge "A few other removals for the 64 bit blacklist."
Christopher Ferris [Wed, 19 Mar 2014 18:15:39 +0000 (18:15 +0000)]
am
aea9f041: am
8b1bcc7d: Merge "Add a method to leave the symbol table in a library."
* commit '
aea9f041f72a128065691ac402ccdb72a5a7aad4':
Add a method to leave the symbol table in a library.
Christopher Ferris [Wed, 19 Mar 2014 18:11:12 +0000 (11:11 -0700)]
am
8b1bcc7d: Merge "Add a method to leave the symbol table in a library."
* commit '
8b1bcc7dc72038ecf80d174cc551cce81978ec95':
Add a method to leave the symbol table in a library.
Christopher Ferris [Wed, 19 Mar 2014 18:07:18 +0000 (18:07 +0000)]
Merge "Add a method to leave the symbol table in a library."
Nick Kralevich [Wed, 19 Mar 2014 16:49:21 +0000 (16:49 +0000)]
am
e623b4c2: am
f2fd6d9a: Merge "Allow shell serial_device read-write access"
* commit '
e623b4c2c2b585ad19627e13347474b70377c78b':
Allow shell serial_device read-write access
Nick Kralevich [Wed, 19 Mar 2014 16:43:24 +0000 (09:43 -0700)]
am
f2fd6d9a: Merge "Allow shell serial_device read-write access"
* commit '
f2fd6d9af27c1ba70679d07f237d48f86ae3532f':
Allow shell serial_device read-write access
Nick Kralevich [Wed, 19 Mar 2014 16:37:39 +0000 (16:37 +0000)]
Merge "Allow shell serial_device read-write access"
Narayan Kamath [Wed, 19 Mar 2014 09:04:28 +0000 (09:04 +0000)]
A few other removals for the 64 bit blacklist.
- external/chromium now compiles
- stagefright codecs now compile.
- frameworks/base now compiles.
Change-Id: I1226b79cd3e0b5e2fd786bb506e022b47fe5e264
Tim Kilbourn [Wed, 19 Mar 2014 09:23:43 +0000 (09:23 +0000)]
am
8acc8da4: Add v17/leanback to pathmap.
* commit '
8acc8da42d1971792090f3b80b1900427e5d37fc':
Add v17/leanback to pathmap.
Christopher Ferris [Tue, 18 Mar 2014 21:50:09 +0000 (14:50 -0700)]
Add a method to leave the symbol table in a library.
When LOCAL_STRIP_MODULE := keep_symbols is set, then the normal strip rules
will be modified so that only the .debug_* sections are removed. The original
symbol table is left alone.
This allows the compilation of certain libraries so that libbacktrace library
can provide meaningful names to functions.
Bug:
12958251
Change-Id: I82bdc304a463012e29086325ccb51163464cb4a9
Ying Wang [Tue, 18 Mar 2014 23:07:49 +0000 (23:07 +0000)]
am
87a25ea7: am
bce52ca5: Merge "Remove arm64 clang build warning"
* commit '
87a25ea72f41b77898e62ad09e48e0b0de1dc84f':
Remove arm64 clang build warning
Ying Wang [Tue, 18 Mar 2014 23:03:24 +0000 (16:03 -0700)]
am
bce52ca5: Merge "Remove arm64 clang build warning"
* commit '
bce52ca5fae5d0062e7622d758a3619f2279c666':
Remove arm64 clang build warning
Ying Wang [Tue, 18 Mar 2014 22:58:49 +0000 (22:58 +0000)]
Merge "Remove arm64 clang build warning"
Ying Wang [Tue, 18 Mar 2014 22:12:29 +0000 (15:12 -0700)]
Remove arm64 clang build warning
Now we have enabled arm64 clang.
This change remvoed arm64 clang build warning and cleaned the
arm64 unknow c flags.
Change-Id: Ia583a78c6d364e603ff09df423aa34a6e03d0b9b
Tim Kilbourn [Tue, 18 Mar 2014 20:37:51 +0000 (13:37 -0700)]
Add v17/leanback to pathmap.
Change-Id: I3032710da8cf8714516bf78f0971223257dfe1ec
Nick Kralevich [Tue, 18 Mar 2014 22:17:35 +0000 (15:17 -0700)]
Allow shell serial_device read-write access
When starting the emulator, the system console writes entries
to /dev/ttyS2. We need to allow the writes, otherwise this generates
denials when you run "emulator -verbose -logcat '*:v' -show-kernel"
Addresses the following denial:
type=1400 audit(
1395076594.320:446): avc: denied { read write } for pid=5600 comm="sh" path="/dev/ttyS2" dev="tmpfs" ino=1487 scontext=u:r:shell:s0 tcontext=u:object_r:serial_device:s0 tclass=chr_file
Bug:
13506702
Change-Id: I3729537cabb0bf8e8b2905d3def43a293bb1081f
Glenn Kasten [Tue, 18 Mar 2014 21:53:41 +0000 (21:53 +0000)]
am
023c2865: am
97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"
* commit '
023c286563ce09b2d42c81a38d4dc17ee011ac9e':
Don't blacklist all of frameworks/av for 64-bit
Glenn Kasten [Tue, 18 Mar 2014 21:48:36 +0000 (14:48 -0700)]
am
97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"
* commit '
97542cc9bf4b2e5fad1576fa7262fa531bcf3fe4':
Don't blacklist all of frameworks/av for 64-bit
Glenn Kasten [Tue, 18 Mar 2014 21:45:12 +0000 (21:45 +0000)]
Merge "Don't blacklist all of frameworks/av for 64-bit"
Greg Hackmann [Tue, 18 Mar 2014 19:28:33 +0000 (19:28 +0000)]
am
5a4183f3: am
267afcde: Merge "HACK: disable emulator on x86_64"
* commit '
5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e':
HACK: disable emulator on x86_64
Greg Hackmann [Tue, 18 Mar 2014 19:25:45 +0000 (12:25 -0700)]
am
267afcde: Merge "HACK: disable emulator on x86_64"
* commit '
267afcdefe3a6da9b72a9c70d238abb00be69949':
HACK: disable emulator on x86_64
Greg Hackmann [Tue, 18 Mar 2014 19:21:48 +0000 (19:21 +0000)]
Merge "HACK: disable emulator on x86_64"
Glenn Kasten [Wed, 12 Mar 2014 16:00:15 +0000 (09:00 -0700)]
Don't blacklist all of frameworks/av for 64-bit
Change-Id: Ic2db99b1b577e3355c50982af5068bce32edf4ba
Ying Wang [Tue, 18 Mar 2014 18:44:32 +0000 (18:44 +0000)]
am
5462f7f9: am
255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
* commit '
5462f7f953915bd345a58b17977e79e6405b56d0':
Remove unused LOCAL_ASSET_FILES.
Ying Wang [Tue, 18 Mar 2014 18:38:25 +0000 (11:38 -0700)]
am
255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
* commit '
255ea2bdc45673b7d08809f4495f060b00006c6e':
Remove unused LOCAL_ASSET_FILES.
Ying Wang [Tue, 18 Mar 2014 18:32:05 +0000 (18:32 +0000)]
Merge "Remove unused LOCAL_ASSET_FILES."
Ying Wang [Tue, 18 Mar 2014 18:31:09 +0000 (11:31 -0700)]
Remove unused LOCAL_ASSET_FILES.
Change-Id: Ie0b2b2e30a158b779016767fb868f3e03b2f828a
Greg Hackmann [Tue, 18 Mar 2014 18:11:07 +0000 (11:11 -0700)]
HACK: disable emulator on x86_64
The build system and qemu disagree about where the x86_64 kernel should
live; disable the emulator until that's resolved
Change-Id: Ia7a2745ee8f3f4211ce39f8d851d5d860acbf62b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Scott Main [Tue, 18 Mar 2014 12:41:07 +0000 (12:41 +0000)]
am
7250ac63: am
bb79f9d2: am
b7b49711: add some css to support android wear sub-site
* commit '
7250ac63e5a3f7d04f055ccb53b5a1f32f4c11e1':
add some css to support android wear sub-site
Dianne Hackborn [Tue, 18 Mar 2014 12:41:06 +0000 (12:41 +0000)]
am
45b9be37: am
264d4001: (-s ours) am
7503e736: 4.4.3 is MR2, version boogaloo!
* commit '
45b9be37a5ad7d92fbd8c089386d297412f765f0':
4.4.3 is MR2, version boogaloo!
Scott Main [Tue, 18 Mar 2014 12:37:22 +0000 (12:37 +0000)]
am
bb79f9d2: am
b7b49711: add some css to support android wear sub-site
* commit '
bb79f9d2a52c7f1e20bd74e5d80b2df4119cec82':
add some css to support android wear sub-site
Dianne Hackborn [Tue, 18 Mar 2014 12:37:22 +0000 (12:37 +0000)]
am
264d4001: (-s ours) am
7503e736: 4.4.3 is MR2, version boogaloo!
* commit '
264d4001e7d01e302f93803d161f778fb200e346':
4.4.3 is MR2, version boogaloo!
Scott Main [Tue, 18 Mar 2014 12:35:42 +0000 (12:35 +0000)]
am
b7b49711: add some css to support android wear sub-site
* commit '
b7b497115fb19d17a3e5de20646a5eac759c0095':
add some css to support android wear sub-site
Scott Main [Tue, 18 Mar 2014 12:29:15 +0000 (05:29 -0700)]
add some css to support android wear sub-site
Change-Id: Ibce2c596219fb86f433075c88a0af9d0cc1007b3
Andrew Hsieh [Tue, 18 Mar 2014 00:09:13 +0000 (00:09 +0000)]
am
d14f3cc7: am
5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
* commit '
d14f3cc7bc9983ea5ba1c2d952d2b5f51935f42c':
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
Andrew Hsieh [Tue, 18 Mar 2014 00:07:44 +0000 (17:07 -0700)]
am
5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
* commit '
5384c187871b1ede992d7de2b4299be45d0e0030':
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
Andrew Hsieh [Tue, 18 Mar 2014 00:04:25 +0000 (00:04 +0000)]
Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
Andrew Hsieh [Tue, 4 Mar 2014 09:11:52 +0000 (17:11 +0800)]
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
Add llvm libc++ static and shared libraries
Change-Id: I92af9b6ab21cbf8ea82e014a4c11aeb5455920f9
Ying Wang [Sun, 16 Mar 2014 20:08:31 +0000 (20:08 +0000)]
am
a660d06e: am
1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
* commit '
a660d06eeb9a53bc8d88fc2e559d461dc6a77d67':
Don't modify LOCAL_STRIP_MODULE
Ying Wang [Sun, 16 Mar 2014 20:04:59 +0000 (13:04 -0700)]
am
1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
* commit '
1cda15d3234a502ba7332b56a7bbecca228731cf':
Don't modify LOCAL_STRIP_MODULE
Ying Wang [Sun, 16 Mar 2014 20:02:56 +0000 (20:02 +0000)]
Merge "Don't modify LOCAL_STRIP_MODULE"
Ying Wang [Sun, 16 Mar 2014 19:43:49 +0000 (12:43 -0700)]
Don't modify LOCAL_STRIP_MODULE
LOCAL_STRIP_MODULE will be reused in multilib build.
Change-Id: I3512efb360c7eaafad02859723ab4368778effed
Colin Cross [Sat, 15 Mar 2014 23:59:32 +0000 (23:59 +0000)]
am
6e92ade0: am
db24577b: Merge "Work in progress to enable build system support for Clang."
* commit '
6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
Work in progress to enable build system support for Clang.
Colin Cross [Sat, 15 Mar 2014 23:56:40 +0000 (16:56 -0700)]
am
db24577b: Merge "Work in progress to enable build system support for Clang."
* commit '
db24577bbd0ccc60be19791290d367e2efb5583e':
Work in progress to enable build system support for Clang.
Colin Cross [Sat, 15 Mar 2014 23:54:03 +0000 (23:54 +0000)]
Merge "Work in progress to enable build system support for Clang."
Tim Murray [Fri, 7 Mar 2014 21:18:44 +0000 (13:18 -0800)]
Work in progress to enable build system support for Clang.
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
Andrew Hsieh [Fri, 14 Mar 2014 00:26:55 +0000 (00:26 +0000)]
am
de8edc8a: am
933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
* commit '
de8edc8a35e5a53c6f1f8e5db099c28691319585':
Fix HOST_TOOLCHAIN_PREFIX
Andrew Hsieh [Fri, 14 Mar 2014 00:23:37 +0000 (17:23 -0700)]
am
933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
* commit '
933e8940d00745413ae1e9d0e76714feecf9086a':
Fix HOST_TOOLCHAIN_PREFIX
Andrew Hsieh [Fri, 14 Mar 2014 00:19:18 +0000 (00:19 +0000)]
Merge "Fix HOST_TOOLCHAIN_PREFIX"
Narayan Kamath [Thu, 13 Mar 2014 09:33:58 +0000 (09:33 +0000)]
am
237f5414: am
cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
* commit '
237f5414ebf38e1386307679947641f72865fc38':
Revert "Remove external/chromium from the 64 bit blacklist."
Narayan Kamath [Thu, 13 Mar 2014 09:31:33 +0000 (02:31 -0700)]
am
cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
* commit '
cc8d6dab9a3ae140ed99d3f3373e72b54811f210':
Revert "Remove external/chromium from the 64 bit blacklist."
Narayan Kamath [Thu, 13 Mar 2014 09:29:52 +0000 (09:29 +0000)]
Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
Narayan Kamath [Thu, 13 Mar 2014 09:29:22 +0000 (09:29 +0000)]
Revert "Remove external/chromium from the 64 bit blacklist."
This reverts commit
27bf51144af3513605cff421beb39a556599eb42.
Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
Narayan Kamath [Thu, 13 Mar 2014 09:18:00 +0000 (09:18 +0000)]
am
70916972: am
25249624: Merge "Remove external/chromium from the 64 bit blacklist."
* commit '
709169725a34836b3f388526aee714f070f20103':
Remove external/chromium from the 64 bit blacklist.
Narayan Kamath [Thu, 13 Mar 2014 09:08:35 +0000 (02:08 -0700)]
am
25249624: Merge "Remove external/chromium from the 64 bit blacklist."
* commit '
252496247f31ee06d8c948886fd2f3a36ccd021e':
Remove external/chromium from the 64 bit blacklist.
Narayan Kamath [Thu, 13 Mar 2014 09:05:30 +0000 (09:05 +0000)]
Merge "Remove external/chromium from the 64 bit blacklist."
Dmitriy Ivanov [Wed, 12 Mar 2014 18:49:19 +0000 (18:49 +0000)]
am
d842e6d6: am
c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
* commit '
d842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
Add TARGET_2ND_ARCH to dumpvar
Dmitriy Ivanov [Wed, 12 Mar 2014 18:46:05 +0000 (11:46 -0700)]
am
c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
* commit '
c62d6f7622f567ba9a0acf54a80d118f85e741b4':
Add TARGET_2ND_ARCH to dumpvar
Dmitriy Ivanov [Wed, 12 Mar 2014 18:40:42 +0000 (18:40 +0000)]
Merge "Add TARGET_2ND_ARCH to dumpvar"
Dmitriy Ivanov [Wed, 12 Mar 2014 18:13:41 +0000 (11:13 -0700)]
Add TARGET_2ND_ARCH to dumpvar
Change-Id: Ida87a61cceb55b7ebc28735b4688a03a10c01096
Narayan Kamath [Wed, 12 Mar 2014 14:42:07 +0000 (14:42 +0000)]
Remove external/chromium from the 64 bit blacklist.
This isn't the same as chromium_org (which is used by the
webview). This is a 3 year old snapshot of the net stack which
compiles under 64 bit. It's currently used on aosp master by
libstagefright_chromium_http.
This project can be removed if the changes that remove the
chromium dependency are cherry-picked to aosp/master.
Change-Id: I5d0f9ed03ea9842b47d980d77ea32bc7a3f6998f
Andrew Hsieh [Wed, 12 Mar 2014 11:27:59 +0000 (19:27 +0800)]
Fix HOST_TOOLCHAIN_PREFIX
Previously HOST_TOOLCHAIN_PREFIX can't accept toolchain in arch-os-*-gcc
format. Fix it so we can try out new host toolchain, eg.
HOST_TOOLCHAIN_PREFIX=prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- make
Change-Id: Ic1092593036c41d5471e788654fb4e0991dd7e40
Dianne Hackborn [Tue, 11 Mar 2014 23:22:38 +0000 (23:22 +0000)]
am
7503e736: 4.4.3 is MR2, version boogaloo!
* commit '
7503e736ebb0161a23ff0ee39a307cd436ea8afc':
4.4.3 is MR2, version boogaloo!
Dianne Hackborn [Tue, 11 Mar 2014 21:54:09 +0000 (14:54 -0700)]
4.4.3 is MR2, version boogaloo!
Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26
Ying Wang [Tue, 11 Mar 2014 02:08:45 +0000 (02:08 +0000)]
am
446f00c9: am
ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
* commit '
446f00c9e1a8ef2b119617ab63c15a6aa40c733b':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Ying Wang [Tue, 11 Mar 2014 02:05:27 +0000 (19:05 -0700)]
am
ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
* commit '
ce156811797d7594b712120c5d969e329d70b1e3':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Ying Wang [Tue, 11 Mar 2014 02:03:07 +0000 (02:03 +0000)]
Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
Ying Wang [Tue, 11 Mar 2014 01:23:08 +0000 (18:23 -0700)]
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Still keep WITHOUT_CLANG, which enables both.
Bug:
13402154
Change-Id: I32cb668223997719875751bf3d64f592d6086830
Ian Rogers [Tue, 11 Mar 2014 00:01:57 +0000 (00:01 +0000)]
am
21060b30: am
775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
* commit '
21060b30993b975084ea7a7c35a6df23cf0e5ea7':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 23:59:07 +0000 (16:59 -0700)]
am
775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
* commit '
775d15e001d48d72a1b76982b1b5faa1eb37158f':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 23:55:32 +0000 (23:55 +0000)]
Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:49:41 +0000 (16:49 -0700)]
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Change-Id: I945128b3087b28f62467c7123b759e3514027574
Ian Rogers [Mon, 10 Mar 2014 23:37:13 +0000 (23:37 +0000)]
am
bc39fd5c: am
f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
* commit '
bc39fd5cab47388797ee7638920766e91fe0b100':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:33:44 +0000 (16:33 -0700)]
am
f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
* commit '
f1e697be5e433818071a817af0b673cba8e87795':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:29:25 +0000 (23:29 +0000)]
Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
Ian Rogers [Mon, 10 Mar 2014 23:27:01 +0000 (23:27 +0000)]
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
This reverts commit
668427c941bd88cacdf24d0562e6b68eb93038a1.
Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802
Ian Rogers [Mon, 10 Mar 2014 22:51:08 +0000 (22:51 +0000)]
am
a520bfbe: am
4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
* commit '
a520bfbeb65b307da42abb079911311096fef20c':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 22:48:25 +0000 (15:48 -0700)]
am
4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
* commit '
4783dc7ab509b7099d2de83f863a9799ce67659e':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 22:44:49 +0000 (22:44 +0000)]
Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 22:30:39 +0000 (15:30 -0700)]
Define __STDC_LIMIT_MACROS globally to work around host build differences.
Change-Id: I571fc5a4b35c830ca8de4dc3117aef258dffa1bd
Ying Wang [Mon, 10 Mar 2014 19:29:36 +0000 (19:29 +0000)]
am
61cf1df7: am
60ef9d5b: Merge "jdk error message should not mention the version"
* commit '
61cf1df7edbb9d52a6f151b011633b2859213c35':
jdk error message should not mention the version
Ying Wang [Mon, 10 Mar 2014 19:28:03 +0000 (12:28 -0700)]
am
60ef9d5b: Merge "jdk error message should not mention the version"
* commit '
60ef9d5b263bdc6799bb6495bdd34877647d07fe':
jdk error message should not mention the version
Ying Wang [Mon, 10 Mar 2014 19:25:58 +0000 (19:25 +0000)]
Merge "jdk error message should not mention the version"
Chris Wren [Fri, 7 Mar 2014 19:51:56 +0000 (14:51 -0500)]
jdk error message should not mention the version
the version is checked elsewhere
Bug:
13362810
Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404
Clay Murphy [Mon, 10 Mar 2014 18:55:24 +0000 (18:55 +0000)]
am
25f47659: am
05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
* commit '
25f47659d7cc0e7b9d65ab8ce070fc7b00c4976c':
Docs: replacing analytics ID from D.A.C. Bug:
11476435
Clay Murphy [Mon, 10 Mar 2014 18:52:21 +0000 (11:52 -0700)]
am
05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
* commit '
05192e5a9095ac6a89757157dfd3636a2f56df7f':
Docs: replacing analytics ID from D.A.C. Bug:
11476435
Clay Murphy [Mon, 10 Mar 2014 18:47:17 +0000 (18:47 +0000)]
Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
Adam Hampson [Sat, 8 Mar 2014 01:54:46 +0000 (01:54 +0000)]
am
57afaa53: Add init.environ.rc to installclean
* commit '
57afaa537361e7f5c12c049b13b831c1126b3cad':
Add init.environ.rc to installclean
Adam Hampson [Fri, 7 Mar 2014 23:53:44 +0000 (15:53 -0800)]
Add init.environ.rc to installclean
BOOTCLASSPATH needs to be rebuilt when switching between build
targets.
Bug:
13282187
Change-Id: I16816abb4246878a60e1aa8c91b6b38c7339950e
Signed-off-by: Adam Hampson <ahampson@google.com>
Ben Cheng [Fri, 7 Mar 2014 16:55:52 +0000 (16:55 +0000)]
am
21ef9705: am
f230bcf4: Merge "OProfile is no longer compiled now."
* commit '
21ef9705b67bc8c2666a30bf71db0ba5125c93f2':
OProfile is no longer compiled now.