Commit graph

20631 commits

Author SHA1 Message Date
Dan Albert
becb42cafa am fbb553dc: Merge "Colorize build success/failure message."
* commit 'fbb553dcd8a1cc65a7b2f56fca7604d5850f59c8':
  Colorize build success/failure message.
2014-11-17 19:44:17 +00:00
Dan Albert
fbb553dcd8 Merge "Colorize build success/failure message." 2014-11-17 19:34:11 +00:00
Ying Wang
4aa4de961b am 9a0a8bd0: am 9a9d180f: Install preloaded-classes as a standalone configuration file
* commit '9a0a8bd00697fd6dd3e7dd6fb5dcf3697dc27507':
  Install preloaded-classes as a standalone configuration file
2014-11-17 18:28:19 +00:00
Ying Wang
9a0a8bd006 am 9a9d180f: Install preloaded-classes as a standalone configuration file
* commit '9a9d180ff1cafc547bd9d3b31a10db749d8ab359':
  Install preloaded-classes as a standalone configuration file
2014-11-17 18:24:27 +00:00
Dan Albert
71b0d7b250 am 8df7653d: Merge "Remove logic for platform stlport gtest."
* commit '8df7653d5608e5d459758a91e6c677c7d5fcc43f':
  Remove logic for platform stlport gtest.
2014-11-15 23:49:27 +00:00
Dan Albert
8df7653d56 Merge "Remove logic for platform stlport gtest." 2014-11-15 23:42:15 +00:00
Dan Albert
b59995d0cd Colorize build success/failure message.
Change-Id: I8901689876e65f5b72050c40e1580f167e49c2b0
2014-11-14 22:37:46 -08:00
Ying Wang
9a9d180ff1 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
2014-11-14 15:38:54 -08:00
Ying Wang
8cbb0eac18 am 5520d930: Merge "sign_target_files_apks: fix recovery patch generation"
* commit '5520d930c8e78a3bea4eeba9d0430d1c3f19dba8':
  sign_target_files_apks: fix recovery patch generation
2014-11-14 19:01:35 +00:00
Ying Wang
5520d930c8 Merge "sign_target_files_apks: fix recovery patch generation" 2014-11-14 18:53:57 +00:00
Dan Albert
7d5fe24251 am a05a04cc: Merge "Refactor transform-o-to-* definitions."
* commit 'a05a04cc754a6374c2ce6406dece9bbafa0abea0':
  Refactor transform-o-to-* definitions.
2014-11-14 18:09:48 +00:00
Dan Albert
a05a04cc75 Merge "Refactor transform-o-to-* definitions." 2014-11-14 18:01:21 +00:00
Dmitriy Ivanov
11b4800be5 am dd20e68d: Merge "Fix device detection and path to tapas"
* commit 'dd20e68d8c37b28be86f2c2a5be8350ec35dd814':
  Fix device detection and path to tapas
2014-11-14 17:58:57 +00:00
Dmitriy Ivanov
dd20e68d8c Merge "Fix device detection and path to tapas" 2014-11-14 17:50:40 +00:00
Michael Runge
353bf5aab6 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
2014-11-14 07:29:43 +00:00
Michael Runge
b5d7011d78 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
2014-11-14 07:25:11 +00:00
Michael Runge
100a9f0720 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
2014-11-14 07:19:58 +00:00
Michael Runge
11d210154d am f178d364: Merge "Allow images to be readded to target-files" into lmp-dev
* commit 'f178d36441c3a688cfe5eb41a5ce724ba01a4ecf':
  Allow images to be readded to target-files
2014-11-14 07:17:22 +00:00
Michael Runge
f178d36441 Merge "Allow images to be readded to target-files" into lmp-dev 2014-11-14 07:14:48 +00:00
Michael Runge
2e0d8fcf08 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
2014-11-13 22:55:35 -08:00
Dmitriy Ivanov
8cde5289a4 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
2014-11-13 19:46:43 -08:00
Stephen Hines
20bebfe456 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.
2014-11-14 03:15:14 +00:00
Stephen Hines
74b2870a27 Merge "Clean out *.prop files due to dex2oat instruction-set flag change." 2014-11-14 03:07:31 +00:00
Stephen Hines
39bf012335 Clean out *.prop files due to dex2oat instruction-set flag change.
Change-Id: Ib1e94cfe08bad9e51fd46e8a1a09926877f179de
2014-11-13 19:04:28 -08:00
Paul Lawrence
fb4415934c am 9ebb0067: am a37b2bb2: Fix the build
* commit '9ebb00679946cda44c5abdadaafa6c45b2cdcb29':
  Fix the build
2014-11-14 02:18:23 +00:00
Dmitriy Ivanov
0cd1bbd048 am 3537692d: Merge "Switch --hash-style to gnu"
* commit '3537692df3f64f68bf202d9857ae67e19bc4eaa4':
  Switch --hash-style to gnu
2014-11-14 02:13:13 +00:00
Paul Lawrence
9ebb006799 am a37b2bb2: Fix the build
* commit 'a37b2bb236486d5fc9158dbc66d1ff73a63c6e81':
  Fix the build
