Commit Graph

20574 Commits

Author SHA1 Message Date
Dan Albert e959b89247 am 71629967: resolved conflicts for merge of 96c22133 to lmp-mr1-dev-plus-aosp
* commit '7162996734fbd2b3c0aaf63db842f2fc48bc95bb':
  Add support for ASAN in host modules.
2014-10-20 20:47:39 +00:00
Dan Albert 7162996734 resolved conflicts for merge of 96c22133 to lmp-mr1-dev-plus-aosp
Change-Id: Ia94c5ad273c3578433d3eb226e8e8de7c1921d34
2014-10-20 13:38:43 -07:00
Dan Albert 96c22133af am 1f134dd0: Merge "Add support for ASAN in host modules."
* commit '1f134dd06cd12f032c833b9a43b476a9557fa8da':
  Add support for ASAN in host modules.
2014-10-20 20:28:43 +00:00
Dan Albert 1f134dd06c Merge "Add support for ASAN in host modules." 2014-10-20 20:24:08 +00:00
Dan Albert 2daceaa83c Add support for ASAN in host modules.
Change-Id: Id9ed83499e0eb995f06e845c3153a50677d768b8
2014-10-20 11:37:18 -07:00
Stephen Hines 8ed26c3e98 am 52b4d2f0: am 7d86749d: am ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '52b4d2f0964feea351e931a32a0671424dc00583':
  Remove unnecessary 10.8-specific build rules
2014-10-20 18:35:52 +00:00
Stephen Hines 52b4d2f096 am 7d86749d: am ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit '7d86749da7033dcf230ceb67f9ae0cd676441e4d':
  Remove unnecessary 10.8-specific build rules
2014-10-20 18:30:27 +00:00
Stephen Hines 7d86749da7 am ed8206db: Merge "Remove unnecessary 10.8-specific build rules"
* commit 'ed8206dba48e182f786ec677d56586ffaf973250':
  Remove unnecessary 10.8-specific build rules
2014-10-20 18:19:25 +00:00
Stephen Hines ed8206dba4 Merge "Remove unnecessary 10.8-specific build rules" 2014-10-20 18:06:35 +00:00
Ying Wang 3c9ea190d3 Merge "Allow to build libcore in PDK build." 2014-10-19 00:17:02 +00:00
Dan Albert 934af716ac am ec28a489: am 28c2d3b9: Merge "Fix breakage for x86_64 static executables."
automerge: ecc5e32

* commit 'ecc5e3218aeeeed423ec226c5c87c42e62ec931c':
  Fix breakage for x86_64 static executables.
2014-10-18 03:31:06 +00:00
Dan Albert ecc5e3218a am ec28a489: am 28c2d3b9: Merge "Fix breakage for x86_64 static executables."
* commit 'ec28a489e8d4fe7ddc35bee1f16e08bebd202dac':
  Fix breakage for x86_64 static executables.
2014-10-18 02:42:35 +00:00
Dan Albert ec28a489e8 am 28c2d3b9: Merge "Fix breakage for x86_64 static executables."
* commit '28c2d3b9852550bc9ae150e2725e08885f1ade73':
  Fix breakage for x86_64 static executables.
2014-10-18 02:25:40 +00:00
Ying Wang 2fee3a8659 Allow to build libcore in PDK build.
Change-Id: Ice40f19dd3302378daa9bd4c4ecd2c1d2c7ff284
2014-10-17 18:26:39 -07:00
Dan Albert 28c2d3b985 Merge "Fix breakage for x86_64 static executables." 2014-10-18 01:05:36 +00:00
Stephen Hines 781094fa43 Remove unnecessary 10.8-specific build rules
We no longer need gcc for host builds, since those all run through clang. This
header include, however, triggers errors about SSE intrinsics by replacing
the more relevant include dirs that we should be using.

Change-Id: I26a949f0109de8e6e2d1f09cb8127be927549cc4
2014-10-17 17:36:42 -07:00
Dan Albert 403ab71eba Fix breakage for x86_64 static executables.
Yikes. Don't know how this slipped through code review.

