Gina Dimino
12c64538ac
am a5bacf6e
: am 44c5e346
: Merge "Docs: Add Google Feedback link to the footer for SAC pages."
...
* commit 'a5bacf6e0c21c459e94f2e91a40aa60ee05bc382':
Docs: Add Google Feedback link to the footer for SAC pages.
2015-07-31 19:01:38 +00:00
Gina Dimino
a5bacf6e0c
am 44c5e346
: Merge "Docs: Add Google Feedback link to the footer for SAC pages."
...
* commit '44c5e346cbf3fc2313699f142c6e17b9ef915aec':
Docs: Add Google Feedback link to the footer for SAC pages.
2015-07-31 18:53:28 +00:00
Gina Dimino
44c5e346cb
Merge "Docs: Add Google Feedback link to the footer for SAC pages."
2015-07-31 18:47:20 +00:00
Dianne Hackborn
59382b54b6
am 56866c4d
: Merge "Remove M codename, version number is 6.0." into mnc-dev
...
* commit '56866c4d0e31bbc65e333754bb69accb2b0f4a36':
Remove M codename, version number is 6.0.
2015-07-31 17:47:37 +00:00
Dianne Hackborn
56866c4d0e
Merge "Remove M codename, version number is 6.0." into mnc-dev
2015-07-31 17:37:50 +00:00
Tao Bao
c5bd8c29d6
resolved conflicts for merge of bbb41a70
to mnc-dev-plus-aosp
...
Change-Id: I250c007de89a52f8911cf56d7dfded38962284ac
2015-07-31 09:58:03 -07:00
Tao Bao
bbb41a7097
am bcd7ae6f
: Merge "build: Fix "adb shell" in recovery for system_root_image."
...
* commit 'bcd7ae6f30149a2296d7288c74ffe6c90188f93d':
build: Fix "adb shell" in recovery for system_root_image.
2015-07-31 16:49:30 +00:00
Tao Bao
bcd7ae6f30
Merge "build: Fix "adb shell" in recovery for system_root_image."
2015-07-31 16:43:59 +00:00
Tao Bao
be46a54589
build: Fix "adb shell" in recovery for system_root_image.
...
For system images that contain the root directory, "adb shell" in
recovery stops working if the image is mounted at "/system", because
sh now locates at /system/system/bin/sh. We fix the issue by mounting
the image on /system_root and create a symlink to /system_root/system
for /system.
Bug: 22855115
Change-Id: Ia6b257b75aeb67687c3909063d1725a23a5ccd60
2015-07-30 16:44:17 -07:00
Gina Dimino
f9a5ae53ce
Docs: Add Google Feedback link to the footer for SAC pages.
...
Bug: 8906018
Change-Id: Id53b8a4421e01cef0ea1609efde1e29eb2a50f47
2015-07-30 13:54:48 -07:00
Tony Mantler
8e25a77e08
am 5915e57d
: Merge "Add support preference libraries to docs build" into mnc-dev
...
* commit '5915e57db504914c02d36e8f8cc18767c40f9c2d':
Add support preference libraries to docs build
2015-07-30 20:04:04 +00:00
Tony Mantler
5915e57db5
Merge "Add support preference libraries to docs build" into mnc-dev
2015-07-30 19:56:08 +00:00
Dan Albert
8ee4d2738c
am 35a8ae7b
: am 8427c587
: Merge "Make TSAN easier to use."
...
* commit '35a8ae7b734b18740c40d44983ad2536541a2c09':
Make TSAN easier to use.
2015-07-30 19:02:14 +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
Tony Mantler
c8b469aec5
Add support preference libraries to docs build
...
b/22795957
Change-Id: Ia8e02fd7726102f524a16f2f84e9c2bdd4d37f8f
2015-07-30 11:22:24 -07:00
Elliott Hughes
6bec3e3aaa
am 1341e88c
: am 524a7e46
: Merge "Remove HAVE_WINSOCK."
...
* commit '1341e88c575a87bf1f4a05871fed78fad0fbe797':
Remove HAVE_WINSOCK.
2015-07-30 17:37:37 +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
d82ef18a0e
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:10 +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
325867c920
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:10:25 +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
4a7a6c9a68
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:44:33 +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
fc07346366
am bb369efd
: am 1a5a615a
: Merge "Update mac_sdk_versions_supported."
...
* commit 'bb369efdf8e09f4fea2e2d2f835266ad8148bc0d':
Update mac_sdk_versions_supported.
2015-07-30 01:06:24 +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
dc858cee0c
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:15:36 +00:00
Ying Wang
72a8e48b56
am ac6e6b34
: am 0c0b2e65
: Merge "Use unmodified MAKECMDGOALS in ninja.mk."
...
* commit 'ac6e6b347b49b4c15df1f1b2869f2c386f2755d6':
Use unmodified MAKECMDGOALS in ninja.mk.
2015-07-30 00:15:31 +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
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
Simon Wilson
f9d45ed57b
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:03:56 +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
Tao Bao
72dc7d465a
am 8eb7f45a
: am 4ac8e059
: Merge "Read fstab from the source build."
...
* commit '8eb7f45a45132cfb39258b383f8ed06c7c4212ce':
Read fstab from the source build.
2015-07-29 21:53:37 +00:00
Tao Bao
29d6fb24d7
am cce673b6
: Read fstab from the source build.
...
* commit 'cce673b675fadb9e509779cec838a1b545126cc4':
Read fstab from the source build.
2015-07-29 21:49:32 +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