OSDN Git Service
Miao Wang [Mon, 17 Nov 2014 22:58:46 +0000 (22:58 +0000)]
am
ec64b05e: Merge "Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib."
* commit '
ec64b05e9db4c9898d1a6652e58741597261e46a':
Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib.
Miao Wang [Mon, 17 Nov 2014 21:25:24 +0000 (21:25 +0000)]
Merge "Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib."
Dan Albert [Mon, 17 Nov 2014 20:35:06 +0000 (20:35 +0000)]
am
f63ca1e9: Merge "Disable gnu style linker hash for NDK builds."
* commit '
f63ca1e9ea392d6aea7e2cfd6239d904e6ae017d':
Disable gnu style linker hash for NDK builds.
Dan Albert [Mon, 17 Nov 2014 20:29:42 +0000 (20:29 +0000)]
Merge "Disable gnu style linker hash for NDK builds."
Ying Wang [Mon, 17 Nov 2014 19:47:46 +0000 (19:47 +0000)]
Ying Wang [Mon, 17 Nov 2014 19:44:19 +0000 (19:44 +0000)]
am
45f975bb: Merge "Fix PDK build."
* commit '
45f975bba5efca94fae9471ce4388a51bd919b5d':
Fix PDK build.
Ying Wang [Mon, 17 Nov 2014 19:44:18 +0000 (19:44 +0000)]
am
5cef1ce3: Merge "Install preloaded-classes as a standalone configuration file"
* commit '
5cef1ce30d65edb21c5d352c5618186b95273e5c':
Install preloaded-classes as a standalone configuration file
Dan Albert [Mon, 17 Nov 2014 19:44:17 +0000 (19:44 +0000)]
am
fbb553dc: Merge "Colorize build success/failure message."
* commit '
fbb553dcd8a1cc65a7b2f56fca7604d5850f59c8':
Colorize build success/failure message.
Ying Wang [Mon, 17 Nov 2014 19:34:32 +0000 (19:34 +0000)]
Merge "Fix PDK build."
Ying Wang [Mon, 17 Nov 2014 19:34:21 +0000 (19:34 +0000)]
Merge "Install preloaded-classes as a standalone configuration file"
Dan Albert [Mon, 17 Nov 2014 19:34:11 +0000 (19:34 +0000)]
Merge "Colorize build success/failure message."
Ying Wang [Mon, 17 Nov 2014 19:01:18 +0000 (11:01 -0800)]
Fix PDK build.
Add frameworks/base/preloaded-classes to PRODUCT_COPY_FILES only if it
exists in the source tree.
Bug:
18305157
Change-Id: I46c277ebfb8095f9e5fe0fbb21276d932509f2eb
Ying Wang [Thu, 13 Nov 2014 23:19:12 +0000 (15:19 -0800)]
Install preloaded-classes as a standalone configuration file
Install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.
To override the default frameworks/base/preloaded-classes, just override
in your product configuration makefile with PRODUCT_COPY_FILES before it
inherits from build/target/product/base.mk: if there are multiple items
in PRODUCT_COPY_FILES with the same destination, the first one takes
precedence.
Bug:
18305157
Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21
Ying Wang [Mon, 17 Nov 2014 19:13:32 +0000 (19:13 +0000)]
Ying Wang [Mon, 17 Nov 2014 19:01:18 +0000 (11:01 -0800)]
Fix PDK build.
Add frameworks/base/preloaded-classes to PRODUCT_COPY_FILES only if it
exists in the source tree.
Bug:
18305157
Change-Id: I46c277ebfb8095f9e5fe0fbb21276d932509f2eb
Ying Wang [Mon, 17 Nov 2014 18:28:19 +0000 (18:28 +0000)]
am
9a0a8bd0: am
9a9d180f: Install preloaded-classes as a standalone configuration file
* commit '
9a0a8bd00697fd6dd3e7dd6fb5dcf3697dc27507':
Install preloaded-classes as a standalone configuration file
Ying Wang [Mon, 17 Nov 2014 18:24:27 +0000 (18:24 +0000)]
am
9a9d180f: Install preloaded-classes as a standalone configuration file
* commit '
9a9d180ff1cafc547bd9d3b31a10db749d8ab359':
Install preloaded-classes as a standalone configuration file
Dan Albert [Sat, 15 Nov 2014 23:49:27 +0000 (23:49 +0000)]
am
8df7653d: Merge "Remove logic for platform stlport gtest."
* commit '
8df7653d5608e5d459758a91e6c677c7d5fcc43f':
Remove logic for platform stlport gtest.
Dan Albert [Sat, 15 Nov 2014 23:42:15 +0000 (23:42 +0000)]
Merge "Remove logic for platform stlport gtest."
Miao Wang [Sat, 15 Nov 2014 22:25:33 +0000 (14:25 -0800)]
Add -Wl,--hash-style=sysv flag to rs: transform-bc-to-so for compatibility lib.
Bug
18395015
Change-Id: Ib9aecf347c685c8b8b725eecfbc0cec03d9b2c1b
Dan Albert [Sun, 9 Nov 2014 06:41:52 +0000 (22:41 -0800)]
Colorize build success/failure message.
Change-Id: I8901689876e65f5b72050c40e1580f167e49c2b0
Dan Albert [Fri, 14 Nov 2014 23:28:49 +0000 (15:28 -0800)]
Disable gnu style linker hash for NDK builds.
This feature is now available in AOSP, but not for any shipped
release. We don't have an API version for the release that this will
be available in yet, so for now the check is commented out.
Bug:
18395015
Change-Id: I247233d047ed5a7564d6602d47c9ad962313c8dc
Ying Wang [Thu, 13 Nov 2014 23:19:12 +0000 (15:19 -0800)]
Install preloaded-classes as a standalone configuration file
Install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.
To override the default frameworks/base/preloaded-classes, just override
in your product configuration makefile with PRODUCT_COPY_FILES before it
inherits from build/target/product/base.mk: if there are multiple items
in PRODUCT_COPY_FILES with the same destination, the first one takes
precedence.
Bug:
18305157
Change-Id: I937632b4a1aa73310ec90e73fd708fbd0c704a21
Ying Wang [Fri, 14 Nov 2014 19:01:35 +0000 (19:01 +0000)]
am
5520d930: Merge "sign_target_files_apks: fix recovery patch generation"
* commit '
5520d930c8e78a3bea4eeba9d0430d1c3f19dba8':
sign_target_files_apks: fix recovery patch generation
Ying Wang [Fri, 14 Nov 2014 18:53:57 +0000 (18:53 +0000)]
Merge "sign_target_files_apks: fix recovery patch generation"
Dan Albert [Fri, 14 Nov 2014 18:09:48 +0000 (18:09 +0000)]
am
a05a04cc: Merge "Refactor transform-o-to-* definitions."
* commit '
a05a04cc754a6374c2ce6406dece9bbafa0abea0':
Refactor transform-o-to-* definitions.
Dan Albert [Fri, 14 Nov 2014 18:01:21 +0000 (18:01 +0000)]
Merge "Refactor transform-o-to-* definitions."
Dmitriy Ivanov [Fri, 14 Nov 2014 17:58:57 +0000 (17:58 +0000)]
am
dd20e68d: Merge "Fix device detection and path to tapas"
* commit '
dd20e68d8c37b28be86f2c2a5be8350ec35dd814':
Fix device detection and path to tapas
Dmitriy Ivanov [Fri, 14 Nov 2014 17:50:39 +0000 (17:50 +0000)]
Merge "Fix device detection and path to tapas"
Michael Runge [Fri, 14 Nov 2014 07:29:43 +0000 (07:29 +0000)]
am
b5d7011d: am
100a9f07: am
11d21015: am
f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit '
b5d7011d78ddb71813db4f47134a63c84c502381':
Allow images to be readded to target-files
Michael Runge [Fri, 14 Nov 2014 07:25:11 +0000 (07:25 +0000)]
am
100a9f07: am
11d21015: am
f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit '
100a9f072073f3c799deb72a62ffb500c1562c4c':
Allow images to be readded to target-files
Michael Runge [Fri, 14 Nov 2014 07:19:58 +0000 (07:19 +0000)]
am
11d21015: am
f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit '
11d210154d71a229e20eaebd6f9ea580b0c7f036':
Allow images to be readded to target-files
Michael Runge [Fri, 14 Nov 2014 07:17:22 +0000 (07:17 +0000)]
am
f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit '
f178d36441c3a688cfe5eb41a5ce724ba01a4ecf':
Allow images to be readded to target-files
Michael Runge [Fri, 14 Nov 2014 07:14:47 +0000 (07:14 +0000)]
Merge "Allow images to be readded to target-files" into lmp-dev
Michael Runge [Fri, 14 Nov 2014 05:41:08 +0000 (21:41 -0800)]
Allow images to be readded to target-files
There may be cases where various partitions were
modified (such as extra signing of boot/recovery)
which require the system partition to be regenerated
with a new recovery patch script. Allow a request
for the recovery patch to be rebuilt, and for
missing images to be readded to the existing images.
Change-Id: Ie93c5bc1161a0d5002002dca23e07742ce2ba468
Dmitriy Ivanov [Wed, 12 Nov 2014 22:16:12 +0000 (14:16 -0800)]
Fix device detection and path to tapas
1. Some devices do not set ro.product.device in which
case take it from ro.hardware
2. Add path to tapas symbols to sysroot and solib-search-path
for tapas users only
Change-Id: I4eed2d3c3aefd95070beebdbfba4464a524c3066
Stephen Hines [Fri, 14 Nov 2014 03:15:14 +0000 (03:15 +0000)]
am
74b2870a: Merge "Clean out *.prop files due to dex2oat instruction-set flag change."
* commit '
74b2870a272a4f069354dcc262c3af3042943969':
Clean out *.prop files due to dex2oat instruction-set flag change.
Stephen Hines [Fri, 14 Nov 2014 03:07:31 +0000 (03:07 +0000)]
Merge "Clean out *.prop files due to dex2oat instruction-set flag change."
Stephen Hines [Fri, 14 Nov 2014 03:03:59 +0000 (19:03 -0800)]
Clean out *.prop files due to dex2oat instruction-set flag change.
Change-Id: Ib1e94cfe08bad9e51fd46e8a1a09926877f179de
Paul Lawrence [Fri, 14 Nov 2014 02:18:23 +0000 (02:18 +0000)]
Dmitriy Ivanov [Fri, 14 Nov 2014 02:13:13 +0000 (02:13 +0000)]
am
3537692d: Merge "Switch --hash-style to gnu"
* commit '
3537692df3f64f68bf202d9857ae67e19bc4eaa4':
Switch --hash-style to gnu
Paul Lawrence [Fri, 14 Nov 2014 02:12:48 +0000 (02:12 +0000)]
Paul Lawrence [Fri, 14 Nov 2014 01:54:30 +0000 (17:54 -0800)]
Fix the build
Bug:
15984840
Bug:
18120110
Change-Id: I0224d5a31e03b711953d9496ecb00b6d88b8ef4c
Dmitriy Ivanov [Fri, 14 Nov 2014 01:46:59 +0000 (01:46 +0000)]
Merge "Switch --hash-style to gnu"
Ian Rogers [Fri, 14 Nov 2014 00:34:24 +0000 (00:34 +0000)]
am
93efec89: Merge "Pass instruction set variant to dex2oat."
* commit '
93efec89e067c5fe6f4585a5f0f033826310ee76':
Pass instruction set variant to dex2oat.
Ian Rogers [Fri, 14 Nov 2014 00:21:52 +0000 (00:21 +0000)]
Merge "Pass instruction set variant to dex2oat."
Dan Albert [Thu, 13 Nov 2014 18:15:46 +0000 (10:15 -0800)]
Refactor transform-o-to-* definitions.
Previously, there was one generic definition for each of the
transform-o-to-* functions in definitions.mk, and one target specific
one in each combo/TARGET_*.mk. The generic one was entirely unused,
and the target specific ones were all nearly identical.
Changing anything in these functions was tedious at best, and often
error prone. The differences between any 32-bit arch and its 64-bit
equivalent were restricted to the name of the linker, and the ARM and
MIPS definitions were identical. The few differences between ARM and
x86 looked to be compatibility for an old (ca. 2008) toolchain issue
with --gc-sections, and a bug (LDFLAGS coming first rather than
later).
To simplify things, I've moved the definitions for these out of
combo/TARGET_*.mk and back into definitions.mk. The differences
between ARM and x86 have been scrapped. Anything that really does
still need to be target specific can be handled as I have the linker:
add a TARGET_FOO variable to the given target and then add it to the
generic definition.
Change-Id: I54dc1bffc32ac39f27f0b87247dd6a6dbaf0b162
Sami Tolvanen [Fri, 14 Nov 2014 00:03:51 +0000 (00:03 +0000)]
am
2a1697d9: am
8d212ea8: DO NOT MERGE: Change verity key formats
* commit '
2a1697d9831fc887a32c661fa4e3758f32790e67':
DO NOT MERGE: Change verity key formats
Sami Tolvanen [Thu, 13 Nov 2014 23:53:41 +0000 (23:53 +0000)]
am
8d212ea8: DO NOT MERGE: Change verity key formats
* commit '
8d212ea8735233211b38f55819841fa97a744eaa':
DO NOT MERGE: Change verity key formats
Yabin Cui [Thu, 13 Nov 2014 23:35:27 +0000 (23:35 +0000)]
am
eddd9fb0: Merge "kill HAVE_FORKEXEC"
* commit '
eddd9fb03faa607c77feed1cea8f435df7f64140':
kill HAVE_FORKEXEC
Sami Tolvanen [Fri, 7 Nov 2014 04:38:00 +0000 (20:38 -0800)]
DO NOT MERGE: Change verity key formats
Change boot, recovery, and verity metadata signing keys to use the
same PKCS8 / X.509 PEM format as the other signing keys, and update
build scripts to use correct arguments for the updated signing
tools.
Bug:
15984840
Bug:
18120110
Change-Id: I23ed5a004ecdad6cf7696487935ad5031eb8adf8
(cherry picked from commit
72d90eb1895932343586717daa1865019473b2f5)
Yabin Cui [Thu, 13 Nov 2014 23:22:46 +0000 (23:22 +0000)]
Merge "kill HAVE_FORKEXEC"
Dmitriy Ivanov [Thu, 13 Nov 2014 22:51:10 +0000 (14:51 -0800)]
Switch --hash-style to gnu
Bug:
18373609
Change-Id: Ia2c965fb86295858d9a97db2ec8d54d99e3d431f
Yabin Cui [Thu, 13 Nov 2014 20:09:30 +0000 (20:09 +0000)]
am
d3d6c383: Merge "kill HAVE_LOCALTIME_R"
* commit '
d3d6c3830f2c1b25f97a8e0001edfda4583a309a':
kill HAVE_LOCALTIME_R
Yabin Cui [Thu, 13 Nov 2014 20:00:23 +0000 (20:00 +0000)]
Merge "kill HAVE_LOCALTIME_R"
Yabin Cui [Thu, 13 Nov 2014 19:51:37 +0000 (11:51 -0800)]
kill HAVE_LOCALTIME_R
Bug:
18361583
Change-Id: If76334a6e18893b65d9b526271620a460a75bf22
Yabin Cui [Thu, 13 Nov 2014 19:21:48 +0000 (19:21 +0000)]
am
044568be: Merge "kill HAVE_GETHOSTBYNAME_R"
* commit '
044568be18bb67a254398d65c15fe5e9caeb9d02':
kill HAVE_GETHOSTBYNAME_R
Yabin Cui [Thu, 13 Nov 2014 19:10:25 +0000 (19:10 +0000)]
Merge "kill HAVE_GETHOSTBYNAME_R"
Yabin Cui [Thu, 13 Nov 2014 18:25:56 +0000 (10:25 -0800)]
kill HAVE_GETHOSTBYNAME_R
Bug:
18363225
Change-Id: Ib34c094cd21b2221178755acdd9475a5bc2bf2c0
Elliott Hughes [Thu, 13 Nov 2014 05:27:44 +0000 (05:27 +0000)]
am
6c706222: Merge "Remove HAVE_SHORT_ENUMS."
* commit '
6c7062221b7582c5d41acdb7a1d865ca629707ed':
Remove HAVE_SHORT_ENUMS.
Elliott Hughes [Thu, 13 Nov 2014 05:20:37 +0000 (05:20 +0000)]
Merge "Remove HAVE_SHORT_ENUMS."
Elliott Hughes [Thu, 13 Nov 2014 05:07:07 +0000 (21:07 -0800)]
Remove HAVE_SHORT_ENUMS.
Change-Id: Ia0e8a52cd8d7655508754ec0a6482f2dd055a68e
Yabin Cui [Thu, 13 Nov 2014 01:15:30 +0000 (17:15 -0800)]
kill HAVE_FORKEXEC
Bug:
18317407
Change-Id: Idaff8a161305325dbb0a9e00764afe98b66e3312
Yabin Cui [Thu, 13 Nov 2014 00:15:25 +0000 (00:15 +0000)]
am
957037dc: Merge "kill HAVE_POSIX_FILEMAP"
* commit '
957037dc40c7be54e7ffa6f56cca48e9db31dc7b':
kill HAVE_POSIX_FILEMAP
Yabin Cui [Thu, 13 Nov 2014 00:02:24 +0000 (00:02 +0000)]
Merge "kill HAVE_POSIX_FILEMAP"
Chih-Hung Hsieh [Wed, 12 Nov 2014 23:23:20 +0000 (23:23 +0000)]
am
aea83e0d: Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8"
* commit '
aea83e0dca9a70e53677c22c72034155311287ab':
Upgrade host tool to x86_64-linux-glibc2.15-4.8
Chih-Hung Hsieh [Wed, 12 Nov 2014 23:13:36 +0000 (23:13 +0000)]
Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8"
Andrew Boie [Mon, 15 Sep 2014 23:01:07 +0000 (16:01 -0700)]
sign_target_files_apks: fix recovery patch generation
When rebuilding recovery, the boot images created for patching
purposes still were being signed with the old verity key and
not the new one specified on the command line.
In addition, the replacement verity public key in the boot ramdisk
wasn't being used.
Change-Id: I451e17d1cf08c507580c4b58134c1069532740e8
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Dan Albert [Wed, 12 Nov 2014 00:19:59 +0000 (16:19 -0800)]
Remove logic for platform stlport gtest.
Now that the platforms stlport linked gtest is gone, we don't need the
logic for this any more. All platform tests will use libc++ (which has
been renamed to libgtest without a suffix).
Note that tests built with the NDK will still use stlport, but they
will use the NDK's stlport, not the platform's.
Bug:
15193147
Change-Id: Ifcb2489ed60c41e4ed028096b516c1ee643de907
Dan Albert [Tue, 11 Nov 2014 22:56:01 +0000 (22:56 +0000)]
am
201f6b3e: Merge "Make modules depend on their makefile."
* commit '
201f6b3e92a2ef2f3a117f33cd399d5304dd385a':
Make modules depend on their makefile.
Dan Albert [Tue, 11 Nov 2014 22:47:47 +0000 (22:47 +0000)]
Merge "Make modules depend on their makefile."
Dan Albert [Sun, 9 Nov 2014 06:20:03 +0000 (22:20 -0800)]
Make modules depend on their makefile.
This should obviate much of the need for cleanspecs, and also make it
unnecessary to continue adding LOCAL_ADDITIONAL_DEPENDENCIES for this
sort of thing all over the tree.
Change-Id: I97aa8fd280ae868a5f6364f8b7bf3c2fe235d6ce
Dan Albert [Tue, 11 Nov 2014 19:58:42 +0000 (19:58 +0000)]
am
1f637158: Merge "Use platform protobuf unless building with NDK."
* commit '
1f6371583ef6ce3a384262ebb291515f5ca3a7b6':
Use platform protobuf unless building with NDK.
Dan Albert [Tue, 11 Nov 2014 19:28:34 +0000 (19:28 +0000)]
Merge "Use platform protobuf unless building with NDK."
Dan Albert [Tue, 11 Nov 2014 18:42:17 +0000 (10:42 -0800)]
Use platform protobuf unless building with NDK.
The NDK protobuf library depends on the final target linking stlport
(since it is a static library). Since the platform stlport is going
away, we need to use a separate version of the protobuf library that
is compiled for the platform against libc++.
Note that this should be the case for _all_ libraries built with the
NDK. If a library needs to be used by both an NDK built final target
and a platform built final target, there should be both an NDK and
platform version of the library.
Bug:
15193147
Change-Id: I0ead61c2d1cd9d0248b304ab7d8682dedd6e8366
Yabin Cui [Tue, 11 Nov 2014 18:34:37 +0000 (10:34 -0800)]
kill HAVE_POSIX_FILEMAP
Bug:
18315579
Change-Id: I7a20ad40dc0ec121f0e84202831e6019005104e7
Elliott Hughes [Tue, 11 Nov 2014 18:07:44 +0000 (18:07 +0000)]
am
b3893943: Merge "Remove unused variables from select.mk."
* commit '
b38939436199c65299809f6adb50db6d3b44f7b0':
Remove unused variables from select.mk.
Elliott Hughes [Tue, 11 Nov 2014 17:59:17 +0000 (17:59 +0000)]
Merge "Remove unused variables from select.mk."
Yabin Cui [Tue, 11 Nov 2014 17:40:51 +0000 (17:40 +0000)]
am
4dc8e856: Merge "remove __linux__ in AndroidConfig.h"
* commit '
4dc8e8561fa807fb6417f1405f4364a1bf6d4060':
remove __linux__ in AndroidConfig.h
Yabin Cui [Tue, 11 Nov 2014 17:32:34 +0000 (17:32 +0000)]
Merge "remove __linux__ in AndroidConfig.h"
Elliott Hughes [Tue, 11 Nov 2014 04:06:29 +0000 (20:06 -0800)]
Remove unused variables from select.mk.
I've no idea what these were meant to be for, but they're unused.
Change-Id: I978568bd83f91eb952c35a3a481bd517312062f0
Yabin Cui [Tue, 11 Nov 2014 03:11:11 +0000 (19:11 -0800)]
remove __linux__ in AndroidConfig.h
Bug:
18316409
Change-Id: If6644074ec86efc2f9f91a98bf82fe26be6f66d3
Greg Hartman [Tue, 11 Nov 2014 02:55:16 +0000 (02:55 +0000)]
am
9f00b5a0: Restore the diskinstaller dependency, since it\'s needed for GCE. automerge:
2ebfef4
* commit '
9f00b5a077afa9f1cc77ac9bd4e8edc9d9464ae2':
Restore the diskinstaller dependency, since it's needed for GCE.
Greg Hartman [Tue, 11 Nov 2014 02:55:15 +0000 (02:55 +0000)]
am
711fe355: Add a hook for the syslinux bootloader. automerge:
4c46710
* commit '
711fe35574d5c2f7a668db1ca69a0ce13362fd31':
Add a hook for the syslinux bootloader.
Greg Hartman [Tue, 11 Nov 2014 02:47:55 +0000 (02:47 +0000)]
Restore the diskinstaller dependency, since it\'s needed for GCE.
automerge:
2ebfef4
* commit '
2ebfef448465b99260b6900bc207d42ead09e96c':
Restore the diskinstaller dependency, since it's needed for GCE.
Greg Hartman [Tue, 11 Nov 2014 02:47:50 +0000 (02:47 +0000)]
Add a hook for the syslinux bootloader.
automerge:
4c46710
* commit '
4c46710e7a5cbcb1807d183aaeb88d68f98b6753':
Add a hook for the syslinux bootloader.
Greg Hartman [Wed, 5 Nov 2014 05:17:06 +0000 (21:17 -0800)]
Restore the diskinstaller dependency, since it's needed for GCE.
Change-Id: Ieb2695afbe551e829357bad56d5fe1501165b495
Greg Hartman [Fri, 31 Oct 2014 17:43:52 +0000 (10:43 -0700)]
Add a hook for the syslinux bootloader.
Change-Id: Ia8638e9dcb025743a66c52ad43b161ee70602c89
Yabin Cui [Tue, 11 Nov 2014 02:15:34 +0000 (02:15 +0000)]
am
86596342: Merge "kill OS_CASE_SENSITIVE"
* commit '
8659634285d29edbbb364277f5950f41e26a15d4':
kill OS_CASE_SENSITIVE
Yabin Cui [Tue, 11 Nov 2014 01:08:45 +0000 (01:08 +0000)]
Merge "kill OS_CASE_SENSITIVE"
Igor Murashkin [Tue, 11 Nov 2014 00:30:34 +0000 (00:30 +0000)]
am
ea0056a0: am
6e27e3de: am
964935b8: core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
* commit '
ea0056a07135a19f4a86eb6056107deddcc9f4c5':
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
Ying Wang [Tue, 11 Nov 2014 00:30:22 +0000 (00:30 +0000)]
am
c93d39af: am
461850da: resolved conflicts for merge of
0a7fcb00 to lmp-mr1-dev
* commit '
c93d39af9ad69de5f74ce2c2a53b67f745308c09':
Introduce per-product per-module dex-preopt config
Yabin Cui [Tue, 11 Nov 2014 00:19:22 +0000 (00:19 +0000)]
am
d8e38e1b: Merge "kill HAVE_INOTIFY"
* commit '
d8e38e1b1ad62a2c2f981ce0bafd40f0cee5dcef':
kill HAVE_INOTIFY
Igor Murashkin [Tue, 11 Nov 2014 00:17:44 +0000 (00:17 +0000)]
am
6e27e3de: am
964935b8: core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
* commit '
6e27e3de86cef6354db56c274beca875dafccbaf':
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
Yabin Cui [Tue, 11 Nov 2014 00:14:25 +0000 (00:14 +0000)]
am
3dbac214: Merge "kill HAVE_STAT_ST_MTIM"
* commit '
3dbac214c22a44042f3e12da37f0fada341123da':
kill HAVE_STAT_ST_MTIM
Ying Wang [Tue, 11 Nov 2014 00:13:46 +0000 (00:13 +0000)]
am
461850da: resolved conflicts for merge of
0a7fcb00 to lmp-mr1-dev
* commit '
461850dab19ea4b9552d079aa6c80f4bbbef6ab5':
Introduce per-product per-module dex-preopt config
Igor Murashkin [Tue, 11 Nov 2014 00:12:00 +0000 (00:12 +0000)]
am
964935b8: core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
* commit '
964935b8a6ef52f090eb6f48875db5ebb32962cf':
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
Yabin Cui [Tue, 11 Nov 2014 00:11:03 +0000 (00:11 +0000)]
Merge "kill HAVE_INOTIFY"
Ying Wang [Tue, 11 Nov 2014 00:07:40 +0000 (16:07 -0800)]
resolved conflicts for merge of
0a7fcb00 to lmp-mr1-dev
Change-Id: Ia780b29bfc9a7b3409bf04ba0e18e937c9467a0f
Elliott Hughes [Tue, 11 Nov 2014 00:07:17 +0000 (00:07 +0000)]
am
83da486c: Merge "Remove HAVE_DIRENT_D_TYPE."
* commit '
83da486c37fd90e9b02cbc768fedfb2ca89b96f6':
Remove HAVE_DIRENT_D_TYPE.