Elliott Hughes
1341e88c57
am 524a7e46: Merge "Remove HAVE_WINSOCK."
...
* commit '524a7e46937c59cfb34289819fd3ac117911cd8d':
Remove HAVE_WINSOCK.
2015-07-30 17:31:47 +00:00
Elliott Hughes
524a7e4693
Merge "Remove HAVE_WINSOCK."
2015-07-30 17:24:06 +00:00
Dan Albert
a6311b7212
Make TSAN easier to use.
...
TSAN is not supported on 32-bit architectures. For non-multilib cases,
make its use an error. For multilib cases, don't use it for the 32-bit
case.
Change-Id: I8e40be4002379cc2c9aa98ab8b812b337d6e077e
2015-07-30 10:17:33 -07:00
Elliott Hughes
0b2f643aa7
am cdb8a9ac: am 49f80c6f: am 51e2e589: Merge "Remove the now-empty darwin AndroidConfig.h."
...
* commit 'cdb8a9acaddc8dcc69b5af9282d31b73df957e59':
Remove the now-empty darwin AndroidConfig.h.
2015-07-30 16:38:59 +00:00
Elliott Hughes
cdb8a9acad
am 49f80c6f: am 51e2e589: Merge "Remove the now-empty darwin AndroidConfig.h."
...
* commit '49f80c6f3795a4f3a888ca80e15b15204f4b61b5':
Remove the now-empty darwin AndroidConfig.h.
2015-07-30 16:32:56 +00:00
Elliott Hughes
49f80c6f37
am 51e2e589: Merge "Remove the now-empty darwin AndroidConfig.h."
...
* commit '51e2e5893d5bcf62d12e041a60ed99f2a03758be':
Remove the now-empty darwin AndroidConfig.h.
2015-07-30 16:25:10 +00:00
Elliott Hughes
51e2e5893d
Merge "Remove the now-empty darwin AndroidConfig.h."
2015-07-30 16:19:25 +00:00
Elliott Hughes
7f80a9ed44
Remove the now-empty darwin AndroidConfig.h.
...
Change-Id: Icdbb06514c099653923aae936c31abfbaeaccf7a
2015-07-30 09:16:01 -07:00
Elliott Hughes
af8574db2e
am c73b8a80: am 4887ee3b: am cf427fb4: Merge "Don\'t define S_IRGRP in AndroidConfig.h."
...
* commit 'c73b8a80d421356b1389c1e45deba641ae12c423':
Don't define S_IRGRP in AndroidConfig.h.
2015-07-30 04:24:07 +00:00
Elliott Hughes
c73b8a80d4
am 4887ee3b: am cf427fb4: Merge "Don\'t define S_IRGRP in AndroidConfig.h."
...
* commit '4887ee3bdd6c1333b339eefee6d5f09300bbe14b':
Don't define S_IRGRP in AndroidConfig.h.
2015-07-30 04:12:52 +00:00
Elliott Hughes
b91d45e808
am 11d02d84: am 24ed450a: am f07ddab1: Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS."
...
* commit '11d02d84097d0341dc53865060d417abb6872687':
Remove global Windows __BEGIN_DECLS/__END_DECLS.
2015-07-30 04:00:16 +00:00
Elliott Hughes
4887ee3bdd
am cf427fb4: Merge "Don\'t define S_IRGRP in AndroidConfig.h."
...
* commit 'cf427fb4ae19449d0c0ecbc86b88f37b5fcb0f05':
Don't define S_IRGRP in AndroidConfig.h.
2015-07-30 03:58:47 +00:00
Elliott Hughes
11d02d8409
am 24ed450a: am f07ddab1: Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS."
...
* commit '24ed450ad949ea06ac8cf1ecb0e8713c78edacfa':
Remove global Windows __BEGIN_DECLS/__END_DECLS.
2015-07-30 03:45:23 +00:00
Elliott Hughes
cf427fb4ae
Merge "Don't define S_IRGRP in AndroidConfig.h."
2015-07-30 03:43:38 +00:00
Elliott Hughes
24ed450ad9
am f07ddab1: Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS."
...
* commit 'f07ddab187df78a7be32289506f5eca051339f75':
Remove global Windows __BEGIN_DECLS/__END_DECLS.
2015-07-30 03:32:29 +00:00
Elliott Hughes
f07ddab187
Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS."
2015-07-30 03:20:36 +00:00
Elliott Hughes
61c94258b1
Remove global Windows __BEGIN_DECLS/__END_DECLS.
...
Change-Id: Ic1ba634a0376c9c1b484098b4ca41cf7659f06b1
2015-07-29 20:14:59 -07:00
Elliott Hughes
47b557a9ca
Don't define S_IRGRP in AndroidConfig.h.
...
Nothing seems to be relying on this anyway.
Change-Id: I24e2509e4d24bc445961430bb74f8ca04135bc37
2015-07-29 19:26:39 -07:00
Elliott Hughes
1de24c7f64
Remove HAVE_WINSOCK.
...
Change-Id: I362451b68775de0216c5b8736f5cc16a7933b6c2
2015-07-29 19:05:24 -07:00
Ying Wang
b0ee825693
am 3ae86507: am bb369efd: am 1a5a615a: Merge "Update mac_sdk_versions_supported."
...
* commit '3ae86507ef380316397223e1c11abfc431e3cfad':
Update mac_sdk_versions_supported.
2015-07-30 01:17:43 +00:00
Ying Wang
3ae86507ef
am bb369efd: am 1a5a615a: Merge "Update mac_sdk_versions_supported."
...
* commit 'bb369efdf8e09f4fea2e2d2f835266ad8148bc0d':
Update mac_sdk_versions_supported.
2015-07-30 01:05:31 +00:00
Ying Wang
bb369efdf8
am 1a5a615a: Merge "Update mac_sdk_versions_supported."
...
* commit '1a5a615a7b167e4232f3185eef72a7e5b44aef34':
Update mac_sdk_versions_supported.
2015-07-30 00:51:24 +00:00
Ying Wang
1a5a615a7b
Merge "Update mac_sdk_versions_supported."
2015-07-30 00:37:38 +00:00
Ying Wang
d1123ff4c5
Update mac_sdk_versions_supported.
...
Now we requires Mac OS X SDK version at least 10.8.
Also removed the unnecessary sort call in getting
mac_sdk_versions_installed.
Lexical sort doesn't make sense when 10.10 is added to that list.
Actually the next makefile line makes sure we always get the first
match in $(mac_sdk_versions_supported):
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed),
$(mac_sdk_versions_supported)))
Bug: 22825165
Change-Id: I4bfafabb11f94b66704d4799fe61fe3f16429538
2015-07-29 17:36:38 -07:00
Elliott Hughes
c43e1b6f37
am 43245522: am 54307a26: am 1dbb4166: Merge "Remove OS_PATH_SEPARATOR from AndroidConfig.h."
...
* commit '432455224d1d1499f9c9cd57fcedd7ec0389629f':
Remove OS_PATH_SEPARATOR from AndroidConfig.h.
2015-07-30 00:30:12 +00:00
Ying Wang
4253434fed
am 9ed5072a: am ac6e6b34: am 0c0b2e65: Merge "Use unmodified MAKECMDGOALS in ninja.mk."
...
* commit '9ed5072a004c89bddfe0a370c4022ae7a30c3469':
Use unmodified MAKECMDGOALS in ninja.mk.
2015-07-30 00:30:11 +00:00
Elliott Hughes
432455224d
am 54307a26: am 1dbb4166: Merge "Remove OS_PATH_SEPARATOR from AndroidConfig.h."
...
* commit '54307a260998d3ba955349e7a1bf0192731598aa':
Remove OS_PATH_SEPARATOR from AndroidConfig.h.
2015-07-30 00:16:20 +00:00
Ying Wang
9ed5072a00
am ac6e6b34: am 0c0b2e65: Merge "Use unmodified MAKECMDGOALS in ninja.mk."
...
* commit 'ac6e6b347b49b4c15df1f1b2869f2c386f2755d6':
Use unmodified MAKECMDGOALS in ninja.mk.
2015-07-30 00:16:16 +00:00
Elliott Hughes
54307a2609
am 1dbb4166: Merge "Remove OS_PATH_SEPARATOR from AndroidConfig.h."
...
* commit '1dbb41661afdffb41ae346c44075507f1840bc66':
Remove OS_PATH_SEPARATOR from AndroidConfig.h.
2015-07-29 23:25:01 +00:00
Elliott Hughes
1dbb41661a
Merge "Remove OS_PATH_SEPARATOR from AndroidConfig.h."
2015-07-29 23:14:52 +00:00
Tao Bao
be532e0663
am d4cbfb13: am df7c215c: am bba2c512: am 15b42c42: am cce673b6: Read fstab from the source build.
...
* commit 'd4cbfb13d15c1e058ea5a412796d2561af1a4688':
Read fstab from the source build.
2015-07-29 22:46:58 +00:00
Tao Bao
d4cbfb13d1
am df7c215c: am bba2c512: am 15b42c42: am cce673b6: Read fstab from the source build.
...
* commit 'df7c215cd70926fab48003a846ce90ed908166df':
Read fstab from the source build.
2015-07-29 22:31:45 +00:00
Elliott Hughes
45e2a12bd7
Remove OS_PATH_SEPARATOR from AndroidConfig.h.
...
Change-Id: I4143be14e5117526bfa98d83e246cc4360209c13
2015-07-29 15:31:39 -07:00
Tao Bao
df7c215cd7
am bba2c512: am 15b42c42: am cce673b6: Read fstab from the source build.
...
* commit 'bba2c51264a21147f79f62762591afa93c965eb6':
Read fstab from the source build.
2015-07-29 22:23:26 +00:00
Simon Wilson
ff1ad84484
am bdeab20e: am 83da6007: am 37700c9a: Merge "Add compressor options for squashfs system images"
...
* commit 'bdeab20e7943591c6de5990322b92d767fa738ce':
Add compressor options for squashfs system images
2015-07-29 22:17:36 +00:00
Tao Bao
65ac6c75b4
am 17f8f368: am 8eb7f45a: am 4ac8e059: Merge "Read fstab from the source build."
...
* commit '17f8f3687511b00db66bb991c6388327fe6d66d0':
Read fstab from the source build.
2015-07-29 22:13:02 +00:00
Tao Bao
bba2c51264
am 15b42c42: am cce673b6: Read fstab from the source build.
...
* commit '15b42c426715c2221f49d0cf2181ba869b84bc94':
Read fstab from the source build.
2015-07-29 22:11:44 +00:00
Ying Wang
ac6e6b347b
am 0c0b2e65: Merge "Use unmodified MAKECMDGOALS in ninja.mk."
...
* commit '0c0b2e659fe52dc1901677b74dc390c52b1b5e3b':
Use unmodified MAKECMDGOALS in ninja.mk.
2015-07-29 22:11:39 +00:00
Simon Wilson
bdeab20e79
am 83da6007: am 37700c9a: Merge "Add compressor options for squashfs system images"
...
* commit '83da600792b38e93fe81826a3105c1137f8e2fe8':
Add compressor options for squashfs system images
2015-07-29 22:04:50 +00:00
Miao Wang
f0c021d9e8
am fbfa983a: am 88618b8e: am 73f967b7: am b7a3bc56: am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev
...
* commit 'fbfa983a5923c306bb690a84f2dda12ce0eb4b64':
[RenderScript] Only upgrade RS target API for compat build.
2015-07-29 22:04:18 +00:00
Ian Pedowitz
6b28b75e79
am d1597242: am 2770497a: am 3a6d1290: am 9e8d2278: am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
...
* commit 'd1597242c80ff6e45f33afd564681807c491e05b':
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
2015-07-29 22:03:43 +00:00
Miao Wang
13276144c2
am c2dd225a: am 473a832d: am 489d3ea7: am 1a30e036: am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
...
* commit 'c2dd225a9fdfb85a0de81389c471c074b870907f':
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
2015-07-29 22:03:10 +00:00
Ying Wang
0c0b2e659f
Merge "Use unmodified MAKECMDGOALS in ninja.mk."
2015-07-29 21:59:42 +00:00
Tao Bao
15b42c4267
am cce673b6: Read fstab from the source build.
...
* commit 'cce673b675fadb9e509779cec838a1b545126cc4':
Read fstab from the source build.
2015-07-29 21:58:06 +00:00
Tao Bao
17f8f36875
am 8eb7f45a: am 4ac8e059: Merge "Read fstab from the source build."
...
* commit '8eb7f45a45132cfb39258b383f8ed06c7c4212ce':
Read fstab from the source build.
2015-07-29 21:53:48 +00:00
Simon Wilson
83da600792
am 37700c9a: Merge "Add compressor options for squashfs system images"
...
* commit '37700c9ad19c8d9f8578604ca502cb6d55c22d99':
Add compressor options for squashfs system images
2015-07-29 21:53:37 +00:00
Simon Wilson
37700c9ad1
Merge "Add compressor options for squashfs system images"
2015-07-29 21:35:57 +00:00
Tao Bao
8eb7f45a45
am 4ac8e059: Merge "Read fstab from the source build."
...
* commit '4ac8e059bfd26a18fe3bcf2dfa3fdb60dfed824e':
Read fstab from the source build.
2015-07-29 21:34:48 +00:00
Tao Bao
cce673b675
Read fstab from the source build.
...
When creating incremental OTAs, we should always use the fstab from the
source build instead of the target.
Bug: 21948974
Change-Id: I8b6a18f64b412f782184f9d382544ed0ce093fb4
(cherry picked from commit dd24da9ec9
)
2015-07-29 14:30:08 -07:00
Dianne Hackborn
307631b057
Remove M codename, version number is 6.0.
...
Change-Id: I27b477f087b135232f14157123d31da04dee04d7
2015-07-29 14:22:51 -07:00