Commit graph

11197 commits

Author SHA1 Message Date
Elliott Hughes
03d2aa4dd0 Remove more always-true ARCH_ARM_HAVE_ flags.
All the remaining flags appear to be actually used.

Change-Id: I0e3d84915487eda4f0e97809fc36624fef5f1848
2013-02-14 12:04:48 -08:00
Elliott Hughes
07a58f8fef Merge "Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS." 2013-02-14 00:52:52 +00:00
Elliott Hughes
d0542498a0 Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.
Because every ARM architecture we've ever supported has had both.

Change-Id: I607b56416e65073c5ac1b85fb17c092516e02573
2013-02-13 16:44:21 -08:00
Dirk Dougherty
54096df340 am 1f7c3cb3: am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '1f7c3cb3c2b475903c7616bf3f5b06530420cd94':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
2013-02-08 16:30:26 -08:00
Dirk Dougherty
1f7c3cb3c2 am 061c758c: am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '061c758cfa5409035854804efa1e0c4d32d2f007':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
2013-02-08 16:27:11 -08:00
Dirk Dougherty
061c758cfa am 9fdf671d: Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
# Via Dirk Dougherty
* commit '9fdf671d7f8fb96c1a8d3b41aaf4478e7274e45f':
  Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
2013-02-08 16:22:04 -08:00
Dirk Dougherty
9fdf671d7f Add LOCAL_ADDITIONAL_HTML_DIR to clear_vars for devsite docs builds.
Change-Id: Ib75e776d0220a86a08ddd5d7e09edd069af05da1
2013-02-08 15:45:45 -08:00
The Android Open Source Project
ac95040906 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I242df2bfe9436a6b16e952da318b67b212e54516
2013-02-08 15:40:29 -08:00
The Android Automerger
fbef8b9578 JDQ39 2013-02-08 13:51:43 -08:00
The Android Automerger
b38f1fc9e1 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-08 13:50:51 -08:00
Scott Main
de0f30cdf1 am cd7ef9ce: am 8359d2c4: am b7f96375: docs: fix ::selection style to use Android blue for text highlighting
# Via Android Git Automerger (2) and Scott Main (1)
* commit 'cd7ef9ce90907f6894679bf293c7fca4759c3e72':
  docs: fix ::selection style to use Android blue for text highlighting
2013-02-07 17:07:57 -08:00
Scott Main
cd7ef9ce90 am 8359d2c4: am b7f96375: docs: fix ::selection style to use Android blue for text highlighting
# Via Android Git Automerger (1) and Scott Main (1)
* commit '8359d2c4e98df00f66712c79efe3216059f5424d':
  docs: fix ::selection style to use Android blue for text highlighting
2013-02-07 17:05:25 -08:00
Scott Main
8359d2c4e9 am b7f96375: docs: fix ::selection style to use Android blue for text highlighting
# Via Scott Main
* commit 'b7f963758f1a252a943b67b200b8e6141d94430c':
  docs: fix ::selection style to use Android blue for text highlighting
2013-02-07 17:00:42 -08:00
Scott Main
b7f963758f docs: fix ::selection style to use Android blue for text highlighting
Change-Id: I485be948326fc40c349c8170dd1be13962b4c003
2013-02-07 16:56:43 -08:00
Raghu Gandham
695fee31ad For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option
So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang.

