Commit Graph

9371 Commits

Author SHA1 Message Date
Scott Main cf0c34d481 am 082ca3f2: am f973ced3: docs: better message for download page when os detection fails
* commit '082ca3f2de07ee6183343452a35f4afe2cdb7f3d':
  docs: better message for download page when os detection fails
2012-06-28 12:06:35 -07:00
Scott Main 082ca3f2de am f973ced3: docs: better message for download page when os detection fails
* commit 'f973ced37e2d065c0aa41bb5563abad7518bea61':
  docs: better message for download page when os detection fails
2012-06-28 12:01:03 -07:00
Scott Main f973ced37e docs: better message for download page when os detection fails
Change-Id: I940c0847ddc214ef36bfd0708d289cff200dfc62
2012-06-28 11:56:01 -07:00
Steve Block d6e105bad1 Merge "Don't fail if a target of type NONE has a NOTICE file present" 2012-06-27 09:02:39 -07:00
Steve Block f55aeb0668 Don't fail if a target of type NONE has a NOTICE file present
Targets of type NONE are used extensively in Android makefiles which have been
auto-generated from gyp build files. The gyp generator uses such targets to
represent gyp targets which don't produce an output file. Typically, many such
targets exist in a single Android makefile.

We use a generated Android makefile for Chromium. This project has a NOTICE
file, intended to be installed with a SHARED_LIBRARY target. However, the build
fails when processing the targets of type NONE, as it does not know where
to install the NOTICE file.

This change causes the NOTICE to be ignored in this case, rather than failing
the build.

Change-Id: I70cf9a406e4a1c932f8a734f53491f7c5281ee17
2012-06-27 16:48:31 +01:00
Scott Main 260e893588 am 3fa1173a: am 810e2889: docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it\'s a worthwhile compromise and will investigate a diff solution for that later.
* commit '3fa1173ac3a24214a6f8bc5e6cf9794226110f9b':
  docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it's a worthwhile compromise and will investigate a diff solution for that later.
2012-06-27 02:27:29 -07:00
Scott Main 3fa1173ac3 am 810e2889: docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it\'s a worthwhile compromise and will investigate a diff solution for that later.
* commit '810e28891457af6e365b839ac584d77277b2e3fa':
  docs: fix overlapping sidebar bug, but I think this re-introduces a bug in IE where the sidenav position moves slightly left/right during scroll, but it's a worthwhile compromise and will investigate a diff solution for that later.
2012-06-27 02:25:12 -07:00
Scott Main 810e288914 docs: fix overlapping sidebar bug,
but I think this re-introduces a bug in IE where the sidenav
position moves slightly left/right during scroll, but it's a
worthwhile compromise and will investigate a diff solution for that later.

Change-Id: Id1f2141b6638e199d1a4ad1d198a5a5aa45bf264
2012-06-27 02:08:20 -07:00
Scott Main e9327a67bc am dfc602e0: am 03c972c5: docs: misc css
* commit 'dfc602e0d90601be5c6fd4558c6046ef596c0a3b':
  docs: misc css
2012-06-26 22:28:46 -07:00
Scott Main dfc602e0d9 am 03c972c5: docs: misc css
* commit '03c972c5c6d42597c8fe0127161d6536ee98d04b':
  docs: misc css
2012-06-26 22:26:18 -07:00
Scott Main 03c972c5c6 docs: misc css
Change-Id: I398d30f9414564f58ea3546a192ad1c12e715349
2012-06-26 22:23:22 -07:00
Stephen Hines bec4a4b980 Disable libcompiler-rt-extras for BUILD_TINY_ANDROID.
Change-Id: I05aa9e43f987ef422d98f43b3734dfbc261feb4b
2012-06-26 16:38:21 -07:00
The Android Open Source Project 5db58642f9 am 90d6a637: Reconcile with jb-release
* commit '90d6a637dc04a66d0833ebe4e30ff6ff1332da40':
  JRN84D
  JRN84C
2012-06-26 07:21:16 -07:00
The Android Open Source Project 90d6a637dc Reconcile with jb-release
Change-Id: Iab5346490b6838a2137ffd28e72e4f8d4e9f48da
2012-06-26 07:18:15 -07:00
The Android Automerger af1a370e5d JRN84D 2012-06-25 17:24:56 -07:00
The Android Automerger 7e8bad4526 merge in jb-release history after reset to jb-dev 2012-06-25 17:14:15 -07:00
The Android Automerger 58cdcd1d09 JRN84C 2012-06-25 17:05:30 -07:00
The Android Open Source Project 24a8ff7c5e am 4af7837e: Reconcile with jb-release
* commit '4af7837eac062cc96958be2981a39274a497f555':
  JRN84B
  JRN86
2012-06-25 12:21:20 -07:00
The Android Open Source Project 4af7837eac Reconcile with jb-release
Change-Id: I2b5cf5780851a3979016a50ff39f7da6d6d1a82b
2012-06-25 12:18:24 -07:00
The Android Automerger 4b06007c27 JRN84B 2012-06-25 11:31:30 -07:00
The Android Automerger 795683dd7f JRN86 2012-06-25 11:29:39 -07:00
The Android Open Source Project 2ced638f5e am ad7c32bf: Reconcile with jb-release
* commit 'ad7c32bf2cdc135b827d60f5ce7a77b50b576395':
  JRN84
  JRN83D
  JRN83C