I had actually mentioned a need for cleanup in this part of the build
system earlier, since the amount of duplication between
transform-o-to-* for each arch means we might fix things incorrectly
in one of them (as I've just shown). Similarly, code reviewers are
likely to skim each one after the first if they all look close enough
(which is presumably what happened here).

Change-Id: I9b85914510f0b114485021deb97f42740712aae5
2014-10-17 16:58:38 -07:00
Clay Murphy b7345236a6 am 064b489f: am 597bfe1e: am 327180f5: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
* commit '064b489f85cc18b945f3bea52f18cc8dd707e6e8':
  Docs: Fixing link, adding Android Partner logo.
2014-10-17 21:28:39 +00:00
Clay Murphy 064b489f85 am 597bfe1e: am 327180f5: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
* commit '597bfe1e0b154df60a8ad9322ff6f248c617a9c1':
  Docs: Fixing link, adding Android Partner logo.
2014-10-17 20:29:02 +00:00
Clay Murphy 597bfe1e0b am 327180f5: Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev
* commit '327180f5d2009be990076f152dffb244939b1673':
  Docs: Fixing link, adding Android Partner logo.
2014-10-17 20:01:06 +00:00
Clay Murphy 327180f5d2 Merge "Docs: Fixing link, adding Android Partner logo." into lmp-dev 2014-10-17 19:47:51 +00:00
smain@google.com 137f71de58 am 05bba0f3: am bd78b888: am be113f8a: fix broken download buttons, make a[name] offset apply only to reference docs
* commit '05bba0f362df835a7fd8fb60764870f6b66cd19b':
  fix broken download buttons, make a[name] offset apply only to reference docs
2014-10-17 19:19:06 +00:00
smain@google.com 2870cc1888 am ea313f1a: am fc3f1719: am 947f3e9e: Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
* commit 'ea313f1a81ea120417d10c70da7dca5f60c24efe':
  fix z-order of hangouts to avoid clobbering the search suggest
2014-10-17 19:19:06 +00:00
Joe Fernandez 2d34a4a213 am 0769da02: am d804dac5: am e321df0c: Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
* commit '0769da021eaf67a8004e6390bf0ef6dcc28b74f8':
  Doc change: update query params to force refresh of local js files.
2014-10-17 19:19:05 +00:00
smain@google.com 0ad8b0eef1 am 9130a812: am 7f37fba6: am 19c6780f: Merge "fix scroll offset when loading non-header pages" into lmp-dev
* commit '9130a81210fcbde9b75a7e96e83a9ee234bc870e':
  fix scroll offset when loading non-header pages
2014-10-17 19:19:04 +00:00
David Friedman cc5be8aa8f am e5f5d5a1: am a3427287: am e0471a82: Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
* commit 'e5f5d5a14f980c17802d269bae4e4de140e9529f':
  Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
2014-10-17 19:19:03 +00:00
smain@google.com 05bba0f362 am bd78b888: am be113f8a: fix broken download buttons, make a[name] offset apply only to reference docs
* commit 'bd78b888a5072cc784a52f1b45fce765205a33e7':
  fix broken download buttons, make a[name] offset apply only to reference docs
2014-10-17 19:12:11 +00:00
smain@google.com ea313f1a81 am fc3f1719: am 947f3e9e: Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
* commit 'fc3f1719b48c80749e9b48c914acee3e3be2a618':
  fix z-order of hangouts to avoid clobbering the search suggest
2014-10-17 19:12:10 +00:00
Joe Fernandez 0769da021e am d804dac5: am e321df0c: Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
* commit 'd804dac5d87a4cb5ebcbfcb650f3c7b6a821441e':
  Doc change: update query params to force refresh of local js files.
2014-10-17 19:12:09 +00:00
smain@google.com 9130a81210 am 7f37fba6: am 19c6780f: Merge "fix scroll offset when loading non-header pages" into lmp-dev
* commit '7f37fba64573c6b6d755e1a3c36422555feb6ff2':
  fix scroll offset when loading non-header pages
2014-10-17 19:12:08 +00:00
David Friedman e5f5d5a14f am a3427287: am e0471a82: Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
* commit 'a342728747de31a19f30fe30b46e5452cebfb359':
  Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
2014-10-17 19:12:07 +00:00
smain@google.com bd78b888a5 am be113f8a: fix broken download buttons, make a[name] offset apply only to reference docs
* commit 'be113f8ac0f5ae00fa997db5f4507af55c523367':
  fix broken download buttons, make a[name] offset apply only to reference docs
2014-10-17 18:53:32 +00:00
smain@google.com fc3f1719b4 am 947f3e9e: Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev
* commit '947f3e9ecf9bc7875d210a45053826eb0e110186':
  fix z-order of hangouts to avoid clobbering the search suggest
2014-10-17 18:52:43 +00:00
Joe Fernandez d804dac5d8 am e321df0c: Merge "Doc change: update query params to force refresh of local js files." into lmp-dev
* commit 'e321df0ca2eaada3e126393a7976cd4cc09afdf6':
  Doc change: update query params to force refresh of local js files.
2014-10-17 18:50:48 +00:00
smain@google.com 7f37fba645 am 19c6780f: Merge "fix scroll offset when loading non-header pages" into lmp-dev
* commit '19c6780f9fc4994c0909afa900e59b9282a0d253':
  fix scroll offset when loading non-header pages
2014-10-17 18:50:47 +00:00
David Friedman a342728747 am e0471a82: Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
* commit 'e0471a82276d86c671a9e2a21f58eb140cb94dc0':
  Changes to NDK download table format to reflect change in download structure Associated CL: https://googleplex-android-review.git.corp.google.com/#/c/567643/
2014-10-17 18:50:46 +00:00
Dan Albert 79dac8791d am ec807a8c: am fb77fe99: am 26707ca8: Merge "Use libstc++ for the name of bionic\'s STL."
* commit 'ec807a8cc10bf9d5f9aa5c6ecc0a0c980b673364':
  Use libstc++ for the name of bionic's STL.
2014-10-17 17:57:52 +00:00
Dan Albert ec807a8cc1 am fb77fe99: am 26707ca8: Merge "Use libstc++ for the name of bionic\'s STL."
* commit 'fb77fe99b7a6ef0ce016f187d79ac5d9c75742ba':
  Use libstc++ for the name of bionic's STL.
2014-10-17 17:53:11 +00:00
Dan Albert fb77fe99b7 am 26707ca8: Merge "Use libstc++ for the name of bionic\'s STL."
* commit '26707ca8bb29b62252dd9d3d346f731f4fad2806':
  Use libstc++ for the name of bionic's STL.
2014-10-17 17:48:24 +00:00
Dan Albert 26707ca8bb Merge "Use libstc++ for the name of bionic's STL." 2014-10-17 17:44:36 +00:00
Dianne Hackborn 2799aacd62 am 87fa865b: am 374712c5: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev
* commit '87fa865bea0140b49b5f46e20c64d252e8b91adf':
  Move up to API 21, Lollipop MR1.
2014-10-17 17:25:41 +00:00
Dianne Hackborn 87fa865bea am 374712c5: Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev
* commit '374712c54f5416e14523eec15456bb8b4372ffac':
  Move up to API 21, Lollipop MR1.
2014-10-17 17:19:57 +00:00
Dianne Hackborn 374712c54f Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev 2014-10-17 17:12:11 +00:00
Dianne Hackborn 4a6a7524b3 Move up to API 21, Lollipop MR1.
Change-Id: I81c3455d99673447ac0bc1b48d5ab1500b2bfd20
2014-10-17 10:05:33 -07:00
smain@google.com be113f8ac0 fix broken download buttons, make a[name] offset apply only to reference docs
Change-Id: I44421d90c335e0fcb4b35d8f568f9775a84b41ea
2014-10-17 09:56:10 -07:00
smain@google.com 947f3e9ecf Merge "fix z-order of hangouts to avoid clobbering the search suggest" into lmp-dev 2014-10-17 08:27:18 +00:00
smain@google.com 77cf43e739 fix z-order of hangouts to avoid clobbering the search suggest
Change-Id: I3993a118a1c7eb33ecc661635b1e9db2416bdf73
2014-10-17 01:21:13 -07:00
Ian Rogers 1875298a96 am 7e771594: am 0251f345: am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
* commit '7e771594ce62b3d869e90831a24fa5a8956525cc':
  Add LPAE to dex2oat ISA feature list.
2014-10-17 07:48:47 +00:00
Ian Rogers 7e771594ce am 0251f345: am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
* commit '0251f3454e5f4716716673f2df1becd0730fbc79':
  Add LPAE to dex2oat ISA feature list.
2014-10-17 07:44:19 +00:00
Ian Rogers 0251f3454e am fc82be6e: Merge "Add LPAE to dex2oat ISA feature list."
* commit 'fc82be6e776acfc3d784e61e2026d65417285495':
  Add LPAE to dex2oat ISA feature list.
2014-10-17 07:34:45 +00:00