Change-Id: I48fd6f2b0cbe80c3cd90f453ced97a2f154f7ad3
Signed-off-by: Rocky Zhang <yan@mips.com>
2013-02-07 16:07:01 -08:00
The Android Automerger
7faa1b886b JDQ38 2013-02-07 14:23:55 -08:00
The Android Automerger
35e0666507 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-07 14:23:13 -08:00
The Android Open Source Project
15476e83b7 Reconcile with jb-mr1.1-release - do not merge
Change-Id: Icd2030678228e137e2616e2d64847abf4f5a2242
2013-02-06 09:11:09 -08:00
The Android Automerger
9770928ac8 JDQ36B 2013-02-05 16:48:44 -08:00
The Android Open Source Project
c43e8a9cdf Reconcile with jb-mr1.1-release - do not merge
Change-Id: I8c2fd056e6eea6c8d818aa44ced9421f84f64fe5
2013-02-05 13:43:19 -08:00
The Android Automerger
eed4696728 JDQ36 2013-02-05 12:24:50 -08:00
The Android Automerger
496fc81289 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-05 12:24:05 -08:00
Scott Main
70bb7d04dd am 97c89d4c: am 7257c71f: am 6668404e: Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '97c89d4c5de1bae9d2bbfb040a3ca484d4782540':
  docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
2013-02-04 09:07:47 -08:00
Scott Main
ae0e037d79 am 9bbc247d: am a334cee6: am 77c51357: docs: fix lang switcher for gae by deleting obsolete method call
# Via Android Git Automerger (2) and Scott Main (1)
* commit '9bbc247decb20ac35fded7d56afb6e424ca56173':
  docs: fix lang switcher for gae by deleting obsolete method call
2013-02-04 09:07:46 -08:00
Scott Main
b2a0b57e23 am 2baf87e4: am b88c1a8a: am 98f23e7a: docs: delete obsolete asset files
# Via Android Git Automerger (2) and Scott Main (1)
* commit '2baf87e4f34659905cdea30100855fbdf041d02a':
  docs: delete obsolete asset files
2013-02-04 09:07:31 -08:00
Scott Main
ee2157bb0a am 20ba728e: am 89442344: am e05e6f99: docs: update template files with those from the templates-ds directory
# Via Android Git Automerger (2) and Scott Main (1)
* commit '20ba728ecbff1019939c3486a146581d1c158b4e':
  docs: update template files with those from the templates-ds directory
2013-02-04 09:07:30 -08:00
Scott Main
4ea33de73a am 086e7f8b: am 79935f59: am 015d616a: docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
# Via Android Git Automerger (2) and Scott Main (1)
* commit '086e7f8b23f3f5547d75078a670dd4efeede6bc8':
  docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
2013-02-04 09:07:29 -08:00
Dirk Dougherty
f0b7415e6e am 34eb13de: am 18a1a50f: am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '34eb13de682225fbb6453f606ed75b3460c0a57d':
  Add new droiddoc option for project-specific secondary html input/output paths.
2013-02-04 09:07:28 -08:00
Dirk Dougherty
14e589cf54 am 5bd7d418: am 9c3033ce: am dc6b4a59: Add templates for devsite docs builds.
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit '5bd7d418aa88ab914576f8cbf3a5fcd6bf7b45eb':
  Add templates for devsite docs builds.
2013-02-04 09:07:27 -08:00
The Android Automerger
5d0d638cd0 JDQ32B 2013-02-01 20:45:42 -08:00
The Android Automerger
75631bfe1a JDQ32 2013-02-01 18:25:58 -08:00
The Android Automerger
c730b8b365 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-01 18:24:59 -08:00
Scott Main
97c89d4c5d am 7257c71f: am 6668404e: Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '7257c71fa86f6d65fab9fae4b9fd76c2f6ba3b70':
  docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
2013-02-01 15:41:22 -08:00
Scott Main
9bbc247dec am a334cee6: am 77c51357: docs: fix lang switcher for gae by deleting obsolete method call
# Via Android Git Automerger (1) and Scott Main (1)
* commit 'a334cee69d787ca3fb22a790f002443c02804176':
  docs: fix lang switcher for gae by deleting obsolete method call
2013-02-01 15:41:21 -08:00
Scott Main
7257c71fa8 am 6668404e: Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '6668404ede38d806102eb481d857ca8c0931d364':
  docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines.
2013-02-01 15:34:17 -08:00
Scott Main
a334cee69d am 77c51357: docs: fix lang switcher for gae by deleting obsolete method call
# Via Scott Main
* commit '77c51357eb1ba3b55d0a9363cb981daab1b484d2':
  docs: fix lang switcher for gae by deleting obsolete method call
