OSDN Git Service
Michael Runge [Fri, 14 Nov 2014 19:19:18 +0000 (19:19 +0000)]
am
353bf5aa: am
b5d7011d: am
100a9f07: am
11d21015: am
f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit '
353bf5aab651afe2883122459da33f67640abe8f':
Allow images to be readded to target-files
Stephen Hines [Fri, 14 Nov 2014 19:18:54 +0000 (19:18 +0000)]
am
20bebfe4: am
74b2870a: Merge "Clean out *.prop files due to dex2oat instruction-set flag change."
* commit '
20bebfe456e82a30e7504e5cb413a413f0b30665':
Clean out *.prop files due to dex2oat instruction-set flag change.
Paul Lawrence [Fri, 14 Nov 2014 19:18:47 +0000 (19:18 +0000)]
Dmitriy Ivanov [Fri, 14 Nov 2014 19:18:45 +0000 (19:18 +0000)]
am
0cd1bbd0: am
3537692d: Merge "Switch --hash-style to gnu"
* commit '
0cd1bbd04844e723fda58b63565ab7167b9522ad':
Switch --hash-style to gnu
Ian Rogers [Fri, 14 Nov 2014 19:18:10 +0000 (19:18 +0000)]
am
296fb4c7: am
93efec89: Merge "Pass instruction set variant to dex2oat."
* commit '
296fb4c77cf04aeb6ffdcdd5a94578a180f7a3a2':
Pass instruction set variant to dex2oat.
Sami Tolvanen [Fri, 14 Nov 2014 19:17:46 +0000 (19:17 +0000)]
am
51323155: (-s ours) am
2a1697d9: am
8d212ea8: DO NOT MERGE: Change verity key formats
* commit '
5132315546c52cedbdcb102bcf6e7ff83d7c4839':
DO NOT MERGE: Change verity key formats
Yabin Cui [Fri, 14 Nov 2014 19:15:45 +0000 (19:15 +0000)]
am
6da76118: am
eddd9fb0: Merge "kill HAVE_FORKEXEC"
* commit '
6da761189057c48f2eb75ecd811e8da62a292e4b':
kill HAVE_FORKEXEC
Yabin Cui [Fri, 14 Nov 2014 18:55:01 +0000 (18:55 +0000)]
am
b4157cd7: am
d3d6c383: Merge "kill HAVE_LOCALTIME_R"
* commit '
b4157cd7c5d36601288a9e2a49659427d1bd7ff9':
kill HAVE_LOCALTIME_R
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
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"
Yabin Cui [Fri, 14 Nov 2014 00:47:29 +0000 (00:47 +0000)]
am
faddef70: am
044568be: Merge "kill HAVE_GETHOSTBYNAME_R"
* commit '
faddef7018c815487d7608a43257075ebf4b9859':
kill HAVE_GETHOSTBYNAME_R
Elliott Hughes [Fri, 14 Nov 2014 00:42:15 +0000 (00:42 +0000)]
am
cc12050f: am
6c706222: Merge "Remove HAVE_SHORT_ENUMS."
* commit '
cc12050f3499313ce66f82d09be2920e42d1c062':
Remove HAVE_SHORT_ENUMS.
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."
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
Sami Tolvanen [Thu, 13 Nov 2014 17:12:25 +0000 (17:12 +0000)]
Merge "Change verity key formats"
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 02:16:43 +0000 (02:16 +0000)]
am
eb793be2: am
957037dc: Merge "kill HAVE_POSIX_FILEMAP"
* commit '
eb793be2c7d93265f2d3490835f49be361eb4513':
kill HAVE_POSIX_FILEMAP
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:26:39 +0000 (23:26 +0000)]
am
7d8b4df9: am
aea83e0d: Merge "Upgrade host tool to x86_64-linux-glibc2.15-4.8"
* commit '
7d8b4df9c4502330f79cb6ad4c6f6bf33010be83':
Upgrade host tool to x86_64-linux-glibc2.15-4.8
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"
Dan Albert [Tue, 11 Nov 2014 23:00:40 +0000 (23:00 +0000)]
am
5245bc8b: am
201f6b3e: Merge "Make modules depend on their makefile."
* commit '
5245bc8b3421b3a9676a9ad650d0804d8d9e2787':
Make modules depend on their makefile.
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 20:05:56 +0000 (20:05 +0000)]
am
a9abc487: am
1f637158: Merge "Use platform protobuf unless building with NDK."
* commit '
a9abc487a8fdf3a82932df3f70efd9aab7fb9d35':
Use platform protobuf unless building with NDK.
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:11:58 +0000 (18:11 +0000)]
am
20228b6e: am
b3893943: Merge "Remove unused variables from select.mk."
* commit '
20228b6e4a499105816d7386c9da2820d6200ccf':
Remove unused variables from select.mk.
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:45:15 +0000 (17:45 +0000)]
am
899b1877: am
4dc8e856: Merge "remove __linux__ in AndroidConfig.h"
* commit '
899b18775b24379e8b4555f4327f6b5c07306608':
remove __linux__ in AndroidConfig.h
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 03:01:50 +0000 (03:01 +0000)]
am
089d7572: am
9f00b5a0: Restore the diskinstaller dependency, since it\'s needed for GCE. automerge:
2ebfef4
* commit '
089d75728ad9498833aef07e19112d2e7321f523':
Restore the diskinstaller dependency, since it's needed for GCE.
Greg Hartman [Tue, 11 Nov 2014 03:01:49 +0000 (03:01 +0000)]
am
5c5b443f: am
711fe355: Add a hook for the syslinux bootloader. automerge:
4c46710
* commit '
5c5b443f91da85b84bec36a78dff223ec8b2b3fe':
Add a hook for the syslinux bootloader.
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:26:03 +0000 (02:26 +0000)]
am
1f4d40be: am
86596342: Merge "kill OS_CASE_SENSITIVE"
* commit '
1f4d40be5d9ccaed6e60b2f511b22f8f31a75ef1':
kill OS_CASE_SENSITIVE
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:44:54 +0000 (00:44 +0000)]
am
30b6a8bf: am
ea0056a0: am
6e27e3de: am
964935b8: core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
* commit '
30b6a8bfe2ccac61ac51be44fbe635d50c363a54':
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
Ying Wang [Tue, 11 Nov 2014 00:44:48 +0000 (00:44 +0000)]
am
5877c777: am
c93d39af: am
461850da: resolved conflicts for merge of
0a7fcb00 to lmp-mr1-dev
* commit '
5877c7777a2382bfba21dce37e9bf182294a1d13':
Introduce per-product per-module dex-preopt config
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:24:41 +0000 (00:24 +0000)]
am
2c1eb2fe: am
d8e38e1b: Merge "kill HAVE_INOTIFY"
* commit '
2c1eb2fe213ec9a9c66fd75b6224a4396c919e59':
kill HAVE_INOTIFY
Yabin Cui [Tue, 11 Nov 2014 00:21:04 +0000 (00:21 +0000)]
am
c0ce08cc: am
3dbac214: Merge "kill HAVE_STAT_ST_MTIM"
* commit '
c0ce08cc79d502c9cfd7fc2ca37a017b63552c68':
kill HAVE_STAT_ST_MTIM
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
Elliott Hughes [Tue, 11 Nov 2014 00:16:20 +0000 (00:16 +0000)]
am
499ed6c4: am
83da486c: Merge "Remove HAVE_DIRENT_D_TYPE."
* commit '
499ed6c496022acf5687c01bf2faf8420c6d3760':
Remove HAVE_DIRENT_D_TYPE.
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.
Yabin Cui [Tue, 11 Nov 2014 00:04:35 +0000 (00:04 +0000)]
Merge "kill HAVE_STAT_ST_MTIM"
Elliott Hughes [Mon, 10 Nov 2014 23:57:09 +0000 (23:57 +0000)]
Merge "Remove HAVE_DIRENT_D_TYPE."
Yabin Cui [Mon, 10 Nov 2014 23:44:27 +0000 (15:44 -0800)]
kill HAVE_INOTIFY
Bug:
18314841
Change-Id: Idfcbeb62a57f72a47eb732f085fbd1ab27302f85
Elliott Hughes [Mon, 10 Nov 2014 23:33:39 +0000 (15:33 -0800)]
Remove HAVE_DIRENT_D_TYPE.
Only Windows doesn't have it, and we don't build atree for Windows.
Change-Id: Ib6e96be73340c36cdfcb3654ed540f690bf7550b
Yabin Cui [Mon, 10 Nov 2014 18:37:14 +0000 (10:37 -0800)]
kill HAVE_STAT_ST_MTIM
Bug:
18300671
Change-Id: I92b5691924b995d9c883fc0f777c566ac4c35d1d
Yabin Cui [Mon, 10 Nov 2014 23:03:11 +0000 (15:03 -0800)]
kill OS_CASE_SENSITIVE
Bug:
18314594
Change-Id: I5dc5072d43299c0e5d96ce9640e8405cbb633506
Yabin Cui [Mon, 10 Nov 2014 22:35:07 +0000 (22:35 +0000)]
am
ca28c637: am
1036850f: Merge "kill HAVE_SCHED_SETSCHEDULER"
* commit '
ca28c6379c54e1abaebf4173d4d90b6501c09ae1':
kill HAVE_SCHED_SETSCHEDULER
Yabin Cui [Mon, 10 Nov 2014 22:30:42 +0000 (22:30 +0000)]
am
1036850f: Merge "kill HAVE_SCHED_SETSCHEDULER"
* commit '
1036850f8f8607f4d2898fcc73abb1fff23570d6':
kill HAVE_SCHED_SETSCHEDULER