2014-11-14 02:12:48 +00:00
Paul Lawrence
a37b2bb236 Fix the build
Bug: 15984840
Bug: 18120110
Change-Id: I0224d5a31e03b711953d9496ecb00b6d88b8ef4c
2014-11-14 02:04:33 +00:00
Dmitriy Ivanov
3537692df3 Merge "Switch --hash-style to gnu" 2014-11-14 01:47:00 +00:00
Ian Rogers
296fb4c77c am 93efec89: Merge "Pass instruction set variant to dex2oat."
* commit '93efec89e067c5fe6f4585a5f0f033826310ee76':
  Pass instruction set variant to dex2oat.
2014-11-14 00:34:24 +00:00
Ian Rogers
93efec89e0 Merge "Pass instruction set variant to dex2oat." 2014-11-14 00:21:52 +00:00
Dan Albert
e088c0d281 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
2014-11-13 16:21:46 -08:00
Sami Tolvanen
5132315546 am 2a1697d9: am 8d212ea8: DO NOT MERGE: Change verity key formats
* commit '2a1697d9831fc887a32c661fa4e3758f32790e67':
  DO NOT MERGE: Change verity key formats
2014-11-14 00:03:51 +00:00
Sami Tolvanen
2a1697d983 am 8d212ea8: DO NOT MERGE: Change verity key formats
* commit '8d212ea8735233211b38f55819841fa97a744eaa':
  DO NOT MERGE: Change verity key formats
2014-11-13 23:53:41 +00:00
Yabin Cui
6da7611890 am eddd9fb0: Merge "kill HAVE_FORKEXEC"
* commit 'eddd9fb03faa607c77feed1cea8f435df7f64140':
  kill HAVE_FORKEXEC
2014-11-13 23:35:27 +00:00
Sami Tolvanen
8d212ea873 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 72d90eb189)
2014-11-13 23:23:31 +00:00
Yabin Cui
eddd9fb03f Merge "kill HAVE_FORKEXEC" 2014-11-13 23:22:46 +00:00
Dmitriy Ivanov
179685c1c3 Switch --hash-style to gnu
Bug: 18373609
Change-Id: Ia2c965fb86295858d9a97db2ec8d54d99e3d431f
2014-11-13 14:51:10 -08:00
Yabin Cui
b4157cd7c5 am d3d6c383: Merge "kill HAVE_LOCALTIME_R"
* commit 'd3d6c3830f2c1b25f97a8e0001edfda4583a309a':
  kill HAVE_LOCALTIME_R
2014-11-13 20:09:30 +00:00
Yabin Cui
d3d6c3830f Merge "kill HAVE_LOCALTIME_R" 2014-11-13 20:00:23 +00:00
Yabin Cui
e9ae59b47f kill HAVE_LOCALTIME_R
Bug: 18361583
Change-Id: If76334a6e18893b65d9b526271620a460a75bf22
2014-11-13 11:51:37 -08:00
Yabin Cui
faddef7018 am 044568be: Merge "kill HAVE_GETHOSTBYNAME_R"
* commit '044568be18bb67a254398d65c15fe5e9caeb9d02':
  kill HAVE_GETHOSTBYNAME_R
2014-11-13 19:21:48 +00:00
Yabin Cui
044568be18 Merge "kill HAVE_GETHOSTBYNAME_R" 2014-11-13 19:10:26 +00:00
Yabin Cui
19230103ee kill HAVE_GETHOSTBYNAME_R
Bug: 18363225
Change-Id: Ib34c094cd21b2221178755acdd9475a5bc2bf2c0
2014-11-13 10:25:56 -08:00
Elliott Hughes
cc12050f34 am 6c706222: Merge "Remove HAVE_SHORT_ENUMS."
* commit '6c7062221b7582c5d41acdb7a1d865ca629707ed':
  Remove HAVE_SHORT_ENUMS.
2014-11-13 05:27:44 +00:00
Elliott Hughes
6c7062221b Merge "Remove HAVE_SHORT_ENUMS." 2014-11-13 05:20:38 +00:00
Elliott Hughes
0e3a0fcb95 Remove HAVE_SHORT_ENUMS.
Change-Id: Ia0e8a52cd8d7655508754ec0a6482f2dd055a68e
2014-11-12 21:07:07 -08:00
Yabin Cui
e9680c2212 kill HAVE_FORKEXEC
Bug: 18317407
Change-Id: Idaff8a161305325dbb0a9e00764afe98b66e3312
2014-11-12 17:15:30 -08:00
Yabin Cui
eb793be2c7 am 957037dc: Merge "kill HAVE_POSIX_FILEMAP"
* commit '957037dc40c7be54e7ffa6f56cca48e9db31dc7b':
  kill HAVE_POSIX_FILEMAP
2014-11-13 00:15:25 +00:00
Yabin Cui
957037dc40 Merge "kill HAVE_POSIX_FILEMAP" 2014-11-13 00:02:25 +00:00