Commit graph

9546 commits

Author SHA1 Message Date
The Android Automerger
b04e93207d JRO02C 2012-07-02 19:03:14 -07:00
The Android Automerger
09cb8f135c merge in jb-release history after reset to jb-dev 2012-07-02 18:58:01 -07:00
The Android Automerger
4a3e68d3fd JRO02B 2012-07-02 16:25:03 -07:00
The Android Automerger
41576e9323 merge in jb-release history after reset to jb-dev 2012-07-02 16:16:18 -07:00
The Android Automerger
2513bf5161 JRO02 2012-07-02 13:00:27 -07:00
The Android Automerger
9a1d446ec2 merge in jb-release history after reset to jb-dev 2012-07-02 12:53:12 -07:00
Ying Wang
dfb5818027 am d512fda4: am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
* commit 'd512fda4ae7cc56cc9b83fcb6e7a9e0d0f02c259':
  Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
2012-06-29 20:22:20 -07:00
Ying Wang
d512fda4ae am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"
* commit 'e42ed0ba1571f20866609710ba7c73fd138c0405':
  Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
2012-06-29 20:19:50 -07:00
Ying Wang
e42ed0ba15 Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk" 2012-06-29 19:55:07 -07:00
The Android Open Source Project
2ca5c83662 am 5081af57: Reconcile with jb-release
* commit '5081af57d369e1e6de09f67836bff0d40cda711e':
  JRN90
2012-06-29 18:30:23 -07:00
The Android Open Source Project
5081af57d3 Reconcile with jb-release
Change-Id: I0e57086cc66800b7de474af735ebd7ee896e6a25
2012-06-29 18:28:17 -07:00
The Android Automerger
792ba3b87f JRN90 2012-06-29 15:57:58 -07:00
The Android Automerger
223ef2b0e5 merge in jb-release history after reset to jb-dev 2012-06-29 15:47:16 -07:00
The Android Open Source Project
6a425091f6 am 8ef65998: Reconcile with jb-release
* commit '8ef65998f4025378eda0cec70ff38a1b8a5633db':
  JRN89B
  JRN89
  JRN88
  JRN87
2012-06-29 08:16:22 -07:00
The Android Open Source Project
8ef65998f4 Reconcile with jb-release
Change-Id: I7aaa394cda0be63324f5cba09f93e444fd1763fc
2012-06-29 08:13:34 -07:00
The Android Automerger
e0e910e69a JRN89B 2012-06-28 17:16:17 -07:00
The Android Automerger
f8997fa5a8 merge in jb-release history after reset to jb-dev 2012-06-28 17:06:01 -07:00
Marc Blank
f173c6be57 Change build targets to use Email2/Exchange2
Change-Id: I1b93b112b4d31ce379d33e2d1202fc90bb8d21eb
2012-06-28 16:55:57 -07:00
Ying Wang
478ba5e3f0 Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
Bug: 6754632
So the warning won't show up when you run lunch.
Now the warning only shows when you do a clean build.

Change-Id: I7876da783f059d390f0072df37d3ab0291589eb7
2012-06-28 16:02:19 -07:00
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
The Android Automerger
bbd80f66c2 JRN89 2012-06-28 07:08:48 -07:00
The Android Automerger
c1a0db1f36 merge in jb-release history after reset to jb-dev 2012-06-28 06:59:25 -07:00
The Android Automerger
28fe266131 JRN88 2012-06-27 14:15:09 -07:00
The Android Automerger
e3d441e49b merge in jb-release history after reset to jb-dev 2012-06-27 14:04:29 -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 Automerger
3ae5998d8e JRN87 2012-06-26 11:15:56 -07:00
The Android Automerger
54fdbf8798 merge in jb-release history after reset to jb-dev 2012-06-26 11:07:24 -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