Commit graph

14666 commits

Author SHA1 Message Date
Ben Cheng
24834ffddd am 4f92abad: Merge "Two quick fixes: fix kernel header location and nostdlib."
* commit '4f92abad95f724c0bf29c93d6b1c8fff41049007':
  Two quick fixes: fix kernel header location and nostdlib.
2013-10-25 16:11:34 -07:00
Ben Cheng
4f92abad95 Merge "Two quick fixes: fix kernel header location and nostdlib." 2013-10-25 16:36:40 +00:00
Ben Cheng
e61dea99c3 Two quick fixes: fix kernel header location and nostdlib.
Change-Id: Idf2d101e16e895ca75a74a095091e3543b2b482b
2013-10-25 09:34:29 -07:00
Nick Kralevich
3ee5710d69 am 0f798297: am 8c4efac5: Merge "x86: turn on -Wl,--fatal-warnings"
* commit '0f798297636ea07f1a87412776d48a57888ea8fe':
  x86: turn on -Wl,--fatal-warnings
2013-10-24 14:40:00 -07:00
Nick Kralevich
0f79829763 am 8c4efac5: Merge "x86: turn on -Wl,--fatal-warnings"
* commit '8c4efac588d695b11ed341a0e4531d3e220dbe8c':
  x86: turn on -Wl,--fatal-warnings
2013-10-24 14:36:38 -07:00
Nick Kralevich
8c4efac588 Merge "x86: turn on -Wl,--fatal-warnings" 2013-10-24 21:34:28 +00:00
Nick Kralevich
46ed4aa58b x86: turn on -Wl,--fatal-warnings
In 4f2f16da14, we added
-Wl,--warn-shared-textrel to TARGET_GLOBAL_LDFLAGS. This generated
a warning whenever we created a shared library with a text
relocation.  At the time, we wrote:

=====
Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.

This warning will turn into an error in a future change
(via --fatal-warnings)
=====

All code which uses text relocations has either been fixed, or
we've temporarily worked around the issue so the code can still
compile.

Enable --fatal-warnings.

Bug: 11353056
Change-Id: I2f2c65352166ef0a96f54858de1556f0290fe306
2013-10-24 13:36:08 -07:00
The Android Automerger
7d77d6b084 "KOT24" 2013-10-24 06:07:11 -07:00
The Android Automerger
53d816c3bf merge in klp-mr1-release history after reset to klp-dev 2013-10-24 06:00:56 -07:00
Colin Cross
2df0464a54 am a2ccae25: Merge "avoid // in copy headers rule" into klp-dev
* commit 'a2ccae2546db082e571168650b279125bfceb861':
  avoid // in copy headers rule
2013-10-23 18:30:02 -07:00
Baligh Uddin
31469e36e0 am a7b5c4a7: Waiting till post MR0 - this impacts signing tools for MR0.
* commit 'a7b5c4a7dc77a0896d6314828b9ce85f82d103e8':
  Waiting till post MR0 - this impacts signing tools for MR0.
2013-10-23 18:30:01 -07:00
Colin Cross
a2ccae2546 Merge "avoid // in copy headers rule" into klp-dev 2013-10-24 01:23:34 +00:00
Colin Cross
a6c4ebdd11 avoid // in copy headers rule
If LOCAL_COPY_HEADERS_TO is not set, then the copy headers rule
target is set to out/target/product/../obj/include//header.h.
If another rule depends on the header without the //, it will
fail.  Don't insert LOCAL_COPY_HEADERS_TO if it is blank.

Change-Id: Ideac7f8e01288ab5cca98645b307945d6ae9e97c
2013-10-23 13:18:39 -07:00
Baligh Uddin
a7b5c4a7dc Waiting till post MR0 - this impacts signing tools for MR0.
Revert "Modify release tools to replace certs in MMAC files."

This reverts commit a6e0466ab5.

