OSDN Git Service
Elliott Hughes [Mon, 17 Aug 2015 20:25:36 +0000 (20:25 +0000)]
Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in build."
Dan Albert [Mon, 17 Aug 2015 20:16:01 +0000 (20:16 +0000)]
Merge "Don't filter on a non-existent variable."
Elliott Hughes [Mon, 17 Aug 2015 19:37:37 +0000 (12:37 -0700)]
Replace HAVE_MS_C_RUNTIME with _WIN32 in build.
Change-Id: Iebca0c4eab975c4bebcd3658baefd85c51890db4
Tao Bao [Mon, 17 Aug 2015 17:38:01 +0000 (17:38 +0000)]
Merge "Add an option to include a full bootloader in incremental OTA."
Dan Albert [Mon, 17 Aug 2015 17:36:09 +0000 (10:36 -0700)]
Don't filter on a non-existent variable.
This used to be used for aarch64
(https://android-review.googlesource.com/#/c/80126/), but has since
been removed and now does nothing. This was then reimplemented more
generally with my_illegal_flags
(https://android-review.googlesource.com/#/c/166405/). Drop
*GLOBAL_UNSUPPORTED_CFLAGS in favor of that.
Change-Id: I3347726dd92f9d3a16783e0d9d3b685a828400b4
leozwang [Fri, 14 Aug 2015 17:57:58 +0000 (10:57 -0700)]
Add an option to include a full bootloader in incremental OTA.
Bug:
23101469
Change-Id: Iac466b83f789f10d26e8d289dce766cf0d05148b
(cherry picked from commit
c1324751e79b23a63ea494f4bc784446c8f32435)
Stephen Hines [Sat, 15 Aug 2015 02:04:55 +0000 (02:04 +0000)]
Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
Yang Ni [Fri, 14 Aug 2015 18:39:47 +0000 (18:39 +0000)]
Merge "Include target api version in build system for rscpp."
Dan Albert [Fri, 14 Aug 2015 00:59:52 +0000 (00:59 +0000)]
Merge "Link librt on the host when using sanitizers."
Dan Albert [Fri, 14 Aug 2015 00:25:10 +0000 (17:25 -0700)]
Link librt on the host when using sanitizers.
The sanitizers now use shared memory.
Change-Id: Ie8fa6690374eda08ee4138b68fd628ebbfa2d0c8
Noah Presler [Fri, 14 Aug 2015 00:04:10 +0000 (17:04 -0700)]
Include target api version in build system for rscpp.
b/
23161320
Change-Id: Ibc23309abed092e7648168fbf4b80891a44929a6
Tao Bao [Thu, 13 Aug 2015 22:22:16 +0000 (22:22 +0000)]
Merge "Free the stash after its use in BBOTA v2."
Tao Bao [Thu, 13 Aug 2015 21:44:15 +0000 (14:44 -0700)]
Free the stash after its use in BBOTA v2.
In BBOTA v2, the stash size computation is inaccurate. A stash will be
used only once, so we deduct its size from stashed_blocks right after
its use. However, the stash doesn't actually get freed until being
overwritten by another stash or destroyed at the end of an update. This
leads to OTA failures due to insufficient space on /cache. This CL
changes the BBOTA v2 script to generate an explicit free right after
its use.
Bug:
23119955
Change-Id: Icdd8352bb0ff778945937c870990a888c7a4d38b
Dan Albert [Thu, 13 Aug 2015 16:48:18 +0000 (16:48 +0000)]
Merge "Never allow -w."
Neil Fuller [Thu, 13 Aug 2015 10:40:39 +0000 (10:40 +0000)]
Merge "Include the okhttp.jar when compiling against internal classes"
Nick Kralevich [Wed, 12 Aug 2015 23:46:28 +0000 (23:46 +0000)]
Merge changes from topic 'file_contexts.bin'
* changes:
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
Dan Albert [Wed, 12 Aug 2015 21:54:16 +0000 (14:54 -0700)]
Never allow -w.
Apparently -w will disable all warnings on GCC regardless of ordering
(clang will still respect ordering so warnings that are enabled after
-w are still respected). This is insane. Strip -w from the cflags.
Anyone that wants this flag should be turning off the specific
warnings (or just fix them), not disabling all warnings.
Change-Id: I2ba065637dfdc192921da4d9adbdc63b728c166f
Neil Fuller [Tue, 11 Aug 2015 12:48:34 +0000 (13:48 +0100)]
Include the okhttp.jar when compiling against internal classes
If LOCAL_SDK_VERSION is unset we were compiling against
core-libart but not okhttp.
okhttp should be an implementation detail but
android.net.http.HttpResponseCache implements
com.android.okhttp.OkCacheContainer.
The OpenJDK 8 version of of javac now requires all interfaces of
implemented classes be made available at compile time even with
-source 1.7 -target 1.7.
This is not an issue when compiling against the android.jar because
the implementation of HttpResponseCache in the android.jar does not
implement com.android.okhttp.OkCacheContainer.
Bug:
23099154
Change-Id: I3fa1d0f73535b396623fed953cfc71189b797849
Gina Dimino [Wed, 12 Aug 2015 03:05:59 +0000 (03:05 +0000)]
Merge "Docs: Rename content-footer-text plus remove whitespace."
Dan Willemsen [Wed, 12 Aug 2015 01:02:19 +0000 (01:02 +0000)]
Merge "Revert "Use repeatable timestamps""
Dan Willemsen [Wed, 12 Aug 2015 01:00:19 +0000 (01:00 +0000)]
Revert "Use repeatable timestamps"
OSX `date` doesn't understand -d
This reverts commit
13ba6e00f4c7e04f1038e94ab98e3ed424daa4fa.
Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
Dan Willemsen [Wed, 12 Aug 2015 00:49:26 +0000 (00:49 +0000)]
Merge "Use repeatable timestamps"
Dan Willemsen [Tue, 11 Aug 2015 22:25:12 +0000 (15:25 -0700)]
Use repeatable timestamps
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.
It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.
Bug:
23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
Ying Wang [Tue, 11 Aug 2015 22:49:25 +0000 (22:49 +0000)]
Merge "Don't build otapackage on Mac."
Ying Wang [Tue, 11 Aug 2015 18:24:19 +0000 (11:24 -0700)]
Don't build otapackage on Mac.
Also removed the unneeded variable DISTTOOLS
and the unnecessary dependency of otapackage/updatepackage on DISTTOOLS.
Bug:
23085297
Change-Id: I6b269003a72bb48eda1260c8d9b4bd88974bcde9
Ying Wang [Mon, 10 Aug 2015 22:15:23 +0000 (22:15 +0000)]
Merge "Allow custom recovery resource dirs."
Dan Albert [Mon, 10 Aug 2015 20:40:00 +0000 (20:40 +0000)]
Merge "Bump the default C++ standard up to C++14."
Dan Albert [Wed, 29 Jul 2015 22:13:57 +0000 (15:13 -0700)]
Bump the default C++ standard up to C++14.
This also drops the NDK default back to C++98 (or C++11 for code using
libc++). The platform NDK build should match the normal NDK build.
Bug: http://b/
23043421
Change-Id: I3a336767ce271e84f4dfdebdadb3a98e5689def9
Ying Wang [Thu, 6 Aug 2015 18:47:47 +0000 (11:47 -0700)]
Allow custom recovery resource dirs.
Set TARGET_PRIVATE_RES_DIRS in your BoardConfig.mk to specify custom
private recovery resource directories.
With this change you can share the same recovery resource dir for more
than one device; Also you can specify more than one directories.
Change-Id: Ieeb18f5ac11c98b6f08d0ab6fb4e0d9aa72b27e7
Tao Bao [Sat, 8 Aug 2015 04:26:57 +0000 (04:26 +0000)]
Merge "Change the cache partition size check into warnings."
Tao Bao [Sat, 8 Aug 2015 02:49:45 +0000 (19:49 -0700)]
Change the cache partition size check into warnings.
For some old builds, we may not define cache partition size. Change the
exception into a warning to make the script backward compatible.
Change-Id: Ie94c7fbb1a9f3a7db3f16e8d845e493a534aac5b
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: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 21:55:47 +0000 (21:55 +0000)]
Merge "Remove LOCAL_MODULE from generated DBus header path."
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
Gina Dimino [Thu, 6 Aug 2015 20:48:23 +0000 (13:48 -0700)]
Docs: Rename content-footer-text plus remove whitespace.
Change-Id: I655874790dbc5a2dd2fa2611bc63ca00a1953fdc
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: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:40:00 +0000 (15:40 +0000)]
Merge "Add build rules to generate native DBus interfaces"
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 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: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
Stephen Smalley [Tue, 4 Aug 2015 18:59:06 +0000 (14:59 -0400)]
build: switch over to file_contexts.bin only
Change all uses of the file_contexts file to use the
file_contexts.bin file instead.
Depends on
I75a781100082c23536f70ce3603f7de42408b5ba
I43806d564b83d57f05f5c36c8eba7b1ff4831b04
Id560d093440a2aba99cef28c20133b35feebf950
I15660f4b3e4c5cb8ae0ec1498c74d6fcbb9a0400
Change-Id: Iaf8c4b2e420f610425a07f48db7af32bda3f5b3a
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Richard Haines [Mon, 8 Jun 2015 15:27:31 +0000 (16:27 +0100)]
Update embedded.mk to support file_contexts.bin
This change supports external/libselinux changes to implement
a PCRE formatted binary file_contexts file.
Change-Id: I75a781100082c23536f70ce3603f7de42408b5ba
Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
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:23:20 +0000 (17:23 +0000)]
Merge "Build 64-bit host tools in Linux/Mac SDK build."
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: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: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: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:44:19 +0000 (18:44 +0000)]
Merge "Make TSAN easier to use."
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: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:43:38 +0000 (03:43 +0000)]
Merge "Don't define S_IRGRP in AndroidConfig.h."
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: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: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 21:59:42 +0000 (21:59 +0000)]
Merge "Use unmodified MAKECMDGOALS in ninja.mk."
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: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 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 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: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 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:04:36 +0000 (00:04 +0000)]
Merge "Disallow LOCAL_CXX_STL with LOCAL_SDK_VERSION."