2012-06-25 08:00:16 -07:00
The Android Open Source Project ad7c32bf2c Reconcile with jb-release
Change-Id: I80e21c4019904a7f755af426e3e29e41c9b23f78
2012-06-25 07:57:11 -07:00
The Android Automerger 16cd5c0855 JRN84 2012-06-23 23:28:18 -07:00
The Android Automerger 02c3d477f6 merge in jb-release history after reset to jb-dev 2012-06-23 23:13:39 -07:00
Scott Main 3e00da82ea am c60a1430: am 9ada2264: docs: darker font color
* commit 'c60a1430dcfc7e8ae25b31800620c833a427895a':
  docs: darker font color
2012-06-23 17:55:26 -07:00
Scott Main c60a1430dc am 9ada2264: docs: darker font color
* commit '9ada22647890c18ded2b890d00c0a307bd2bed98':
  docs: darker font color
2012-06-23 17:52:58 -07:00
Scott Main 9ada226478 docs: darker font color
Change-Id: I8fe4117ac501001dd6c7156b337f3ff7a4f75793
2012-06-23 14:59:36 -07:00
Scott Main 978cc24532 am 46601e37: am 6a7a66be: docs: try darker text and shorter line height
* commit '46601e379201f6e14be9ec1f7f170e633430344a':
  docs: try darker text and shorter line height
2012-06-23 11:27:00 -07:00
Scott Main 46601e3792 am 6a7a66be: docs: try darker text and shorter line height
* commit '6a7a66beba12d6e655f3dde257a3e4964f8ad0c7':
  docs: try darker text and shorter line height
2012-06-23 11:25:21 -07:00
Scott Main 6a7a66beba docs: try darker text and shorter line height
Change-Id: I7fe3cdc0a0f5cdfd8bcb69b1e1a2d11d8b5301d3
2012-06-23 11:20:48 -07:00
Scott Main 1df3271e64 am aeda97cb: am d786a29f: docs: adjust homepage carousel styles
* commit 'aeda97cb22f64badf50bf31ca11e4f32418fc6d8':
  docs: adjust homepage carousel styles
2012-06-23 05:39:13 -07:00
Scott Main 608f34f324 am ac432bc9: am 25659b02: docs: update sdk template to support new ndk doc layout
* commit 'ac432bc99516543889c007a2eb09aa64afd5fdc0':
  docs: update sdk template to support new ndk doc layout
2012-06-23 05:39:13 -07:00
Scott Main 53ceaab227 am 04977dbb: am 412eaf20: docs: style changes for notes
* commit '04977dbbb61af360c6c0efea9accdb12cf2a3598':
  docs: style changes for notes
2012-06-23 05:39:12 -07:00
Scott Main aeda97cb22 am d786a29f: docs: adjust homepage carousel styles
* commit 'd786a29f14c502986ffc160471daedfd0b5fb5dc':
  docs: adjust homepage carousel styles
2012-06-23 05:37:01 -07:00
Scott Main ac432bc995 am 25659b02: docs: update sdk template to support new ndk doc layout
* commit '25659b0217cca1389b2711ee536547b20b266319':
  docs: update sdk template to support new ndk doc layout
2012-06-23 05:37:01 -07:00
Scott Main 04977dbbb6 am 412eaf20: docs: style changes for notes
* commit '412eaf202c63b8d2cc32b5b865ba29155e047697':
  docs: style changes for notes
2012-06-23 05:36:51 -07:00
Scott Main d786a29f14 docs: adjust homepage carousel styles
Change-Id: Id2b32ce67d26a19b40e7944a5dd37cd17d8eec2a
2012-06-22 21:23:32 -07:00
The Android Automerger 8a6fb02ae5 JRN83D 2012-06-22 20:41:01 -07:00
The Android Automerger 176dfcea71 merge in jb-release history after reset to jb-dev 2012-06-22 20:37:07 -07:00
The Android Automerger 67cff69b3c JRN83C 2012-06-22 18:28:32 -07:00
The Android Automerger a73843511a merge in jb-release history after reset to jb-dev 2012-06-22 18:19:02 -07:00
Scott Main 25659b0217 docs: update sdk template to support new ndk doc layout
Change-Id: I47ec2fcd4b7116fa3dc59483a434d7f188f984d1
2012-06-22 17:02:25 -07:00
The Android Open Source Project b4df8b22b6 am 758a52dd: Reconcile with jb-release
* commit '758a52dddec379d432ffcdef40f132af273e0ecd':
  JRN83B
2012-06-22 15:22:01 -07:00
The Android Open Source Project 758a52ddde Reconcile with jb-release
Change-Id: I4a8336fb66821c570245f75901919ef6b1b9c641
2012-06-22 15:20:06 -07:00
The Android Automerger db7d1d34ea JRN83B 2012-06-22 15:14:06 -07:00
The Android Automerger c032786412 merge in jb-release history after reset to jb-dev 2012-06-22 15:03:34 -07:00
Scott Main 412eaf202c docs: style changes for notes
Change-Id: I13bc3f19780421a30feffc6e6ffe19cfadc886e5
2012-06-22 14:36:33 -07:00
Jean-Baptiste Queru 471d6d8b11 am 4a65f812: am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI"
* commit '4a65f812373e1ecfa6e7058d635e998429a4cf17':
  Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
2012-06-22 14:32:49 -07:00
Jean-Baptiste Queru 4a65f81237 am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI"
* commit '6e587f53152127370c6b45204f6529dd7b0ce32a':
  Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
2012-06-22 14:31:05 -07:00