Scott Main
10bbe83097
am 121a4a3e: am d6cb8fac: docs: fix padding for left-figure class
...
* commit '121a4a3e29c7f76264ea450ee750e68084669556':
docs: fix padding for left-figure class
2013-02-21 14:28:56 -08:00
Scott Main
4edc153fe6
am 245a4f64: am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
...
* commit '245a4f644c79f584ac205240069c15d5afd77d8b':
docs: add image frame style and left-float figure box
2013-02-21 14:28:56 -08:00
Robert Ly
c6ff854bbf
am eb8edf43: am dae7b523: Revert "support differently named lists.js files"
...
* commit 'eb8edf43a12c4ef1f9ad6667c33960d9a3a52db0':
Revert "support differently named lists.js files"
2013-02-21 14:28:55 -08:00
Scott Main
121a4a3e29
am d6cb8fac: docs: fix padding for left-figure class
...
* commit 'd6cb8fac5397ff6cc114705ad789e29dca9ea1ec':
docs: fix padding for left-figure class
2013-02-21 14:18:09 -08:00
Scott Main
245a4f644c
am 0e69c3e4: Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
...
* commit '0e69c3e4e752eb309babe198ebe939e015918401':
docs: add image frame style and left-float figure box
2013-02-21 14:18:08 -08:00
Robert Ly
eb8edf43a1
am dae7b523: Revert "support differently named lists.js files"
...
* commit 'dae7b523aa1f2b26c42cfb2810a1b8f788ae4301':
Revert "support differently named lists.js files"
2013-02-21 14:18:07 -08:00
Scott Main
d6cb8fac53
docs: fix padding for left-figure class
...
Change-Id: Ic4a1a95410f4d913a278bdb8a75c98ce5c4f5bfd
2013-02-21 13:05:03 -08:00
Scott Main
0e69c3e4e7
Merge "docs: add image frame style and left-float figure box" into jb-mr1-dev
2013-02-21 18:53:25 +00:00
Scott Main
48dd7f22d9
docs: add image frame style and left-float figure box
...
Change-Id: I9103f6f9e9b416902fbb2add60782ba10ff9e900
2013-02-21 10:52:02 -08:00
Robert Ly
dae7b523aa
Revert "support differently named lists.js files"
...
This reverts commit a6043f76fa
Change-Id: Id7212f9f1ffbe62fd26f97ab6dcea93bcb34e476
2013-02-21 02:07:00 +00:00
Robert Ly
1d44b70732
am b6bd8e5b: am 2b878f60: am a6043f76: support differently named lists.js files
...
* commit 'b6bd8e5be9a746f376c521cf5a78bbf875624b4d':
support differently named lists.js files
2013-02-20 15:24:45 -08:00
Robert Ly
b6bd8e5be9
am 2b878f60: am a6043f76: support differently named lists.js files
...
* commit '2b878f60c9e668b8a31d58ac8c89307b5b4faa45':
support differently named lists.js files
2013-02-20 15:22:22 -08:00
Robert Ly
2b878f60c9
am a6043f76: support differently named lists.js files
...
* commit 'a6043f76fa41d6062f3ba9e0aae06feb562f8b51':
support differently named lists.js files
2013-02-20 15:17:49 -08:00
Robert Ly
a6043f76fa
support differently named lists.js files
...
Change-Id: Id564c916e891051f73e4c7d7a3683d58a48ee16d
2013-02-20 14:47:44 -08:00
Nick Kralevich
fa798096fd
build: update fs_config calls for capabilities change.
...
Change-Id: Ic3c94f990c34a56d84f01c151f1b64f419e16419
2013-02-20 12:48:44 -08:00
Chris Dearman
6cc0c334fc
[MIPS] Update build rules
...
Add -D_FORTIFY_SOURCE=1 to the default cflags
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
Use single dash version of -print-whatever
compile everything with relro / bind_now
Enable NX protections
Some other cleanups to reduce differences between ARM and MIPS config files
Change-Id: I30b4de449e6353b581ef7f9437a3bb9be53d5bbf
Signed-off-by: Chris Dearman <chris@mips.com>
2013-02-19 17:04:57 -08:00
Scott Kennedy
b960d57ab1
am d7cfdd87: am ad1862c1: Include Email in emulator system image
...
* commit 'd7cfdd87b7150a84e62022952c4f884bc32f1517':
Include Email in emulator system image
2013-02-19 16:23:26 -08:00
Scott Kennedy
d7cfdd87b7
am ad1862c1: Include Email in emulator system image
...
* commit 'ad1862c1876936bfe125bf1faad0a92e9675e9f2':
Include Email in emulator system image
2013-02-19 16:21:35 -08:00
Scott Kennedy
ad1862c187
Include Email in emulator system image
...
Bug: 8226275
Change-Id: Id7083e06fc1d146b56308d42dc16aad9087f09ad
2013-02-19 15:18:49 -08:00
Ying Wang
aa80cac8d3
am cdacb378: Merge "[MIPS] Use mksh for /system/bin/sh"
...
* commit 'cdacb3780667bc8d51032d1fb9388ce10bebb9c3':
[MIPS] Use mksh for /system/bin/sh
2013-02-15 15:52:07 -08:00
Ying Wang
cdacb37806
Merge "[MIPS] Use mksh for /system/bin/sh"
2013-02-15 22:51:06 +00:00
Chris Dearman
1272b7872a
[MIPS] Use mksh for /system/bin/sh
...
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: I01a6c1e2ac9de5b6d86c2aace041a0f7400f6b5e
2013-02-15 14:00:18 -08:00
Ying Wang
7ce7473f86
am 5e12e60b: Merge "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."
...
* commit '5e12e60b472fbd2e712ee9ba04637e3d26b18b71':
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.
2013-02-15 12:27:30 -08:00
Ying Wang
5e12e60b47
Merge "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."
2013-02-15 19:33:59 +00:00
Elliott Hughes
ea852f6ed3
am f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f6b670b702c3f9ba307ddd0751d471116d9d1a90':
Remove more always-true ARCH_ARM_HAVE_ flags.
2013-02-14 17:29:19 -08:00
Elliott Hughes
f6b670b702
Merge "Remove more always-true ARCH_ARM_HAVE_ flags."
2013-02-15 00:22:53 +00:00
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
d0fb693024
am 07a58f8f: Merge "Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '07a58f8fef9ba3ce7454771049522e3fd75f4f6c':
Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.
2013-02-13 17:09:18 -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
Scott Main
f1f0d46a21
am 3824401b: am 76fa47d6: am 769a5d86: docs: re-add dev-docs css because it\'s needed by diff reports
...
# Via Android Git Automerger (2) and Scott Main (1)
* commit '3824401b18090d10d923341dc127d2adb9e20aa2':
docs: re-add dev-docs css because it's needed by diff reports
2013-02-13 11:52:47 -08:00
Scott Main
3824401b18
am 76fa47d6: am 769a5d86: docs: re-add dev-docs css because it\'s needed by diff reports
...
# Via Android Git Automerger (1) and Scott Main (1)
* commit '76fa47d606f084676908aeeb4ffbc44f17398e43':
docs: re-add dev-docs css because it's needed by diff reports
2013-02-13 11:50:36 -08:00
Scott Main
76fa47d606
am 769a5d86: docs: re-add dev-docs css because it\'s needed by diff reports
...
# Via Scott Main
* commit '769a5d86987ef54d4b6f11b592100abadbf71756':
docs: re-add dev-docs css because it's needed by diff reports
2013-02-13 11:47:02 -08:00
Scott Main
769a5d8698
docs: re-add dev-docs css because it's needed by diff reports
...
Change-Id: Ic3f334f5510b008cd1f744823e46fb4fdf5630bd
2013-02-13 11:39:09 -08:00
Scott Main
9a6bce03af
am d48506da: am 40e30da7: am ac2aef5b: docs: switch templates to dynamic tab highlighting; prep for devsite template migration
...
# Via Android Git Automerger (2) and Scott Main (1)
* commit 'd48506da27c04393185f1b419832657dd63446ac':
docs: switch templates to dynamic tab highlighting; prep for devsite template migration
2013-02-12 14:48:01 -08:00
Scott Main
d48506da27
am 40e30da7: am ac2aef5b: docs: switch templates to dynamic tab highlighting; prep for devsite template migration
...
# Via Android Git Automerger (1) and Scott Main (1)
* commit '40e30da78a7551b91674cc41ac134146b85daa22':
docs: switch templates to dynamic tab highlighting; prep for devsite template migration
2013-02-12 14:46:10 -08:00
Scott Main
40e30da78a
am ac2aef5b: docs: switch templates to dynamic tab highlighting; prep for devsite template migration
...
# Via Scott Main
* commit 'ac2aef5bd880213ead6ad5b467dc0838dd836a5e':
docs: switch templates to dynamic tab highlighting; prep for devsite template migration
2013-02-12 14:42:20 -08:00
Scott Main
ac2aef5bd8
docs: switch templates to dynamic tab highlighting; prep for devsite template migration
...
Change-Id: I5785c63603d8da5dfa1118fe28a3106aa20835a6
2013-02-12 14:21:26 -08:00
Scott Main
1b2a51a54d
am 8234b23a: am 33925453: am 3062cb88: Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev
...
# Via Android Git Automerger (2) and others
* commit '8234b23a96d5cbcb04af7a498ec2b119dad69abf':
docs: udpate JS bundle URL for dac devsite
2013-02-11 12:02:33 -08:00
Scott Main
8234b23a96
am 33925453: am 3062cb88: Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev
...
# Via Android (Google) Code Review (1) and others
* commit '339254537d99c0fef145fc60add9d5b94a0e651a':
docs: udpate JS bundle URL for dac devsite
2013-02-11 12:00:21 -08:00
Scott Main
339254537d
am 3062cb88: Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev
...
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '3062cb889b9722922d310ddfbe3d736cb8dff49d':
docs: udpate JS bundle URL for dac devsite
2013-02-11 11:56:25 -08:00
Scott Main
3062cb889b
Merge "docs: udpate JS bundle URL for dac devsite" into jb-mr1-dev
2013-02-11 19:54:11 +00:00
Scott Main
d44c3772e0
docs: udpate JS bundle URL for dac devsite
...
Change-Id: I06d8b8536c55581b8e7b2d59c55b3d3069d7fe1d
2013-02-11 11:47:05 -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