Change-Id: Ib7819185bad119013f307ce4301d5f02190e14ed
2013-10-23 16:53:43 +00:00
The Android Automerger
984afe0d7a "KOT23" 2013-10-23 06:06:14 -07:00
The Android Automerger
6a38122be3 merge in klp-mr1-release history after reset to klp-dev 2013-10-23 06:00:52 -07:00
Robert Craig
d4086d3bc0 am a6e0466a: Modify release tools to replace certs in MMAC files.
* commit 'a6e0466ab5771ab1b9f806b9411015b5ff9852f6':
  Modify release tools to replace certs in MMAC files.
2013-10-22 14:08:52 -07:00
Robert Craig
a6e0466ab5 Modify release tools to replace certs in MMAC files.
Added support to perform a string replace of specified
dev keys with release keys when using the release tool
scripts.

Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

(cherry picked from commit 817c574d75)

Change-Id: I51be8d62945436d3f374f51867295c5b792d4b53
Bug: 11334314
2013-10-22 13:54:46 -07:00
The Android Automerger
e0f3c8f807 "KOT22" 2013-10-22 06:02:09 -07:00
The Android Automerger
4a1c9b10c3 merge in klp-mr1-release history after reset to klp-dev 2013-10-22 06:00:21 -07:00
The Android Automerger
7fddd2219c "KOT21" 2013-10-21 06:02:31 -07:00
The Android Automerger
53d9f9fa2f merge in klp-mr1-release history after reset to klp-dev 2013-10-21 06:00:34 -07:00
Alex Medina
f9f0581405 am 0068d25b: Include drawables for all densities - b/11270325
* commit '0068d25b4895162993118fe3b61d2775fa575e70':
  Include drawables for all densities - b/11270325
2013-10-18 18:17:47 -07:00
Alex Medina
0068d25b48 Include drawables for all densities - b/11270325
Change-Id: I0b1f9b930a13982756dca9428ca91aec0ef343f5
2013-10-18 13:42:42 -07:00
Ben Cheng
8f55b16fb6 am ad6996a6: am 34cf868b: Merge "Point to the uapi header location for aarch64."
* commit 'ad6996a611c0af563edcb352828d3bd55cf85585':
  Point to the uapi header location for aarch64.
2013-10-18 12:11:34 -07:00
Ben Cheng
ad6996a611 am 34cf868b: Merge "Point to the uapi header location for aarch64."
* commit '34cf868be4c7da1e58324051b968021742727692':
  Point to the uapi header location for aarch64.
2013-10-18 12:07:23 -07:00
Ben Cheng
34cf868be4 Merge "Point to the uapi header location for aarch64." 2013-10-18 16:45:13 +00:00
The Android Automerger
9f3493e0aa "KOT18" 2013-10-18 06:06:43 -07:00
synergydev
2b537262fe core: support make 4.00
Make 4.00 is now out, and builds work fine with it.

Change-Id: I49e36d651a7997a52270badb0e8badd975f64e8f
2013-10-17 12:49:07 -07:00
Jeff Sharkey
7732eb5bba am 53619434: Merge "Add blkid to all builds for use by vold." into klp-dev
* commit '53619434ed56043841256dfb2074662dbd0acc5e':
  Add blkid to all builds for use by vold.
2013-10-17 09:40:29 -07:00
Jeff Sharkey
53619434ed Merge "Add blkid to all builds for use by vold." into klp-dev 2013-10-17 16:33:38 +00:00
Ed Heyl
c733410062 am 3b6bffcd: merge in klp-release (no-op)
* commit '3b6bffcda4e66c86c87a6a29a412ef0949f19205': (61 commits)
  "KRT15D"
  "KRT15C"
  "KRT15B"
  "KRT15"
  "KRT14B"
  "KRT14"
  "KRT13B"
  "KRT13"
  "KRT10F"
  "KRT10E"
  "KRT10D"
  "KRT10C"
  "KRT10B"
  "KRT10"
  KRT09B
  "KRT09"
  "KRT08C"
  "KRT08B"
  So long Key Lime Pie, it was nice knowing you.
  "KRT08"
  ...
