Dan Albert
08f911a7e9
am 35a8ae7b: am 8427c587: Merge "Make TSAN easier to use."
...
* commit '35a8ae7b734b18740c40d44983ad2536541a2c09':
Make TSAN easier to use.
2015-07-30 19:02:27 +00:00
Dan Albert
35a8ae7b73
am 8427c587: Merge "Make TSAN easier to use."
...
* commit '8427c5878c56c96b9384a89cb6dc00e30cd5bbfa':
Make TSAN easier to use.
2015-07-30 18:55:24 +00:00
Dan Albert
8427c5878c
Merge "Make TSAN easier to use."
2015-07-30 18:44:19 +00:00
Elliott Hughes
3ff1267d9d
am 1341e88c: am 524a7e46: Merge "Remove HAVE_WINSOCK."
...
* commit '1341e88c575a87bf1f4a05871fed78fad0fbe797':
Remove HAVE_WINSOCK.
2015-07-30 17:38:38 +00:00
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
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
7f80a9ed44
Remove the now-empty darwin AndroidConfig.h.
...
Change-Id: Icdbb06514c099653923aae936c31abfbaeaccf7a
2015-07-30 09:16:01 -07: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
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
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
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
45e2a12bd7
Remove OS_PATH_SEPARATOR from AndroidConfig.h.
...
Change-Id: I4143be14e5117526bfa98d83e246cc4360209c13
2015-07-29 15:31:39 -07: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
Ying Wang
0c0b2e659f
Merge "Use unmodified MAKECMDGOALS in ninja.mk."
2015-07-29 21:59:42 +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
Miao Wang
fbfa983a59
am 88618b8e: am 73f967b7: am b7a3bc56: am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev
...
* commit '88618b8ee98f6861cc4533a8c8e1b52c4017d52b':
[RenderScript] Only upgrade RS target API for compat build.
2015-07-29 20:09:50 +00:00
Ian Pedowitz
d1597242c8
am 2770497a: am 3a6d1290: am 9e8d2278: am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
...
* commit '2770497a394c244c19d085decc42aa1979b36143':
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
2015-07-29 19:47:48 +00:00
Miao Wang
b7a3bc569c
am fbf80e9d: Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev
...
* commit 'fbf80e9d6294c9ab1989572faab888e4f8641b1c':
[RenderScript] Only upgrade RS target API for compat build.
2015-07-29 19:23:45 +00:00
Ying Wang
bb1da5e614
Use unmodified MAKECMDGOALS in ninja.mk.
...
The build system removes targets like "PRODUCT-full-eng" from
MAKECMDGOALS in build/core/product_config.mk.
Without this change, such target isn't passed to kati.
Change-Id: I0b3949ed1f5557445d7f5d5bd59b7875c0b2ea7f
2015-07-29 12:21:54 -07:00
Miao Wang
c2dd225a9f
am 473a832d: am 489d3ea7: am 1a30e036: am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
...
* commit '473a832dc4f32239663b3b370fc5847e86f4a208':
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
2015-07-29 19:13:16 +00:00
Miao Wang
fbf80e9d62
Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev
2015-07-29 19:07:48 +00:00
Ian Pedowitz
9e8d227861
am 96585b06: Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
...
* commit '96585b06dfb29023adc7097423c9ef266d13ac30':
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
2015-07-29 19:00:02 +00:00
Ian Pedowitz
96585b06df
Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
2015-07-29 18:48:26 +00:00
Miao Wang
a11f6c2f0e
[RenderScript] Only upgrade RS target API for compat build.
...
- Fix build
Bug: 22796994
Bug: 22693954
Change-Id: Iff91cc4691ea3e4cd8542cdf38245e2aa7724a71
2015-07-29 11:46:23 -07:00
Miao Wang
1a30e03641
am 302e944c: [RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
...
* commit '302e944c6034060eb7ff51ea2a3abe740cf2c9b7':
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
2015-07-29 18:05:06 +00:00
Ying Wang
0ecf31262e
am 43275b9a: am d864f439: Merge "Remove from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set."
...
* commit '43275b9af5bfe338464a6839b9fd33285b22704c':
Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set.
2015-07-29 17:41:18 +00:00
Ian Pedowitz
db042bdccd
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
...
Change-Id: I5a0ec062c2893bf1ac7fbec3ce98953283efcaf7
2015-07-29 10:37:24 -07:00
Ying Wang
43275b9af5
am d864f439: Merge "Remove from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set."
...
* commit 'd864f43932cb0da10837efb0da270af4cbfc0f91':
Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set.
2015-07-29 17:21:15 +00:00
Ying Wang
d864f43932
Merge "Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set."
2015-07-29 16:59:50 +00:00
Elliott Hughes
86b9fcb9a4
am 8a5a0356: am d3fd73f1: Merge "Remove HAVE_WINDOWS_PATHS."
...
* commit '8a5a0356e8340ae7dce38d1bc346eb7675cf3f41':
Remove HAVE_WINDOWS_PATHS.
2015-07-29 16:25:52 +00:00
Elliott Hughes
8a5a0356e8
am d3fd73f1: Merge "Remove HAVE_WINDOWS_PATHS."
...
* commit 'd3fd73f157524fcc369a3c99de580d3598640ed8':
Remove HAVE_WINDOWS_PATHS.
2015-07-29 16:13:01 +00:00
Elliott Hughes
b15b512825
Remove HAVE_WINDOWS_PATHS.
...
Change-Id: I11284ceddf08eb284af56360f0cf80f4725c98e9
2015-07-29 08:45:40 -07:00
Miao Wang
302e944c60
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
...
Bug: 22796994
Bug: 22693954
This change fixes the RS_PREBUILT_LIBPATH when used with 64-bit target
devices. It also fixes an issue where the target RenderScript API is
below 21 for 64-bit compilation. In those cases, we should always
upconvert it to 21 (since that is the first available 64-bit release).
Change-Id: I27e9d0bd5c01bac0b3b28e9002333264a55d628f
2015-07-28 19:30:20 -07:00
Tao Bao
7eddd6285f
resolved conflicts for merge of 910d3822
to mnc-dr-dev-plus-aosp
...
Change-Id: I2c899be9d6a82664e4d14c903311daeed5e546fd
2015-07-28 16:58:03 -07:00