OSDN Git Service
Iliyan Malchev [Tue, 4 Nov 2014 02:50:27 +0000 (02:50 +0000)]
am
eaf5b7bb: build: rename coredump-setup --> coredump_setup automerge:
e675cfb
* commit '
eaf5b7bb06d92efab0c0779d38dd3b040497f51e':
build: rename coredump-setup --> coredump_setup
Iliyan Malchev [Tue, 4 Nov 2014 01:23:32 +0000 (01:23 +0000)]
build: rename coredump-setup --> coredump_setup
automerge:
e675cfb
* commit '
e675cfbfb9d4d61388d703778d5e03ae07c43ea1':
build: rename coredump-setup --> coredump_setup
Iliyan Malchev [Tue, 4 Nov 2014 01:04:47 +0000 (17:04 -0800)]
build: rename coredump-setup --> coredump_setup
b/
18229600 shamu kernel is failing to build on build machine
Change-Id: I1b7e6d0ebf3e966a89ae4c7fed0cfd2db3f0a6a9
Signed-off-by: Iliyan Malchev <malchev@google.com>
Dirk Dougherty [Mon, 3 Nov 2014 22:35:52 +0000 (22:35 +0000)]
am
eb75cdae: am
04a95647: am
792fb0e6: am
4244929f: Merge "Doc change: increment the json import versions in docfile." into lmp-docs
* commit '
eb75cdae67975ed183493fff96ae398a36e74bea':
Doc change: increment the json import versions in docfile.
smain@google.com [Mon, 3 Nov 2014 22:31:54 +0000 (22:31 +0000)]
am
4adf789a: am
6d965570: am
83bae4aa: am
bc667f1c: am
08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working automerge:
36b1de7
* commit '
4adf789afcaca27e1c5327f1fb48c87db53bb23f':
smain@google.com [Mon, 3 Nov 2014 22:31:53 +0000 (22:31 +0000)]
am
bacf87e9: am
22d6c273: am
358c5fe5: am
f4cefc19: am
633f322b: update the analytics tracking event calls to use new API for analytics.js bug:
16331906 automerge:
40e1d35
* commit '
bacf87e91ef2ae8949bfc3385bc7e6918a2d6853':
smain@google.com [Mon, 3 Nov 2014 22:31:47 +0000 (22:31 +0000)]
am
555b945b: am
394ee3b8: am
4a8fd5fd: am
80e38f48: remove cookie expiration and add max-age of 2 years. bug:
17781603
* commit '
555b945b26df5464f29b02f31e47cd45362b3bcf':
remove cookie expiration and add max-age of 2 years. bug:
17781603
smain@google.com [Mon, 3 Nov 2014 22:31:33 +0000 (22:31 +0000)]
am
7885c30d: am
de5dc9a5: am
f51f30d7: remove cookie expiration and add max-age of 2 years. bug:
17781603
* commit '
7885c30d761d5769d1e55742a762d5535b18894c':
remove cookie expiration and add max-age of 2 years. bug:
17781603
Dirk Dougherty [Mon, 3 Nov 2014 21:18:29 +0000 (21:18 +0000)]
am
04a95647: am
792fb0e6: am
4244929f: Merge "Doc change: increment the json import versions in docfile." into lmp-docs
* commit '
04a9564759fd839ff32196896f378fe3ae3b1393':
Doc change: increment the json import versions in docfile.
Dirk Dougherty [Mon, 3 Nov 2014 21:11:04 +0000 (21:11 +0000)]
am
792fb0e6: am
4244929f: Merge "Doc change: increment the json import versions in docfile." into lmp-docs
* commit '
792fb0e6b29a9adfb3705d2fa993f3af27c267a7':
Doc change: increment the json import versions in docfile.
Dirk Dougherty [Mon, 3 Nov 2014 20:57:01 +0000 (20:57 +0000)]
am
4244929f: Merge "Doc change: increment the json import versions in docfile." into lmp-docs
* commit '
4244929faaaffe957e8f23f3f261fd3acdbc928c':
Doc change: increment the json import versions in docfile.
Dirk Dougherty [Mon, 3 Nov 2014 20:51:47 +0000 (20:51 +0000)]
Merge "Doc change: increment the json import versions in docfile." into lmp-docs
Dirk Dougherty [Mon, 3 Nov 2014 20:48:08 +0000 (12:48 -0800)]
Doc change: increment the json import versions in docfile.
Change-Id: I5ffd1810c83a333ae37e5d9c1b8dd0bdbd8cb376
smain@google.com [Mon, 3 Nov 2014 20:41:07 +0000 (20:41 +0000)]
am
6d965570: am
83bae4aa: am
bc667f1c: am
08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working automerge:
36b1de7
* commit '
6d96557088d71d171669b84e851a650f80c42546':
smain@google.com [Mon, 3 Nov 2014 20:41:06 +0000 (20:41 +0000)]
am
22d6c273: am
358c5fe5: am
f4cefc19: am
633f322b: update the analytics tracking event calls to use new API for analytics.js bug:
16331906 automerge:
40e1d35
* commit '
22d6c273d313a7da2efe80f7b1d111da8ac0e1b9':
smain@google.com [Mon, 3 Nov 2014 20:33:34 +0000 (20:33 +0000)]
am
83bae4aa: am
bc667f1c: am
08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working automerge:
36b1de7
* commit '
83bae4aad4df090d30435249941fd5348aa69b16':
smain@google.com [Mon, 3 Nov 2014 20:33:32 +0000 (20:33 +0000)]
am
358c5fe5: am
f4cefc19: am
633f322b: update the analytics tracking event calls to use new API for analytics.js bug:
16331906 automerge:
40e1d35
* commit '
358c5fe5f70d263fdc3bc66c283d4f680076b6e0':
smain@google.com [Mon, 3 Nov 2014 20:23:32 +0000 (20:23 +0000)]
am
bc667f1c: am
08f336ea: fix regression from Change-Id: I88c1e8192f1cbb5373af592b9e9f9a04ffe6fc7c that causes anchors in most docs other than reference to stop working
automerge:
36b1de7
* commit '
36b1de7334f82a7df3728597f0437aedb02dccef':
smain@google.com [Mon, 3 Nov 2014 20:21:13 +0000 (20:21 +0000)]
am
f4cefc19: am
633f322b: update the analytics tracking event calls to use new API for analytics.js bug:
16331906
automerge:
40e1d35
* commit '
40e1d35527098ed10c50e1509d7dee9fa9b19c97':
smain@google.com [Mon, 3 Nov 2014 20:09:27 +0000 (20:09 +0000)]
am
394ee3b8: am
4a8fd5fd: am
80e38f48: remove cookie expiration and add max-age of 2 years. bug:
17781603
* commit '
394ee3b8fed94ee02e2612af8bb094f396cce5c8':
remove cookie expiration and add max-age of 2 years. bug:
17781603
smain@google.com [Mon, 3 Nov 2014 20:05:00 +0000 (20:05 +0000)]
am
de5dc9a5: am
f51f30d7: remove cookie expiration and add max-age of 2 years. bug:
17781603
* commit '
de5dc9a56439bdfb049c4a7fb060d6274f076e19':
remove cookie expiration and add max-age of 2 years. bug:
17781603
smain@google.com [Mon, 3 Nov 2014 20:03:02 +0000 (20:03 +0000)]
am
4a8fd5fd: am
80e38f48: remove cookie expiration and add max-age of 2 years. bug:
17781603
* commit '
4a8fd5fdd2bbbe1afa27e65738aae77aeb60c172':
remove cookie expiration and add max-age of 2 years. bug:
17781603
smain@google.com [Mon, 3 Nov 2014 19:57:38 +0000 (19:57 +0000)]
am
f51f30d7: remove cookie expiration and add max-age of 2 years. bug:
17781603
* commit '
f51f30d7f10a32e07a081b799d9ae601be08276c':
remove cookie expiration and add max-age of 2 years. bug:
17781603
smain@google.com [Mon, 3 Nov 2014 19:52:41 +0000 (19:52 +0000)]
am
80e38f48: remove cookie expiration and add max-age of 2 years. bug:
17781603
* commit '
80e38f4872941cbf0114ad80e260993f1eafc14c':
remove cookie expiration and add max-age of 2 years. bug:
17781603
smain@google.com [Mon, 3 Nov 2014 18:47:12 +0000 (10:47 -0800)]
remove cookie expiration and add max-age of 2 years.
bug:
17781603
Change-Id: Idab3cae786fde4d0318ba03d3c7f5f678882b815
(cherry picked from commit
f51f30d7f10a32e07a081b799d9ae601be08276c)
smain@google.com [Mon, 3 Nov 2014 18:47:12 +0000 (10:47 -0800)]
remove cookie expiration and add max-age of 2 years.
bug:
17781603
Change-Id: Idab3cae786fde4d0318ba03d3c7f5f678882b815
Ying Wang [Mon, 3 Nov 2014 18:07:45 +0000 (18:07 +0000)]
am
3fe170c5: Merge "Add support for prebuilt AARs." into lmp-mr1-ub-dev
* commit '
3fe170c51ea1eca253164fa8738ab42b5b9aaa6b':
Add support for prebuilt AARs.
Ying Wang [Mon, 3 Nov 2014 18:04:39 +0000 (18:04 +0000)]
Merge "Add support for prebuilt AARs." into lmp-mr1-ub-dev
Dirk Dougherty [Mon, 3 Nov 2014 18:03:48 +0000 (18:03 +0000)]
am
7d25b7d3: am
b6dfc2d2: am
963afcbb: am
9b7f8f20: Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
* commit '
7d25b7d346a6b855f708d90236aeee59ba6ddbe2':
Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
Dirk Dougherty [Mon, 3 Nov 2014 17:58:57 +0000 (17:58 +0000)]
am
b6dfc2d2: am
963afcbb: am
9b7f8f20: Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
* commit '
b6dfc2d2f7a92536b72bd55ed8a7829d7f7b41fa':
Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
Dirk Dougherty [Mon, 3 Nov 2014 17:53:28 +0000 (17:53 +0000)]
am
963afcbb: am
9b7f8f20: Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
* commit '
963afcbb501d8757f049b25f5068313ee63ce4e8':
Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
Dan Albert [Mon, 3 Nov 2014 17:45:22 +0000 (17:45 +0000)]
am
17c0e737: am
ce915d95: Merge "Never use ASAN for acp."
* commit '
17c0e737047dcfa74cbd2386660b67bcde284f4c':
Never use ASAN for acp.
Dirk Dougherty [Mon, 3 Nov 2014 17:43:20 +0000 (17:43 +0000)]
am
9b7f8f20: Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
* commit '
9b7f8f20ac58133af551bc89e5f065a4e0f77103':
Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
Dan Albert [Mon, 3 Nov 2014 17:40:31 +0000 (17:40 +0000)]
am
ce915d95: Merge "Never use ASAN for acp."
* commit '
ce915d950aaea86e566c8aec06be181a65c17cf2':
Never use ASAN for acp.
Dan Albert [Mon, 3 Nov 2014 17:36:13 +0000 (17:36 +0000)]
Merge "Never use ASAN for acp."
Nick Kralevich [Sun, 2 Nov 2014 16:53:29 +0000 (16:53 +0000)]
am
e4cbc2af: Merge "Revert "Add support for prebuilt AARs."" into lmp-mr1-ub-dev
* commit '
e4cbc2af5f476d9eb875253584260bed807acddf':
Revert "Add support for prebuilt AARs."
Ying Wang [Wed, 29 Oct 2014 22:48:32 +0000 (15:48 -0700)]
Add support for prebuilt AARs.
- You can give a .aar as source file to a prebuilt static Java library
module. The build system will set up dependencies and rules to extract
classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
The build system will set up rules to merge the library's
AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
resource dirs and link/merge the AAR's classes.jar.
Bug:
18168693
Change-Id: Ic2c1d20572a93bd98dbc72f8a39e26b459e442c2
Nick Kralevich [Sun, 2 Nov 2014 05:15:26 +0000 (05:15 +0000)]
Merge "Revert "Add support for prebuilt AARs."" into lmp-mr1-ub-dev
Nick Kralevich [Sun, 2 Nov 2014 05:11:11 +0000 (05:11 +0000)]
Revert "Add support for prebuilt AARs."
master doesn't compile anymore.
This reverts commit
f56729250448200834c5c95c86c937e887d73623.
Change-Id: Icc16fe5360d1222740b803e9dd006081e3c66e46
Dirk Dougherty [Sun, 2 Nov 2014 00:08:56 +0000 (17:08 -0700)]
Doc change: start search suggestions at two characters instead of three, so that tv suggestions are enabled.
Change-Id: Ib7968010b0d0707a82ec51b1e63611628b8d465a
Dmitriy Ivanov [Sun, 2 Nov 2014 00:45:59 +0000 (00:45 +0000)]
am
4d5e8d4f: am
fd0f1c84: Replacement for gdbclient
* commit '
4d5e8d4f7c3460494a0d162e06515d2287c8cec4':
Replacement for gdbclient
Dmitriy Ivanov [Sun, 2 Nov 2014 00:42:26 +0000 (00:42 +0000)]
am
fd0f1c84: Replacement for gdbclient
* commit '
fd0f1c848f012f2e215f8246b154237c7d6c5132':
Replacement for gdbclient
Dmitriy Ivanov [Sat, 1 Nov 2014 02:24:53 +0000 (02:24 +0000)]
am
8d7f2e62: am
bd0e8af7: Merge "Replacement for gdbclient"
* commit '
8d7f2e6289ebb7e7d7a72cc3cf581b1e4ad23acf':
Replacement for gdbclient
Dmitriy Ivanov [Sat, 1 Nov 2014 01:17:51 +0000 (01:17 +0000)]
am
bd0e8af7: Merge "Replacement for gdbclient"
* commit '
bd0e8af734d5b6e28e2710bf53beb1b674e3fdb2':
Replacement for gdbclient
Dmitriy Ivanov [Fri, 31 Oct 2014 05:00:17 +0000 (22:00 -0700)]
Replacement for gdbclient
Differences between this implementation and the old one:
1. Resolves symbols/gdb based on device information (lunch
target is irrelevant)
2. Works with downloaded from build-server symbols
3. Does not require user to specify exe file - detects it automatically
Bug:
18208329
(cherry picked from commit
9b8e4b377208db6d405bc84e9af73bd37f75a93c)
Change-Id: I13ae2debb6e2d827b9aa55e93864b5d60c2bd32e
Dmitriy Ivanov [Sat, 1 Nov 2014 01:13:38 +0000 (01:13 +0000)]
Merge "Replacement for gdbclient"
Dmitriy Ivanov [Fri, 31 Oct 2014 05:00:17 +0000 (22:00 -0700)]
Replacement for gdbclient
Differences between this implementation and the old one:
1. Resolves symbols/gdb based on device information (lunch
target is irrelevant)
2. Works with downloaded from build-server symbols
3. Does not require user to specify exe file - detects it automatically
Change-Id: I4e7ce0a51868634593a9f104fe3f2fa67b54ca9f
Igor Murashkin [Sat, 1 Nov 2014 00:33:07 +0000 (00:33 +0000)]
am
e1ab1b5e: am
4c93719e: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into lmp-mr1-dev
* commit '
e1ab1b5e47cd464d39e406b982b26dd755f2def6':
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
Ying Wang [Sat, 1 Nov 2014 00:32:31 +0000 (00:32 +0000)]
am
5ba418c0: am
be6a3db2: Merge "Introduce per-product per-module dex-preopt config" into lmp-mr1-dev
* commit '
5ba418c00a92e6c3c610750ab85b7a9c8b67f711':
Introduce per-product per-module dex-preopt config
Dan Albert [Fri, 31 Oct 2014 23:30:26 +0000 (16:30 -0700)]
Never use ASAN for acp.
Since acp is needed to build the ASAN libs, we can't use ASAN to
instrument it. Since libhost is included statically in acp, we can't
instrument that either.
Change-Id: Idb389df945380b6ef447fc3d3ead8be27ec09011
Iliyan Malchev [Fri, 31 Oct 2014 22:59:59 +0000 (22:59 +0000)]
am
2b756f79: am
248f4d53: envsetup.sh: add functions to enable and generate core dumps
* commit '
2b756f79461c3cc5c227dc83e6dd3f360ad3f247':
envsetup.sh: add functions to enable and generate core dumps
Igor Murashkin [Fri, 31 Oct 2014 22:44:15 +0000 (22:44 +0000)]
am
4c93719e: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into lmp-mr1-dev
* commit '
4c93719e3010d39c212e73c975a27ec76d4c1fb0':
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
Igor Murashkin [Fri, 31 Oct 2014 22:36:42 +0000 (22:36 +0000)]
Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files" into lmp-mr1-dev
Ying Wang [Fri, 31 Oct 2014 21:48:56 +0000 (21:48 +0000)]
am
be6a3db2: Merge "Introduce per-product per-module dex-preopt config" into lmp-mr1-dev
* commit '
be6a3db20b5d2242bc3b459c5b69b1d8ef86aa54':
Introduce per-product per-module dex-preopt config
Ying Wang [Fri, 31 Oct 2014 21:42:48 +0000 (21:42 +0000)]
Merge "Introduce per-product per-module dex-preopt config" into lmp-mr1-dev
Igor Murashkin [Thu, 30 Oct 2014 23:08:07 +0000 (16:08 -0700)]
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
When WITH_DEXPREOPT=true is set, if we also set WITH_DEXPREOPT_PIC=true
then the build will generate position-independent OAT images.
This means that all the system applications no longer need to be
relocated into /data/dalvik-cache and this can achieve saving disk space
at the cost of slightly slower running code.
Bug:
18035729
Change-Id: Ifd517c842f48bf31568bf5ff56667298d422c2c0
Iliyan Malchev [Fri, 31 Oct 2014 21:02:59 +0000 (21:02 +0000)]
am
248f4d53: envsetup.sh: add functions to enable and generate core dumps
* commit '
248f4d53b306bd3baddb1534d3d06076460e83d4':
envsetup.sh: add functions to enable and generate core dumps
Iliyan Malchev [Wed, 29 Oct 2014 01:00:42 +0000 (18:00 -0700)]
envsetup.sh: add functions to enable and generate core dumps
The shell functions in this patch enable crashing processes with the core limit
set correctly to dump core in directory /cores. They do so by remounting the
root partition, which is RAM-backed, and by creating the 0777-chmodded /cores
under it. They also set the core file pattern in /proc/sys/kernel/core_pattern
to be /cores/core.%p, such that a core dump will have the crashing process' PID
appended to it. You enable core-dump generation once per boot, as follows:
coredump-setup
If a process does not have its core-size rlimit set (as most do not), you can
either set it manually by typing "adb shell prlimit <pid> 4 -1 -1", or by
typing coredump-enable <name>, e.g.
coredump-enable $(pid mediaserver)
Alternatively, you can cause a running process to dump core by sending it a
SIGSEGV via the shell function core <name>, e.g.:
core $(pid mediaserver)
Change-Id: Ib174e7ee95515fb9866fa6bf0d5b5bf23f3ec61b
Signed-off-by: Iliyan Malchev <malchev@google.com>
Nick Kralevich [Fri, 31 Oct 2014 18:34:12 +0000 (18:34 +0000)]
am
54e18379: am
36084e64: Merge "Label goldfish block devices with their own types."
* commit '
54e1837910cb3c40d22436bc40a7c0469df184b0':
Label goldfish block devices with their own types.
Nick Kralevich [Fri, 31 Oct 2014 18:31:34 +0000 (18:31 +0000)]
am
36084e64: Merge "Label goldfish block devices with their own types."
* commit '
36084e64a1b603f0ca848bba5ca91938f853dc4c':
Label goldfish block devices with their own types.
Nick Kralevich [Fri, 31 Oct 2014 18:27:17 +0000 (18:27 +0000)]
Merge "Label goldfish block devices with their own types."
Stephen Smalley [Fri, 31 Oct 2014 18:19:55 +0000 (14:19 -0400)]
Label goldfish block devices with their own types.
This assigns block device types as per device/generic/goldfish/fstab.goldfish.
Eliminates (permissive) avc: denied messages for fsck.
Change-Id: Ia72bdfb16975f051548b6b2c0636e4f907295789
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Nick Kralevich [Fri, 31 Oct 2014 17:40:47 +0000 (17:40 +0000)]
am
4fe702e4: am
dfa2f8a6: Merge "Mark qemu_device as a mlstrustedobject."
* commit '
4fe702e4dcf5ff3e6dcc4dea1e842d7977ff3393':
Mark qemu_device as a mlstrustedobject.
Nick Kralevich [Fri, 31 Oct 2014 17:36:28 +0000 (17:36 +0000)]
am
dfa2f8a6: Merge "Mark qemu_device as a mlstrustedobject."
* commit '
dfa2f8a6e309bca516a11d83abd1aa8733acce69':
Mark qemu_device as a mlstrustedobject.
Nick Kralevich [Fri, 31 Oct 2014 17:30:14 +0000 (17:30 +0000)]
Merge "Mark qemu_device as a mlstrustedobject."
Stephen Smalley [Fri, 31 Oct 2014 17:28:09 +0000 (13:28 -0400)]
Mark qemu_device as a mlstrustedobject.
Allow apps running with any level to write to it.
Change-Id: I8fca1f377e14c624db5273bdacf8400addc6210d
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Ying Wang [Wed, 8 Oct 2014 01:07:23 +0000 (18:07 -0700)]
Introduce per-product per-module dex-preopt config
- Added LOCAL_DEX_PREOPT_FLAGS to pass extra flags to dex2oat.
- Added macro add-product-dex-preopt-module-config to specify almost
arbitrary dex-preopt config/flags to modules in product
configuration:
$(call \
add-product-dex-preopt-module-config,<module_name_list>,<config_or_flags>)
How <config_or_flags> is interpreted is decided by
dex_preopt_odex_install.mk and dex2oat. For now if it's "disable" we
disable dexpreopt for the given modules; otherwise pass it to dex2oat as
command line flags.
- If there are multiple configs for the same module in the product
inheritance, the first takes precedence.
- Added PRODUCT_DEX_PREOPT_DEFAULT_FLAGS so you can specify default
dex2oat flags in product configuration.
- Added PRODUCT_DEX_PREOPT_BOOT_FLAGS to specify flags of building boot.oat.
Bug:
17791867
(cherry picked from commit
20ebd2ef081f2a3e85a4adcf8837e6f5b68bdeea)
Change-Id: I2ee36892b40655c96837ee7a663dda1d25830878
Ying Wang [Fri, 31 Oct 2014 00:13:50 +0000 (00:13 +0000)]
am
f5672925: Add support for prebuilt AARs.
* commit '
f56729250448200834c5c95c86c937e887d73623':
Add support for prebuilt AARs.
Ying Wang [Thu, 30 Oct 2014 23:46:08 +0000 (23:46 +0000)]
am
7f18adc2: am
871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags."
* commit '
7f18adc240ca311d225ee9164e6d982f9a005d62':
Add -fcolor-diagnostics to global clang cflags.
Ying Wang [Thu, 30 Oct 2014 23:43:02 +0000 (23:43 +0000)]
am
871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags."
* commit '
871b8df128b144f39d40889e463722a032c4d246':
Add -fcolor-diagnostics to global clang cflags.
Ying Wang [Thu, 30 Oct 2014 21:18:02 +0000 (21:18 +0000)]
Merge "Add -fcolor-diagnostics to global clang cflags."
Ying Wang [Thu, 30 Oct 2014 19:22:29 +0000 (12:22 -0700)]
Add -fcolor-diagnostics to global clang cflags.
Bug:
18187181
Change-Id: Ifcbe34b685b1dfd7ffc801bcdad7bd8208e45f86
Michael Runge [Thu, 30 Oct 2014 19:01:43 +0000 (19:01 +0000)]
am
63f01de8: Add post-install verification phase
automerge:
c9594af
* commit '
c9594afa930e5400d35bbf24a17cb9be8d978888':
Add post-install verification phase
Chih-hung Hsieh [Thu, 30 Oct 2014 16:08:20 +0000 (16:08 +0000)]
am
51e55c1d: Revert "Continue to use march=i686 before fix of g++ ICE."
* commit '
51e55c1d22576de38ca4b65deaded7b3a1af8387':
Revert "Continue to use march=i686 before fix of g++ ICE."
Chih-hung Hsieh [Thu, 30 Oct 2014 01:55:45 +0000 (01:55 +0000)]
Revert "Continue to use march=i686 before fix of g++ ICE."
This reverts commit
f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b.
Change-Id: I3e1b18cf342e747c8a8405f1fc2513e5ebafc4b6
Ying Wang [Wed, 29 Oct 2014 22:48:32 +0000 (15:48 -0700)]
Add support for prebuilt AARs.
- You can give a .aar as source file to a prebuilt static Java library
module. The build system will set up dependencies and rules to extract
classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
The build system will set up rules to merge the library's
AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
resource dirs and link/merge the AAR's classes.jar.
Bug:
18168693
Change-Id: I478913d5d498f800b322529d7c2c2c0ea78425e5
Chih-Hung Hsieh [Wed, 29 Oct 2014 22:07:26 +0000 (22:07 +0000)]
am
f70f009c: Continue to use march=i686 before fix of g++ ICE.
* commit '
f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b':
Continue to use march=i686 before fix of g++ ICE.
Chih-Hung Hsieh [Wed, 29 Oct 2014 21:46:15 +0000 (14:46 -0700)]
Continue to use march=i686 before fix of g++ ICE.
BUG:
18174291
BUG:
18171557
Change-Id: Ica9e420e3cc1904a4298e2ab1c6201a254cbf6d1
Jeff Davidson [Wed, 29 Oct 2014 20:42:11 +0000 (20:42 +0000)]
am
ed9981d9: am
427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."
* commit '
ed9981d927cb24b106df9b3c350b6b63e570026f':
Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
Ian Rogers [Wed, 29 Oct 2014 19:43:16 +0000 (19:43 +0000)]
am
508e27bf: am
93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '
508e27bfd7f470a945978c2b24403b0827dcde18':
Specify -mcpu=krait for clang.
Michael Runge [Wed, 29 Oct 2014 18:51:51 +0000 (18:51 +0000)]
am
63f01de8: Add post-install verification phase
* commit '
63f01de81892aa4e40b517464b3d9ca7db666c9d':
Add post-install verification phase
Jeff Davidson [Wed, 29 Oct 2014 17:40:05 +0000 (17:40 +0000)]
am
427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."
* commit '
427d1e98eceb78f5cb8f1e50d00d342fc7f359c6':
Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
Jeff Davidson [Wed, 29 Oct 2014 17:35:16 +0000 (17:35 +0000)]
Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."
Neil Fuller [Wed, 29 Oct 2014 17:11:52 +0000 (17:11 +0000)]
am
acd65c7d: am
97ef1d46: Merge "Add OpenJDK 8 experimental support"
* commit '
acd65c7db0212bff2b7b1878a26b7a105522cd44':
Add OpenJDK 8 experimental support
Chih-Hung Hsieh [Wed, 29 Oct 2014 17:11:51 +0000 (17:11 +0000)]
am
736a146c: am
717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
* commit '
736a146c3c44b6b753e0b7866d3f0f43e9be76e5':
Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
Dan Albert [Wed, 29 Oct 2014 17:11:50 +0000 (17:11 +0000)]
am
ef8912d9: am
d274e04a: Merge "Don\'t sort shared library link order."
* commit '
ef8912d93f5ca3722d761da6c0b0f05e2480a41d':
Don't sort shared library link order.
Chih-Hung Hsieh [Wed, 29 Oct 2014 17:11:49 +0000 (17:11 +0000)]
am
6555580d: am
ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit '
6555580d35ac570005923866fb4035265a0b5b98':
Raise x86 arch requirement to prescott.
Neil Fuller [Wed, 29 Oct 2014 17:11:24 +0000 (17:11 +0000)]
am
f7ce9508: am
4dfda1fa: Merge "Remove Java 6 build support"
* commit '
f7ce9508dec85c67d3a2ebe84db073a01355eba5':
Remove Java 6 build support
Chih-Hung Hsieh [Wed, 29 Oct 2014 16:42:52 +0000 (16:42 +0000)]
am
54fd82d1: am
660f3c9a: Merge "Set default to Clang integrated assembler."
* commit '
54fd82d111113c7969052cd315cc71bd31b4e161':
Set default to Clang integrated assembler.
Ian Rogers [Wed, 29 Oct 2014 12:32:37 +0000 (12:32 +0000)]
am
93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '
93cb8c7d951b89eeb1e3cee2433bffecc13fdb11':
Specify -mcpu=krait for clang.
Bill Yi [Wed, 29 Oct 2014 07:01:01 +0000 (07:01 +0000)]
am
4ac049b7: (-s ours) Restore AOSP-style version numbers - DO NOT MERGE
* commit '
4ac049b7ec188161dccf6fa9b1f23c76f8330857':
Restore AOSP-style version numbers - DO NOT MERGE
Michael Runge [Wed, 29 Oct 2014 02:24:19 +0000 (19:24 -0700)]
Add post-install verification phase
Verify the SHA sum of all patched and extracted files after
a file system remount.
Bug:
18145574
Change-Id: I2f053d085543e10e39153a774542d37ee0a238bd
Ian Rogers [Tue, 28 Oct 2014 23:03:36 +0000 (23:03 +0000)]
Merge "Specify -mcpu=krait for clang."
Ian Rogers [Tue, 28 Oct 2014 22:50:02 +0000 (15:50 -0700)]
Specify -mcpu=krait for clang.
Change-Id: I64682cddf57246341c1727ca16c56f7ce0c6fd0a
Adam Lesinski [Tue, 28 Oct 2014 18:09:11 +0000 (18:09 +0000)]
Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev
automerge:
708e021
* commit '
708e021a319eea4cb549a73745fafb9467776fcf':
Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings
Adam Lesinski [Tue, 28 Oct 2014 17:41:29 +0000 (17:41 +0000)]
Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev
Neil Fuller [Tue, 28 Oct 2014 04:50:49 +0000 (04:50 +0000)]
am
97ef1d46: Merge "Add OpenJDK 8 experimental support"
* commit '
97ef1d46cdae3776e49900b2ed92748f6127bbb0':
Add OpenJDK 8 experimental support
Chih-Hung Hsieh [Tue, 28 Oct 2014 04:48:54 +0000 (04:48 +0000)]
am
717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
* commit '
717ebfc13182202ab38e17c0cd008924e9e5c4e9':
Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
Dan Albert [Tue, 28 Oct 2014 04:46:53 +0000 (04:46 +0000)]
am
d274e04a: Merge "Don\'t sort shared library link order."
* commit '
d274e04ac4317d7cfc2de02ca215e064c018c234':
Don't sort shared library link order.
Chih-Hung Hsieh [Tue, 28 Oct 2014 04:46:49 +0000 (04:46 +0000)]
am
ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit '
ea503d21c7d5ecb3deacbf50f3ec7366bf7bd573':
Raise x86 arch requirement to prescott.