2013-10-16 17:47:50 -07:00
Ed Heyl
3b6bffcda4 merge in klp-release (no-op) 2013-10-16 17:34:58 -07:00
Scott Main
011a38d184 am 2b205a58: am 919edbe7: am 1c094509: am 6c030b73: fix javadoc sidenav so it does not cutoff overflowing link names
* commit '2b205a5814c39d7b6e7c6646e3ec9da4dad6dcb8':
  fix javadoc sidenav so it does not cutoff overflowing link names
2013-10-16 17:23:45 -07:00
Scott Main
2b205a5814 am 919edbe7: am 1c094509: am 6c030b73: fix javadoc sidenav so it does not cutoff overflowing link names
* commit '919edbe7761767c1ed3e3bb3715aa495908601c7':
  fix javadoc sidenav so it does not cutoff overflowing link names
2013-10-16 17:17:37 -07:00
Scott Main
919edbe776 am 1c094509: am 6c030b73: fix javadoc sidenav so it does not cutoff overflowing link names
* commit '1c094509501d970011dfb73f5d1407c944797773':
  fix javadoc sidenav so it does not cutoff overflowing link names
2013-10-16 17:15:00 -07:00
Scott Main
1c09450950 am 6c030b73: fix javadoc sidenav so it does not cutoff overflowing link names
* commit '6c030b7361630951b49ec6fab25973079517076b':
  fix javadoc sidenav so it does not cutoff overflowing link names
2013-10-16 17:10:55 -07:00
Scott Main
6c030b7361 fix javadoc sidenav so it does not cutoff overflowing link names
Change-Id: I48f3a7cf4715061702c0a0c7537fa1b09734c62a
2013-10-16 17:04:37 -07:00
Jeff Sharkey
1eb5eb1743 Add blkid to all builds for use by vold.
vold now uses blkid to extract UUID and label information from
inserted physical devices.

Bug: 11175082
Change-Id: I56ebe733ff85a498f6d3cbdcf21d40ddc6123f82
2013-10-16 16:31:57 -07:00
Ben Cheng
5797382b53 Point to the uapi header location for aarch64.
Change-Id: Ic42f5520eb0711c35aaf7106939ef83e449bda74
2013-10-16 12:28:38 -07:00
The Android Automerger
12db6c634f "KRT15D" 2013-10-16 01:32:29 -07:00
The Android Automerger
6a22660a5b merge in klp-release history after reset to klp-dev 2013-10-16 01:31:32 -07:00
The Android Automerger
1c05d9c9b0 "KRT15C" 2013-10-15 21:15:05 -07:00
The Android Automerger
86dab9571e merge in klp-release history after reset to klp-dev 2013-10-15 21:13:52 -07:00
The Android Automerger
7ae1d52f26 "KRT15B" 2013-10-15 15:57:09 -07:00
The Android Automerger
b97af74d21 merge in klp-release history after reset to klp-dev 2013-10-15 15:55:16 -07:00
Ed Heyl
8f9b10e53b am 866db61f: update dev build ID
* commit '866db61fff4f6939a5655429b0600d8395acb7d7':
  update dev build ID
2013-10-15 10:53:39 -07:00
Ed Heyl
866db61fff update dev build ID
Change-Id: Icb95a91c7d7ed6754438b5d6bd188cdb3f85a005
2013-10-15 10:37:53 -07:00
Pavel Chupin
f0a4855574 Cleanup x86 and x86_64 flags
-mandroid, -D__ANDROID__ is on by the toolchain;
-msse3 moved to llvm_config, it seems it's required only there;
__cxa_atexit is provided by libc now;
USE_SSE2 should not be used anywhere, it's always true;
remove -mstackreallign and -mfpmath=sse as useless for x86_64;

Change-Id: Ib7739f6522c375c09de10d22616c48a493841c4c
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-15 18:15:57 +04:00
The Android Automerger
e483bf6488 "KRT15" 2013-10-15 06:02:48 -07:00