OSDN Git Service
Tao Bao [Fri, 7 Aug 2015 04:50:47 +0000 (04:50 +0000)]
am
420f95ff: Merge "releasetools: Support packaging for system_root_image."
* commit '
420f95ff5d0ccf9c41683760c1b2731f6be0667e':
releasetools: Support packaging for system_root_image.
Tao Bao [Fri, 7 Aug 2015 04:45:20 +0000 (04:45 +0000)]
Merge "releasetools: Support packaging for system_root_image."
Dan Willemsen [Fri, 7 Aug 2015 00:54:47 +0000 (00:54 +0000)]
am
46ed451d: Merge "build: Load makefiles in the same order with Make 4.0"
* commit '
46ed451d12272edcb0ada9a8e0ec1f5f6e340ff8':
build: Load makefiles in the same order with Make 4.0
Dan Willemsen [Fri, 7 Aug 2015 00:47:51 +0000 (00:47 +0000)]
Merge "build: Load makefiles in the same order with Make 4.0"
Dan Willemsen [Thu, 6 Aug 2015 22:01:24 +0000 (15:01 -0700)]
build: Load makefiles in the same order with Make 4.0
Make 4.0 (and Kati) removed the implicit sort from the $(wildcard)
function. In order to ensure that makefiles are always loaded in the
same order, and an explicit sort.
This shouldn't matter, but some makefiles are modifying variables used
by siblings (LLVM_ROOT_PATH under frameworks/compile). In this case, the
path value still pointed to the same path, it just had extra '..'
references, and was enough to cause the binaries to be different.
Change-Id: Ief6551f999351ee2c193275aaae426dc064f8b34
Gilad Arnold [Thu, 6 Aug 2015 22:02:56 +0000 (22:02 +0000)]
am
7b49da7e: Merge "Remove LOCAL_MODULE from generated DBus header path."
* commit '
7b49da7e9a97f7064e275251957ed78dc5e38360':
Remove LOCAL_MODULE from generated DBus header path.
Gilad Arnold [Thu, 6 Aug 2015 21:55:47 +0000 (21:55 +0000)]
Merge "Remove LOCAL_MODULE from generated DBus header path."
Dan Albert [Thu, 6 Aug 2015 21:34:24 +0000 (21:34 +0000)]
am
2e4b90e5: Merge "Dedup system shared libraries."
* commit '
2e4b90e5f152a964011bb621ee6112bee778d436':
Dedup system shared libraries.
Dan Albert [Thu, 6 Aug 2015 21:34:19 +0000 (21:34 +0000)]
am
735cd90d: Merge "Disable transitive symbol resolving for mips64."
* commit '
735cd90d1762d10793bb52b0e0cf31f519e7af2b':
Disable transitive symbol resolving for mips64.
Dan Albert [Thu, 6 Aug 2015 21:25:45 +0000 (21:25 +0000)]
Merge "Dedup system shared libraries."
Dan Albert [Thu, 6 Aug 2015 21:25:38 +0000 (21:25 +0000)]
Merge "Disable transitive symbol resolving for mips64."
Dan Albert [Thu, 6 Aug 2015 19:22:40 +0000 (12:22 -0700)]
Dedup system shared libraries.
These shouldn't differ by target. Right now only mips64 does, and
that's a bug.
Change-Id: Ic941ede85ba1bc07d3316a55639ba71a6afc9630
Dan Albert [Thu, 6 Aug 2015 21:17:40 +0000 (14:17 -0700)]
Disable transitive symbol resolving for mips64.
The transitive symbol resolving causes build breakage when a binary
has indirect dependency on the NDK library.
This matches the change made for the the aarch64 toolchain:
https://android-review.googlesource.com/#/c/120654
Change-Id: Id5b2a63301cb1cdcdd84b4bcd9fbec8cf6ec0b3c
Gilad Arnold [Thu, 6 Aug 2015 19:50:23 +0000 (12:50 -0700)]
Remove LOCAL_MODULE from generated DBus header path.
Its presence requires #include directives to contain the build target
name, which is problematic because these directives can live in headers
that are shared by multiple build targets. Furthermore, having
LOCAL_MODULE in the generated header path is redundant because the
target directory is already private to the current build target (e.g.
.../<target_name>_intermediates/...).
Bug:
22608897
Change-Id: I059f71a1231e80f89c99441794a4491f2685036f
Tao Bao [Thu, 6 Aug 2015 17:49:49 +0000 (17:49 +0000)]
am
40467cbf: Merge "build: Support packaging for system_root_image."
* commit '
40467cbfbbc2a59d9b80f5c5ee97bd1a64bc2858':
build: Support packaging for system_root_image.
Ying Wang [Thu, 6 Aug 2015 17:49:48 +0000 (17:49 +0000)]
am
ecbc5b40: Merge "Build static ckati on Linux."
* commit '
ecbc5b401a55ab4e9e0e9cc9bf720044c4d4a829':
Build static ckati on Linux.
Tao Bao [Thu, 6 Aug 2015 17:43:46 +0000 (17:43 +0000)]
Merge "build: Support packaging for system_root_image."
Tao Bao [Wed, 22 Jul 2015 01:01:20 +0000 (18:01 -0700)]
build: Support packaging for system_root_image.
If system image contains the root directory
(BOARD_BUILD_SYSTEM_ROOT_IMAGE == "true"), we package the root directory
into ROOT/ instead of BOOT/RAMDISK/ in the target_files zip.
Change-Id: I817776ca97194991308b2131d0e34ab136283464
Tao Bao [Wed, 22 Jul 2015 01:01:20 +0000 (18:01 -0700)]
releasetools: Support packaging for system_root_image.
For system images that contain the root directory, we need to find the
root directory at ROOT/ instead of BOOT/RAMDISK/.
Change-Id: Ica345c8b1b03475f8ac6c44fd576045fcf17c882
Ying Wang [Wed, 5 Aug 2015 16:43:59 +0000 (16:43 +0000)]
Merge "Build static ckati on Linux."
Christopher Wiley [Wed, 5 Aug 2015 15:46:44 +0000 (15:46 +0000)]
am
5923fcd0: Merge "Add build rules to generate native DBus interfaces"
* commit '
5923fcd02131abfd1bc8f39704edc6c7e8100154':
Add build rules to generate native DBus interfaces
Christopher Wiley [Wed, 5 Aug 2015 15:40:00 +0000 (15:40 +0000)]
Merge "Add build rules to generate native DBus interfaces"
Paul Miller [Tue, 4 Aug 2015 23:26:56 +0000 (23:26 +0000)]
am
09185f5a: Merge "Replace Browser with Browser2 and BookmarkProvider"
* commit '
09185f5a8f943aeac3d6ace37a73870f5eedc6f4':
Replace Browser with Browser2 and BookmarkProvider
Paul Miller [Tue, 4 Aug 2015 23:20:29 +0000 (23:20 +0000)]
Merge "Replace Browser with Browser2 and BookmarkProvider"
Ying Wang [Tue, 4 Aug 2015 20:36:07 +0000 (13:36 -0700)]
resolved conflicts for merge of
d86f39ca to stage-aosp-master
Change-Id: Ifceb6705eeaaacc9f49788bc0e37a27e398beef0
Ying Wang [Tue, 4 Aug 2015 19:52:06 +0000 (19:52 +0000)]
Merge "Ignore .*.java files when collecting .java files."
Ying Wang [Tue, 4 Aug 2015 19:44:38 +0000 (12:44 -0700)]
Ignore .*.java files when collecting .java files.
Bug:
22934689
Change-Id: I6c9cc8f37d09eb190946e596e5d1ba0c3b318088
Ying Wang [Tue, 4 Aug 2015 01:15:43 +0000 (18:15 -0700)]
Build static ckati on Linux.
Bug:
22798670
Change-Id: I3aaf127627c1c478ab3af2549e49506d4d1f19df
Ying Wang [Tue, 4 Aug 2015 19:21:38 +0000 (19:21 +0000)]
am
fd43aa8a: Merge "Fix writing clean_steps.mk in the first build."
* commit '
fd43aa8a02d8415121694b4edd15ea8d549a7d3d':
Fix writing clean_steps.mk in the first build.
Ying Wang [Tue, 4 Aug 2015 19:14:57 +0000 (19:14 +0000)]
Merge "Fix writing clean_steps.mk in the first build."
Ying Wang [Tue, 4 Aug 2015 19:11:54 +0000 (12:11 -0700)]
Fix writing clean_steps.mk in the first build.
Change-Id: Ieddc799f38e5d1522e329e8300bd9f49c26c70ae
Ying Wang [Mon, 3 Aug 2015 21:18:48 +0000 (21:18 +0000)]
am
5c3adca4: Merge "Don\'t prepend CC_WRAPPER to CLANG."
* commit '
5c3adca4011db8fd98a3b7beab76b5b02cbab063':
Don't prepend CC_WRAPPER to CLANG.
Ying Wang [Mon, 3 Aug 2015 21:13:37 +0000 (21:13 +0000)]
Merge "Don't prepend CC_WRAPPER to CLANG."
Ying Wang [Mon, 3 Aug 2015 21:06:58 +0000 (14:06 -0700)]
Don't prepend CC_WRAPPER to CLANG.
We have deferred the CC_WRAPPER prepending to binary.mk per module.
Bug:
22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
(cherry-pick from commit
66c8e8c756fb1790cac792b32ba2de057c3b1b4e)
Ying Wang [Sat, 1 Aug 2015 17:30:34 +0000 (17:30 +0000)]
am
2c0c1e56: Merge "Build 64-bit host tools in Linux/Mac SDK build."
* commit '
2c0c1e56dbbaa3abf1d25796c94d6a31594b307e':
Build 64-bit host tools in Linux/Mac SDK build.
Ying Wang [Sat, 1 Aug 2015 17:23:20 +0000 (17:23 +0000)]
Merge "Build 64-bit host tools in Linux/Mac SDK build."
Daniel Rosenberg [Sat, 1 Aug 2015 00:17:22 +0000 (00:17 +0000)]
am
e4fed421: Merge "build: core: Fix issue in recovery"
* commit '
e4fed421d5939469bf35cd6430300207a0ff4901':
build: core: Fix issue in recovery
Daniel Rosenberg [Sat, 1 Aug 2015 00:17:21 +0000 (00:17 +0000)]
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
Daniel Rosenberg [Sat, 1 Aug 2015 00:12:59 +0000 (00:12 +0000)]
am
46afd7f9: Merge "Add ro.build.system_root_image"
* commit '
46afd7f981406e47740c46253aa16af1ab78eb9c':
Add ro.build.system_root_image
Daniel Rosenberg [Sat, 1 Aug 2015 00:10:09 +0000 (00:10 +0000)]
Merge "build: core: Fix issue in recovery"
Daniel Rosenberg [Sat, 1 Aug 2015 00:10:02 +0000 (00:10 +0000)]
Merge "Add support for system images that contain the root directory"
Daniel Rosenberg [Sat, 1 Aug 2015 00:05:05 +0000 (00:05 +0000)]
Merge "Add ro.build.system_root_image"
Daniel Rosenberg [Tue, 2 Jun 2015 23:40:58 +0000 (16:40 -0700)]
build: core: Fix issue in recovery
Now that symlinks are created at build time, the rsync while
making recovery runs into issues around the etc symlink
Change-Id: Ie781507b22e4661629840075b274eaab2f712de6
Daniel Rosenberg [Sat, 6 Jun 2015 00:59:27 +0000 (17:59 -0700)]
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
Daniel Rosenberg [Tue, 30 Jun 2015 00:20:43 +0000 (17:20 -0700)]
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
Dan Albert [Fri, 31 Jul 2015 20:54:56 +0000 (20:54 +0000)]
am
010f652e: Merge "Add system/core to the PYTHONPATH."
* commit '
010f652ee7a9398f46b1c635c6bd186f7c7f8853':
Add system/core to the PYTHONPATH.
Dan Albert [Fri, 31 Jul 2015 20:48:17 +0000 (20:48 +0000)]
Merge "Add system/core to the PYTHONPATH."
Dan Albert [Mon, 27 Jul 2015 23:06:25 +0000 (16:06 -0700)]
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
Gina Dimino [Fri, 31 Jul 2015 18:53:28 +0000 (18:53 +0000)]
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.
Gina Dimino [Fri, 31 Jul 2015 18:47:20 +0000 (18:47 +0000)]
Merge "Docs: Add Google Feedback link to the footer for SAC pages."
Christopher Wiley [Thu, 30 Jul 2015 00:14:24 +0000 (17:14 -0700)]
Add build rules to generate native DBus interfaces
With this patch, we can now write Android makefiles like:
include $(CLEAR_VARS)
LOCAL_MODULE := dbus-binding-example
LOCAL_SRC_FILES := main.cpp \
dbus-service-config.json \
org.example.Daemon.Command.dbus.xml \
org.example.Daemon.Manager.dbus.xml
include $(BUILD_EXECUTABLE)
This will cause header files defining native DBus interfaces
to be generated. These can be included from main.cpp to
easily expose object oriented interface over DBus.
Bug:
22608897
Change-Id: Ic4304ac8de77de74d6955ed17789e5477be9a53e
Tao Bao [Fri, 31 Jul 2015 16:49:30 +0000 (16:49 +0000)]
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.
Tao Bao [Fri, 31 Jul 2015 16:43:59 +0000 (16:43 +0000)]
Merge "build: Fix "adb shell" in recovery for system_root_image."
Ying Wang [Fri, 31 Jul 2015 16:24:15 +0000 (09:24 -0700)]
Build 64-bit host tools in Linux/Mac SDK build.
With this we build 32-bit host tools in only MinGW Windows build.
Bug:
22776595
Change-Id: Icca02b0f629460449a3437ff1769d4d081e92413
Paul Miller [Fri, 31 Jul 2015 01:12:21 +0000 (18:12 -0700)]
Replace Browser with Browser2 and BookmarkProvider
Browser is going away. Browser2 is a tiny, WebView-based browser for
testing purposes. BookmarkProvider will take over the
"com.android.browser;browser" authorities and return empty Cursors for
all queries. See packages/apps/Browser2/README for how to obtain a
regular browser.
BUG:
19351071
Change-Id: I8af605ec65a1185923598ba553a98e3fd9b887db
Tao Bao [Thu, 30 Jul 2015 21:34:01 +0000 (14:34 -0700)]
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
Gina Dimino [Wed, 8 Jul 2015 21:34:16 +0000 (14:34 -0700)]
Docs: Add Google Feedback link to the footer for SAC pages.
Bug:
8906018
Change-Id: Id53b8a4421e01cef0ea1609efde1e29eb2a50f47
Dan Albert [Thu, 30 Jul 2015 18:55:24 +0000 (18:55 +0000)]
am
8427c587: Merge "Make TSAN easier to use."
* commit '
8427c5878c56c96b9384a89cb6dc00e30cd5bbfa':
Make TSAN easier to use.
Dan Albert [Thu, 30 Jul 2015 18:44:19 +0000 (18:44 +0000)]
Merge "Make TSAN easier to use."
Elliott Hughes [Thu, 30 Jul 2015 17:31:47 +0000 (17:31 +0000)]
am
524a7e46: Merge "Remove HAVE_WINSOCK."
* commit '
524a7e46937c59cfb34289819fd3ac117911cd8d':
Remove HAVE_WINSOCK.
Elliott Hughes [Thu, 30 Jul 2015 17:24:06 +0000 (17:24 +0000)]
Merge "Remove HAVE_WINSOCK."
Dan Albert [Thu, 30 Jul 2015 17:17:33 +0000 (10:17 -0700)]
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
Elliott Hughes [Thu, 30 Jul 2015 16:25:10 +0000 (16:25 +0000)]
am
51e2e589: Merge "Remove the now-empty darwin AndroidConfig.h."
* commit '
51e2e5893d5bcf62d12e041a60ed99f2a03758be':
Remove the now-empty darwin AndroidConfig.h.
Elliott Hughes [Thu, 30 Jul 2015 16:19:25 +0000 (16:19 +0000)]
Merge "Remove the now-empty darwin AndroidConfig.h."
Elliott Hughes [Thu, 30 Jul 2015 16:16:01 +0000 (09:16 -0700)]
Remove the now-empty darwin AndroidConfig.h.
Change-Id: Icdbb06514c099653923aae936c31abfbaeaccf7a
Elliott Hughes [Thu, 30 Jul 2015 03:58:47 +0000 (03:58 +0000)]
am
cf427fb4: Merge "Don\'t define S_IRGRP in AndroidConfig.h."
* commit '
cf427fb4ae19449d0c0ecbc86b88f37b5fcb0f05':
Don't define S_IRGRP in AndroidConfig.h.
Elliott Hughes [Thu, 30 Jul 2015 03:43:38 +0000 (03:43 +0000)]
Merge "Don't define S_IRGRP in AndroidConfig.h."
Elliott Hughes [Thu, 30 Jul 2015 03:32:29 +0000 (03:32 +0000)]
am
f07ddab1: Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS."
* commit '
f07ddab187df78a7be32289506f5eca051339f75':
Remove global Windows __BEGIN_DECLS/__END_DECLS.
Elliott Hughes [Thu, 30 Jul 2015 03:20:36 +0000 (03:20 +0000)]
Merge "Remove global Windows __BEGIN_DECLS/__END_DECLS."
Elliott Hughes [Thu, 30 Jul 2015 03:14:59 +0000 (20:14 -0700)]
Remove global Windows __BEGIN_DECLS/__END_DECLS.
Change-Id: Ic1ba634a0376c9c1b484098b4ca41cf7659f06b1
Elliott Hughes [Thu, 30 Jul 2015 02:26:39 +0000 (19:26 -0700)]
Don't define S_IRGRP in AndroidConfig.h.
Nothing seems to be relying on this anyway.
Change-Id: I24e2509e4d24bc445961430bb74f8ca04135bc37
Elliott Hughes [Thu, 30 Jul 2015 02:05:24 +0000 (19:05 -0700)]
Remove HAVE_WINSOCK.
Change-Id: I362451b68775de0216c5b8736f5cc16a7933b6c2
Ying Wang [Thu, 30 Jul 2015 00:51:24 +0000 (00:51 +0000)]
am
1a5a615a: Merge "Update mac_sdk_versions_supported."
* commit '
1a5a615a7b167e4232f3185eef72a7e5b44aef34':
Update mac_sdk_versions_supported.
Ying Wang [Thu, 30 Jul 2015 00:37:38 +0000 (00:37 +0000)]
Merge "Update mac_sdk_versions_supported."
Ying Wang [Wed, 29 Jul 2015 23:35:40 +0000 (16:35 -0700)]
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
Elliott Hughes [Wed, 29 Jul 2015 23:25:01 +0000 (23:25 +0000)]
am
1dbb4166: Merge "Remove OS_PATH_SEPARATOR from AndroidConfig.h."
* commit '
1dbb41661afdffb41ae346c44075507f1840bc66':
Remove OS_PATH_SEPARATOR from AndroidConfig.h.
Elliott Hughes [Wed, 29 Jul 2015 23:14:52 +0000 (23:14 +0000)]
Merge "Remove OS_PATH_SEPARATOR from AndroidConfig.h."
Elliott Hughes [Wed, 29 Jul 2015 22:31:39 +0000 (15:31 -0700)]
Remove OS_PATH_SEPARATOR from AndroidConfig.h.
Change-Id: I4143be14e5117526bfa98d83e246cc4360209c13
Ying Wang [Wed, 29 Jul 2015 22:11:39 +0000 (22:11 +0000)]
am
0c0b2e65: Merge "Use unmodified MAKECMDGOALS in ninja.mk."
* commit '
0c0b2e659fe52dc1901677b74dc390c52b1b5e3b':
Use unmodified MAKECMDGOALS in ninja.mk.
Ying Wang [Wed, 29 Jul 2015 21:59:42 +0000 (21:59 +0000)]
Merge "Use unmodified MAKECMDGOALS in ninja.mk."
Simon Wilson [Wed, 29 Jul 2015 21:53:37 +0000 (21:53 +0000)]
am
37700c9a: Merge "Add compressor options for squashfs system images"
* commit '
37700c9ad19c8d9f8578604ca502cb6d55c22d99':
Add compressor options for squashfs system images
Simon Wilson [Wed, 29 Jul 2015 21:35:57 +0000 (21:35 +0000)]
Merge "Add compressor options for squashfs system images"
Tao Bao [Wed, 29 Jul 2015 21:34:48 +0000 (21:34 +0000)]
am
4ac8e059: Merge "Read fstab from the source build."
* commit '
4ac8e059bfd26a18fe3bcf2dfa3fdb60dfed824e':
Read fstab from the source build.
Tao Bao [Wed, 29 Jul 2015 21:21:14 +0000 (21:21 +0000)]
Merge "Read fstab from the source build."
Tao Bao [Wed, 29 Jul 2015 21:09:23 +0000 (14:09 -0700)]
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
Ying Wang [Wed, 29 Jul 2015 00:57:45 +0000 (17:57 -0700)]
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
Ying Wang [Wed, 29 Jul 2015 17:21:15 +0000 (17:21 +0000)]
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.
Ying Wang [Wed, 29 Jul 2015 16:59:50 +0000 (16:59 +0000)]
Merge "Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set."
Elliott Hughes [Wed, 29 Jul 2015 16:13:01 +0000 (16:13 +0000)]
am
d3fd73f1: Merge "Remove HAVE_WINDOWS_PATHS."
* commit '
d3fd73f157524fcc369a3c99de580d3598640ed8':
Remove HAVE_WINDOWS_PATHS.
Elliott Hughes [Wed, 29 Jul 2015 15:48:41 +0000 (15:48 +0000)]
Merge "Remove HAVE_WINDOWS_PATHS."
Elliott Hughes [Wed, 29 Jul 2015 15:45:40 +0000 (08:45 -0700)]
Remove HAVE_WINDOWS_PATHS.
Change-Id: I11284ceddf08eb284af56360f0cf80f4725c98e9
Tao Bao [Tue, 28 Jul 2015 23:42:52 +0000 (23:42 +0000)]
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.
Tao Bao [Tue, 28 Jul 2015 23:28:40 +0000 (23:28 +0000)]
Merge "Support systems that use a full copy of recovery image."
Tao Bao [Wed, 22 Jul 2015 19:33:18 +0000 (12:33 -0700)]
Support systems that use a full copy of recovery image.
If BOARD_USES_FULL_RECOVERY_IMAGE == true, a full copy of recovery
image will be carried as /system/etc/recovery.img instead of a patch
at /system/recovery_from_boot.p.
Bug:
22641135
Change-Id: Ie271d3e2d55d7b003f667ac5b44203d69b23c63b
(cherry picked from commit
8beab69bd5d728810aca55536017912e65777bb8)
Fredrik Roubert [Mon, 27 Jul 2015 19:48:39 +0000 (21:48 +0200)]
Remove $(DEX2OAT) from DEX2OAT_DEPENDENCY when USE_DEX2OAT_DEBUG is set.
Currently, DEX2OATD_DEPENDENCY is created by appending $(DEX2OATD) to
the value of DEX2OAT_DEPENDENCY and then if USE_DEX2OAT_DEBUG is set,
DEX2OAT_DEPENDENCY is set to DEX2OATD_DEPENDENCY, adding a dependency
on $(DEX2OAT) even in configurations where this will not be built.
This change removes DEX2OATD and DEX2OATD_DEPENDENCY entirely to instead
assign dex2oat or dex2oatd to DEX2OAT depending on USE_DEX2OAT_DEBUG,
making it possible to build with these flags set:
USE_DEX2OAT_DEBUG=true
ART_BUILD_HOST_NDEBUG=false
ART_BUILD_HOST_DEBUG=true
ART_BUILD_TARGET_NDEBUG=false
ART_BUILD_TARGET_DEBUG=true
make build-art-host
Change-Id: I4fa75d1b7e9751c73c43ec943fd8446cc231a070
Elliott Hughes [Tue, 28 Jul 2015 15:07:40 +0000 (15:07 +0000)]
am
7ecb919d: Merge "Remove unused "host/Directories.h"."
* commit '
7ecb919dbaffe20c310367fd96a327d4f57adfd8':
Remove unused "host/Directories.h".
Elliott Hughes [Tue, 28 Jul 2015 14:55:06 +0000 (14:55 +0000)]
Merge "Remove unused "host/Directories.h"."
Elliott Hughes [Tue, 28 Jul 2015 14:49:02 +0000 (07:49 -0700)]
Remove unused "host/Directories.h".
There's no implementation of these functions.
Change-Id: Ic12286ccd1a392be32e5da67e5b7637bac4820f6
Dan Albert [Tue, 28 Jul 2015 00:13:58 +0000 (00:13 +0000)]
am
d4ff2283: Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION."
* commit '
d4ff228319d8382a062c9843511d760d1933a9f4':
Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION.
Dan Albert [Tue, 28 Jul 2015 00:04:36 +0000 (00:04 +0000)]
Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION."