Daniel Rosenberg
b139ae078c
am 22354d3c
: Merge "Add support for system images that contain the root directory"
...
* commit '22354d3c496e2c21f873758d996878e68c2607bb':
Add support for system images that contain the root directory
2015-08-01 00:17:21 +00:00
Daniel Rosenberg
545f226db0
am 46afd7f9
: Merge "Add ro.build.system_root_image"
...
* commit '46afd7f981406e47740c46253aa16af1ab78eb9c':
Add ro.build.system_root_image
2015-08-01 00:12:59 +00:00
Daniel Rosenberg
22354d3c49
Merge "Add support for system images that contain the root directory"
2015-08-01 00:10:02 +00:00
Daniel Rosenberg
46afd7f981
Merge "Add ro.build.system_root_image"
2015-08-01 00:05:05 +00:00
Daniel Rosenberg
e6853b0d63
Add support for system images that contain the root directory
...
When the root directory is included in system, the assumption that
system is mounted at /system breaks down. Redirect /system to /
in that case.
Change-Id: I8031b32d7cb9ca699c1cc22939e28afce9d1c847
2015-07-31 16:52:21 -07:00
Daniel Rosenberg
59156a6b7d
Add ro.build.system_root_image
...
ro.build.system_root_image is true if the root directory is built
into the system image.
Change-Id: I17208ebd004c63aebb09db6c3e5f795619e73bd2
2015-07-31 16:52:21 -07:00
Dan Albert
4982ef9d76
am 010f652e
: Merge "Add system/core to the PYTHONPATH."
...
* commit '010f652ee7a9398f46b1c635c6bd186f7c7f8853':
Add system/core to the PYTHONPATH.
2015-07-31 20:54:56 +00:00
Dan Albert
010f652ee7
Merge "Add system/core to the PYTHONPATH."
2015-07-31 20:48:17 +00:00
Dan Albert
515ab1e2d1
Add system/core to the PYTHONPATH.
...
There's an adb Python interface now, and system/core needs to be in
the PYTHONPATH for `import adb` to find it.
Change-Id: I712767a2ba96cb017ce5857dc367e4cacf2ec51f
2015-07-31 13:38:47 -07: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
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
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
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
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
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
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
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
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
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
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
4ac8e059bf
Merge "Read fstab from the source build."
2015-07-29 21:21:14 +00:00
Tao Bao
dd24da9ec9
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: Iff44130f88a679b253ea1adcfac4ed8566ce9cc7
2015-07-29 14:11:55 -07: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
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
8a5a0356e8
am d3fd73f1
: Merge "Remove HAVE_WINDOWS_PATHS."
...
* commit 'd3fd73f157524fcc369a3c99de580d3598640ed8':
Remove HAVE_WINDOWS_PATHS.
2015-07-29 16:13:01 +00:00
Elliott Hughes
d3fd73f157
Merge "Remove HAVE_WINDOWS_PATHS."
2015-07-29 15:48:41 +00:00
Elliott Hughes
b15b512825
Remove HAVE_WINDOWS_PATHS.
...
Change-Id: I11284ceddf08eb284af56360f0cf80f4725c98e9
2015-07-29 08:45:40 -07:00
Tao Bao
910d382269
am bcc4d671
: Merge "Support systems that use a full copy of recovery image."
...
* commit 'bcc4d671745beaa5314a0a1133adc0347b55db77':
Support systems that use a full copy of recovery image.
2015-07-28 23:42:52 +00:00