2013-02-01 15:34:17 -08:00
Scott Main
6668404ede Merge "docs: minimize code-font line-height. Fixes problem in which any paragraph with code text has more whitespace below it than other lines." into jb-mr1-dev 2013-02-01 23:32:08 +00:00
Scott Main
c5480c32c2 docs: minimize code-font line-height.
Fixes problem in which any paragraph with code text has more whitespace below it than other lines.

Change-Id: I0f39655472d09f5af346c7c7e4df8eb0a5a144df
2013-02-01 15:29:44 -08:00
Scott Main
2baf87e4f3 am b88c1a8a: am 98f23e7a: docs: delete obsolete asset files
# Via Android Git Automerger (1) and Scott Main (1)
* commit 'b88c1a8a053a2274b315bc83c5f7e1c4d5666f68':
  docs: delete obsolete asset files
2013-02-01 14:29:44 -08:00
Scott Main
20ba728ecb am 89442344: am e05e6f99: docs: update template files with those from the templates-ds directory
# Via Android Git Automerger (1) and Scott Main (1)
* commit '894423441edeb5ff431c1c82db8fa42ab25a27f7':
  docs: update template files with those from the templates-ds directory
2013-02-01 14:29:43 -08:00
Scott Main
086e7f8b23 am 79935f59: am 015d616a: docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
# Via Android Git Automerger (1) and Scott Main (1)
* commit '79935f593bc567517c95d0f09198a519f315b2ca':
  docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
2013-02-01 14:29:42 -08:00
Dirk Dougherty
34eb13de68 am 18a1a50f: am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '18a1a50f981449bb3dbd6bab3ee2502b51259fd7':
  Add new droiddoc option for project-specific secondary html input/output paths.
2013-02-01 14:29:41 -08:00
Dirk Dougherty
5bd7d418aa am 9c3033ce: am dc6b4a59: Add templates for devsite docs builds.
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '9c3033ce0e099b8722cb8524ee52b6bce2e46506':
  Add templates for devsite docs builds.
2013-02-01 14:29:40 -08:00
Scott Main
b88c1a8a05 am 98f23e7a: docs: delete obsolete asset files
# Via Scott Main
* commit '98f23e7af0480b70515552195e359633191f83d8':
  docs: delete obsolete asset files
2013-02-01 13:28:09 -08:00
Scott Main
894423441e am e05e6f99: docs: update template files with those from the templates-ds directory
# Via Scott Main
* commit 'e05e6f99b312e9a7b460b70986a419d30576d66c':
  docs: update template files with those from the templates-ds directory
2013-02-01 13:28:02 -08:00
Scott Main
79935f593b am 015d616a: docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
# Via Scott Main
* commit '015d616af8cf72cf609b19257604e520a70c3286':
  docs: use devsite hdf bool as a javascript condition for managing the lang toggle. sync the sdk and ds templates so we can move toward one template set
2013-02-01 13:27:58 -08:00
Dirk Dougherty
18a1a50f98 am 9c2336e0: Add new droiddoc option for project-specific secondary html input/output paths.
# Via Dirk Dougherty
* commit '9c2336e073cef13a5237965dc7d5fcdb0091be34':
  Add new droiddoc option for project-specific secondary html input/output paths.
2013-02-01 13:27:53 -08:00
Dirk Dougherty
9c3033ce0e am dc6b4a59: Add templates for devsite docs builds.
# Via Dirk Dougherty
* commit 'dc6b4a591c62f72ee5fea1e3bdadd3584e1eb284':
  Add templates for devsite docs builds.
2013-02-01 13:27:40 -08:00
The Android Automerger
ee80c57bc4 JDQ30 2013-01-30 20:06:22 -08:00
The Android Automerger
c960e6706c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-01-30 20:05:38 -08:00