Robert Ly
0a0e4a6990
update pdk build templates
...
Change-Id: Ibda42779827a337ed0bc1c5797ce2b5b50d4686a
2012-10-09 12:11:08 -07:00
Robert Ly
f65c68a134
Merge "fix pdk docs build"
2012-10-09 11:37:33 -07:00
Robert Ly
c22207f8a5
fix pdk docs build
...
Change-Id: I8c6e769d08247ce93823e4c59a55cd90b9c08e38
2012-10-09 10:33:27 -07:00
The Android Open Source Project
34ac8bd7ce
am 65809f42: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '65809f42fa47cf7a37b71fe9174ea7960c9a816a':
JOP09
JOP08B
JOP08
JOP07D
JOP07C
JOP07B
JOP07
JOP05E
JOP05D
JOP05C
JOP05B
2012-10-09 07:29:49 -07:00
The Android Open Source Project
65809f42fa
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I9029b7e89fc2813f140408166e7a06f6784021c4
2012-10-09 07:28:06 -07:00
The Android Automerger
0a160481e7
JOP09
2012-10-09 07:00:54 -07:00
The Android Automerger
949a5c467e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-09 06:59:06 -07:00
Scott Main
1a7b450c82
am 505fae2a: am 3dd2756e: am d73053a8: am b282c359: am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
...
* commit '505fae2ae4a1bf649cc488d4832ef5d43b127ccb':
fix layout bug on API Guide landing pages
2012-10-08 16:23:05 -07:00
Ying Wang
401f2bd84e
am 15f116b2: am 91fd1231: Support to build executables against the NDK
...
* commit '15f116b2bbb1a8dc6e53947588ba260f36ea066d':
Support to build executables against the NDK
2012-10-08 16:21:44 -07:00
Scott Main
505fae2ae4
am 3dd2756e: am d73053a8: am b282c359: am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
...
* commit '3dd2756e9bc63be9aa0ffe382457f8c86c44b423':
fix layout bug on API Guide landing pages
2012-10-08 16:10:43 -07:00
Scott Main
3dd2756e9b
am d73053a8: am b282c359: am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
...
* commit 'd73053a814260cb4a31a8a38727bbb6fc6f10946':
fix layout bug on API Guide landing pages
2012-10-08 16:09:06 -07:00
The Android Automerger
ada6ef0ec1
JOP08B
2012-10-08 16:08:35 -07:00
Scott Main
d73053a814
am b282c359: am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
...
* commit 'b282c359fcbde7f36b579cde388ca044a0dd6d60':
fix layout bug on API Guide landing pages
2012-10-08 16:06:43 -07:00
Scott Main
b282c359fc
am 126c5e92: am e6850d2d: fix layout bug on API Guide landing pages
...
* commit '126c5e9205263f097af4d0f9dca3b10c9a02d72b':
fix layout bug on API Guide landing pages
2012-10-08 16:04:25 -07:00
Scott Main
126c5e9205
am e6850d2d: fix layout bug on API Guide landing pages
...
* commit 'e6850d2db787a4e268b5cee57d74e9308180a589':
fix layout bug on API Guide landing pages
2012-10-08 16:02:05 -07:00
Scott Main
e6850d2db7
fix layout bug on API Guide landing pages
...
Change-Id: Ic757d26c29cd06c33dc62816698b68a9b5fe869a
2012-10-08 15:59:01 -07:00
Ying Wang
15f116b2bb
am 91fd1231: Support to build executables against the NDK
...
* commit '91fd1231c3254bc9d0642e5a646b5657bdaedffa':
Support to build executables against the NDK
2012-10-08 14:21:37 -07:00
Ying Wang
91fd1231c3
Support to build executables against the NDK
...
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Bug: 7170098
Change-Id: I4cebeae3355e79a4d2f2f5549ef0613ced77e3f0
2012-10-08 14:12:41 -07:00
The Android Automerger
8a2f6e55ca
JOP08
2012-10-08 07:00:04 -07:00
The Android Automerger
320efc5870
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-08 06:59:05 -07:00
The Android Automerger
2f3197d8d4
JOP07D
2012-10-07 18:59:00 -07:00
The Android Automerger
543c9db0b0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 18:57:48 -07:00
The Android Automerger
2841fd4c62
JOP07C
2012-10-07 16:06:32 -07:00
The Android Automerger
37cb7a82e8
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 16:05:02 -07:00
The Android Automerger
0dac92f803
JOP07B
2012-10-07 15:05:44 -07:00
The Android Automerger
de5ce161f7
JOP07
2012-10-07 07:00:38 -07:00
The Android Automerger
e8617dff2b
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-07 06:59:05 -07:00
The Android Automerger
9caec8e36d
JOP05E
2012-10-06 00:39:03 -07:00
The Android Automerger
4020b35379
JOP05D
2012-10-05 17:28:51 -07:00
The Android Automerger
6c8725182b
JOP05C
2012-10-05 15:09:28 -07:00
Keun young Park
c0871e17c4
am 9dd65d33: am 0b82ffeb: am f6e6bf7e: add mip32 stuffs to clang\'s unknown flag list
...
* commit '9dd65d33810b10e876dbe79d2940f1b04688bcc4':
add mip32 stuffs to clang's unknown flag list
2012-10-05 14:31:24 -07:00
Keun young Park
9dd65d3381
am 0b82ffeb: am f6e6bf7e: add mip32 stuffs to clang\'s unknown flag list
...
* commit '0b82ffeb964bb4da7c7928d5b61c72579b6588b5':
add mip32 stuffs to clang's unknown flag list
2012-10-05 14:29:59 -07:00
Keun young Park
0b82ffeb96
am f6e6bf7e: add mip32 stuffs to clang\'s unknown flag list
...
* commit 'f6e6bf7edf03b7f38f5452cc0749b705eb3a6ada':
add mip32 stuffs to clang's unknown flag list
2012-10-05 14:28:05 -07:00
Jean-Baptiste Queru
3b1da28751
am ed91af6d: am 4bf886ad: (-s ours) am b8c037ba: Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building"
...
* commit 'ed91af6db5ae8ede196f1e440f3ccae20a4b14cf':
Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building
2012-10-05 13:42:49 -07:00
Jean-Baptiste Queru
ed91af6db5
am 4bf886ad: (-s ours) am b8c037ba: Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building"
...
* commit '4bf886adbee460bd0c550292a3aa580f8c8530a1':
Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building
2012-10-05 13:41:20 -07:00
Jean-Baptiste Queru
4bf886adbe
am b8c037ba: Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building"
...
* commit 'b8c037ba5f38fd734d89164c9583538104be1ecc':
Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building
2012-10-05 13:34:34 -07:00
Jean-Baptiste Queru
b8c037ba5f
Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building"
2012-10-05 13:32:11 -07:00
Keun young Park
f6e6bf7edf
add mip32 stuffs to clang's unknown flag list
...
- mini_mips changed to mips32-fp to accomodate all mips variants
Bug: 7294949
Change-Id: Iae759e10e3f5d255e27b688042477263438bb7a7
2012-10-05 13:26:19 -07:00
The Android Automerger
56dc102183
JOP05B
2012-10-05 12:32:34 -07:00
The Android Open Source Project
20d1a0f7fe
am 1f9debfe: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '1f9debfe9c23b1fc4c5f9ddb34d646e434759944':
JOP05
JOP04C
JOP04B
2012-10-05 08:18:19 -07:00
The Android Open Source Project
1f9debfe9c
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I694692df8c4b28b047f7da606799687320474c99
2012-10-05 08:15:57 -07:00
The Android Automerger
8f456399e7
JOP05
2012-10-05 07:01:14 -07:00
The Android Automerger
9baa9119be
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-05 06:59:13 -07:00
Nick Kralevich
6b1ac2588a
am 23025ecd: am f3b02739: am 7653519f: Merge "[MIPS] Makes a build system use PIE flag"
...
* commit '23025ecdc0890e9262951627defda77e621fd9e8':
[MIPS] Makes a build system use PIE flag
2012-10-04 17:17:11 -07:00
Nick Kralevich
23025ecdc0
am f3b02739: am 7653519f: Merge "[MIPS] Makes a build system use PIE flag"
...
* commit 'f3b02739a7abba7c8f4884d49553f8a9f3fcfaf8':
[MIPS] Makes a build system use PIE flag
2012-10-04 17:14:17 -07:00
Nick Kralevich
f3b02739a7
am 7653519f: Merge "[MIPS] Makes a build system use PIE flag"
...
* commit '7653519f4e9efaaef906d2e5d3b109909b6d45c7':
[MIPS] Makes a build system use PIE flag
2012-10-04 17:12:46 -07:00
The Android Automerger
4c1e35244b
JOP04C
2012-10-04 16:58:19 -07:00
Nick Kralevich
7653519f4e
Merge "[MIPS] Makes a build system use PIE flag"
2012-10-04 16:07:47 -07:00
The Android Automerger
533aa6f3c0
JOP04B
2012-10-04 14:22:52 -07:00
Ying Wang
4d19d2a35d
am 195b0653: am 25f77e39: am af4299c5: Merge "Store vendor module owner info on the build server." into jb-mr1-dev
...
* commit '195b0653a23545c22bf506ab67bc0674e885b936':
Store vendor module owner info on the build server.
2012-10-04 10:07:04 -07:00
