OSDN Git Service
Andreas Gampe [Tue, 18 Nov 2014 23:39:07 +0000 (23:39 +0000)]
am
44259e4c: Merge "Build: Support for compiled-classes file"
* commit '
44259e4cc64bd0382fb27f6d7540c7494db198cc':
Build: Support for compiled-classes file
Andreas Gampe [Tue, 18 Nov 2014 23:31:49 +0000 (23:31 +0000)]
Merge "Build: Support for compiled-classes file"
Andreas Gampe [Tue, 18 Nov 2014 23:13:56 +0000 (23:13 +0000)]
am
8bde9873: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files"
* commit '
8bde98733bb974253203ecbd5e62e32ef62e66ba':
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
Andreas Gampe [Tue, 18 Nov 2014 19:45:10 +0000 (11:45 -0800)]
Build: Support for compiled-classes file
Allow a compiled-classes file for pre-opting.
Bug:
18410571
(cherry picked from commit
4fec0bb265ac8cdbe883b8868abfcb56713db170)
Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7
Andreas Gampe [Tue, 18 Nov 2014 23:08:16 +0000 (23:08 +0000)]
Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files"
Andreas Gampe [Tue, 18 Nov 2014 23:07:08 +0000 (23:07 +0000)]
am
b457d0ea: (-s ours) am
4fec0bb2: Build: Support for compiled-classes file
* commit '
b457d0ea33b1e6d93bc4a09cda43d6e74b3d1687':
Build: Support for compiled-classes file
Andreas Gampe [Tue, 18 Nov 2014 23:00:10 +0000 (23:00 +0000)]
am
4fec0bb2: Build: Support for compiled-classes file
* commit '
4fec0bb265ac8cdbe883b8868abfcb56713db170':
Build: Support for compiled-classes file
Igor Murashkin [Thu, 30 Oct 2014 23:08:07 +0000 (16:08 -0700)]
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
When WITH_DEXPREOPT=true is set, if we also set WITH_DEXPREOPT_PIC=true
then the build will generate position-independent OAT images.
This means that all the system applications no longer need to be
relocated into /data/dalvik-cache and this can achieve saving disk space
at the cost of slightly slower running code.
Bug:
18035729
(cherry picked from commit
da9f1a7e82b7e6d0677553f211835625078347f2)
Change-Id: Ifd517c842f48bf31568bf5ff56667298d422c2c0
Andreas Gampe [Tue, 18 Nov 2014 19:45:10 +0000 (11:45 -0800)]
Build: Support for compiled-classes file
Allow a compiled-classes file for pre-opting.
Bug:
18410571
Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7
Elliott Hughes [Tue, 18 Nov 2014 22:22:32 +0000 (22:22 +0000)]
am
39961b92: Merge "Remove another unused definition."
* commit '
39961b926e637fd29cc6a32d956553c59c65e37c':
Remove another unused definition.
Elliott Hughes [Tue, 18 Nov 2014 22:15:25 +0000 (22:15 +0000)]
Merge "Remove another unused definition."
Elliott Hughes [Tue, 18 Nov 2014 22:10:27 +0000 (14:10 -0800)]
Remove another unused definition.
We have a lot of definitions around the tree, of which this is but one,
but we have no users.
Change-Id: Ic411505a0370be2b56150275fa9b8f5329241ce8
Elliott Hughes [Tue, 18 Nov 2014 22:02:28 +0000 (22:02 +0000)]
am
3c0682c6: Merge "Kill unused ARCH_* defines."
* commit '
3c0682c6b52f30301a909a6f8376384a8547d376':
Kill unused ARCH_* defines.
Elliott Hughes [Tue, 18 Nov 2014 21:55:12 +0000 (21:55 +0000)]
Merge "Kill unused ARCH_* defines."
Elliott Hughes [Tue, 18 Nov 2014 21:02:00 +0000 (21:02 +0000)]
am
e5743ef7: Merge "Remove libdvm dex preopt support."
* commit '
e5743ef73f3a1911f6e2124e9ec3a6d671f6e378':
Remove libdvm dex preopt support.
Elliott Hughes [Tue, 18 Nov 2014 20:57:34 +0000 (12:57 -0800)]
Kill unused ARCH_* defines.
No one's using ARCH_AARCH64 or AARCH_MIPS64 yet, and ARCH_PPC was always more
aspirational than real.
Change-Id: I07c6cbad6eb0917c4c24848a98c3bc9a3fe72db6
Elliott Hughes [Tue, 18 Nov 2014 20:52:31 +0000 (20:52 +0000)]
Merge "Remove libdvm dex preopt support."
smain@google.com [Tue, 18 Nov 2014 16:47:18 +0000 (16:47 +0000)]
am
ff62239b: am
2e216835: am
9220b6e6: am
0dd70276: am
6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
* commit '
ff62239b026fb2635ffc6bdd3f0ad79d0fab2ee7':
followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
smain@google.com [Tue, 18 Nov 2014 16:42:50 +0000 (16:42 +0000)]
am
2e216835: am
9220b6e6: am
0dd70276: am
6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
* commit '
2e216835ee6d35e1c7b692f9982c1bd34b8ce703':
followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
smain@google.com [Tue, 18 Nov 2014 16:39:39 +0000 (16:39 +0000)]
am
9220b6e6: am
0dd70276: am
6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
* commit '
9220b6e676aefe152540a6cf832e5fd18817370e':
followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
smain@google.com [Tue, 18 Nov 2014 16:34:27 +0000 (16:34 +0000)]
am
0dd70276: am
6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
* commit '
0dd70276f6cfe09010054897a80d406ea9ac13de':
followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
smain@google.com [Tue, 18 Nov 2014 16:30:31 +0000 (16:30 +0000)]
am
6bdcb981: followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
* commit '
6bdcb981ce098cae2fb9e690485ebaab47b2225a':
followup to recent cookie max-age change to remove parameter and use 2-year for all cookies bug:
17781603
Yabin Cui [Tue, 18 Nov 2014 03:46:34 +0000 (03:46 +0000)]
am
57ed1ddf: Merge "kill HAVE_TERMIO_H"
* commit '
57ed1ddf78ecf7815a1b57137ea42893237a4756':
kill HAVE_TERMIO_H
Yabin Cui [Tue, 18 Nov 2014 03:40:34 +0000 (03:40 +0000)]
Merge "kill HAVE_TERMIO_H"
Dave Langemak [Tue, 18 Nov 2014 02:08:27 +0000 (02:08 +0000)]
am
8de0a3d3: am
139f8a81: am
a4cf5cc9: (-s ours) am
5e923c91: Increment Android versions to 5.0.1
* commit '
8de0a3d31a3e0a5573fa99780df5ad7c272183f2':
Increment Android versions to 5.0.1
Elliott Hughes [Mon, 17 Nov 2014 18:22:49 +0000 (10:22 -0800)]
Remove libdvm dex preopt support.
libdvm is dead.
Change-Id: Ib8571c007f8a9f0e0eaf5c61b5d2e416b2d95089
Dave Langemak [Tue, 18 Nov 2014 01:03:08 +0000 (01:03 +0000)]
am
139f8a81: am
a4cf5cc9: (-s ours) am
5e923c91: Increment Android versions to 5.0.1
* commit '
139f8a8146f5b6d6c9da6dc744b3420d417bf3a5':
Increment Android versions to 5.0.1
Dave Langemak [Tue, 18 Nov 2014 00:56:49 +0000 (00:56 +0000)]
am
a4cf5cc9: (-s ours) am
5e923c91: Increment Android versions to 5.0.1
* commit '
a4cf5cc9ecc3c5d2658943117f7d182b26c77b30':
Increment Android versions to 5.0.1
Dave Langemak [Tue, 18 Nov 2014 00:46:21 +0000 (00:46 +0000)]
am
5e923c91: Increment Android versions to 5.0.1
* commit '
5e923c91b42f1df7ec3da97b1506dd9aa93795d0':
Increment Android versions to 5.0.1
Dave Langemak [Tue, 18 Nov 2014 00:37:50 +0000 (16:37 -0800)]
Increment Android versions to 5.0.1
Change-Id: I2880123f0d1215f2028e6d3bc3f88fee5714ae74
Dan Albert [Tue, 18 Nov 2014 00:03:54 +0000 (00:03 +0000)]
am
9b0ccb74: Merge "Fix the libgcc/libatomic link order."
* commit '
9b0ccb7480a0b86d27bb6c7352b5cd5e79bfbf82':
Fix the libgcc/libatomic link order.
Dan Albert [Mon, 17 Nov 2014 23:55:57 +0000 (23:55 +0000)]
Merge "Fix the libgcc/libatomic link order."
Dan Albert [Mon, 17 Nov 2014 23:11:54 +0000 (23:11 +0000)]
am
654e3907: Merge "Remove libstlport from PRODUCT_PACKAGES."
* commit '
654e39072ecfc0052af0cbfca7e51aa8fc7856e8':
Remove libstlport from PRODUCT_PACKAGES.
Dan Albert [Mon, 17 Nov 2014 23:05:48 +0000 (23:05 +0000)]
Merge "Remove libstlport from PRODUCT_PACKAGES."
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.
Yabin Cui [Mon, 17 Nov 2014 22:49:39 +0000 (14:49 -0800)]
kill HAVE_TERMIO_H
Bug:
18398307
Change-Id: I54fc0235fbc40630f8024570b928dba115b1c39a
Dan Albert [Mon, 17 Nov 2014 22:26:11 +0000 (14:26 -0800)]
Remove libstlport from PRODUCT_PACKAGES.
Bug:
15193147
Change-Id: Idd2699d895393216bcd514da64145540faec4033
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
smain@google.com [Fri, 14 Nov 2014 19:53:07 +0000 (11:53 -0800)]
followup to recent cookie max-age change to remove parameter and use 2-year for all cookies
bug:
17781603
Change-Id: Id0da9d41e01c6a45672d1362fc1c5aa39e558904
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
Dan Albert [Fri, 14 Nov 2014 05:24:04 +0000 (21:24 -0800)]
Fix the libgcc/libatomic link order.
The previous position of libgcc.a/libatomic.a on the link line causes
the linker to prefer satisfying dependencies from these libraries from
other libraries that might include them, rather than from libgcc.a (or
libatomic.a) itself. This imposes an ABI requirement that those
intermediate shared libraries _always_ export those symbols, which is
undesirable.
Change-Id: Ib593236b475d3e98356b2b1be6f96cee2b67378f
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