The Android Automerger
68df82f841
merge in jb-release history after reset to master
2012-04-23 06:59:36 -07:00
Andrew Hsieh
8664008cdd
am acd812d6
: am 11e0192d
: Merge "Add goldfish audio hw to board/generic_x86"
...
* commit 'acd812d6a7bce9fd44e2b5974b93c542754f78d6':
Add goldfish audio hw to board/generic_x86
2012-04-21 00:54:42 -07:00
Andrew Hsieh
acd812d6a7
am 11e0192d
: Merge "Add goldfish audio hw to board/generic_x86"
...
* commit '11e0192d29459aab8f3acebaae113eece492069f':
Add goldfish audio hw to board/generic_x86
2012-04-21 00:52:28 -07:00
Jean-Baptiste Queru
4e82d1fa7f
On linux, always use the prebuilt host toolchain
...
Change-Id: I8077c4780e1e3540e5e2133cf0ffa61d474d3acc
2012-04-20 19:04:56 -07:00
Andrew Hsieh
11e0192d29
Merge "Add goldfish audio hw to board/generic_x86"
2012-04-20 16:52:27 -07:00
Jean-Baptiste Queru
77df1f2aec
am 9987dbbb
: am d0427e49
: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
...
* commit '9987dbbbb43ca3279ec615299fbab8a9101aa51c':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
2012-04-20 16:45:51 -07:00
Jean-Baptiste Queru
7ed999aaf0
am c4aa4ff3
: am 810b0d8b
: Merge "Fix build problems with gcc-4.6.x."
...
* commit 'c4aa4ff3551873c2e87a8679994d1f41f9909b0b':
Fix build problems with gcc-4.6.x.
2012-04-20 16:45:49 -07:00
Jean-Baptiste Queru
9987dbbbb4
am d0427e49
: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
...
* commit 'd0427e493edf2e4de2bd60fd1cc8253e9de233fd':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
2012-04-20 16:43:25 -07:00
Jean-Baptiste Queru
c4aa4ff355
am 810b0d8b
: Merge "Fix build problems with gcc-4.6.x."
...
* commit '810b0d8bb4a458c5a92c0bed48b75cbf27f1410d':
Fix build problems with gcc-4.6.x.
2012-04-20 16:43:23 -07:00
Keun young Park
ebb351e1b3
enable Java build for PDK build
...
- Highest LOCAL_SDK_VERSION forced for package build / java library build
Bug: 6352960
Change-Id: I4a26bf26a51b95fb97c8b2adc9d32a543832c708
2012-04-20 16:34:33 -07:00
Keun young Park
e661e35829
Merge "Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK""
2012-04-20 16:20:42 -07:00
The Android Automerger
b0936b79fa
IMM76K
2012-04-20 16:20:26 -07:00
Keun young Park
b9566c0221
Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"
...
This reverts commit 9283168e61
2012-04-20 16:18:34 -07:00
Jean-Baptiste Queru
a50ef1c124
Switch to new locations of toolchains
...
Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
2012-04-20 16:15:42 -07:00
The Android Automerger
4e960a3fed
JRN19F
2012-04-20 16:07:45 -07:00
Colin Cross
74bc051f75
Move pdk fusion platform.zip file under vendor/pdk
...
Look for the platform.zip file in:
vendor/pdk/DEVICE/PRODUCT-BUILD_VARIANT/platform/platform.zip
Change-Id: I275029842fdf13867d5141549ca8c39abb23600b
2012-04-20 16:07:22 -07:00
Colin Cross
d71a7f7bc8
Merge "Move pdk fusion platform.zip file under vendor/pdk"
2012-04-20 15:44:29 -07:00
Raphael Moll
f66f3476e4
Split target/product/sdk.mk into sdk.git
...
This changes target/product/sdk.mk so that the list of tools
and libs to build for the SDK be actually defined in both
sdk.git and development.git.
Depends on dev.git change I6bbc6644a and sdk.git change Id270eba6
Change-Id: I790df85ea8620f73c769aec0f92f474de60b63f9
2012-04-20 14:14:55 -07:00
The Android Automerger
b132a54f5d
JRN19E
2012-04-20 13:01:02 -07:00
Keun young Park
27f8946d2d
Merge "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"
2012-04-20 12:02:34 -07:00
Scott Main
e8e50739da
am ac2c989e
: am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit 'ac2c989e8492a733bdd3d4c7e1bedd5210c56c8d':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
2012-04-20 10:38:51 -07:00
Scott Main
4054a1587a
am 7a086316
: am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '7a086316424925fb33ed470116563712e7754f8b':
2012-04-20 10:38:15 -07:00
Scott Main
217a4d896b
am 9041aa50
: am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '9041aa50fbdb2cff512617a0377385c7d5ada663':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
2012-04-20 10:37:32 -07:00
Scott Main
7a08631642
am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '6b719da3162ef99db8b90379a9dc4724b571395f':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
2012-04-20 10:35:33 -07:00
Scott Main
9041aa50fb
am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '6b719da3162ef99db8b90379a9dc4724b571395f':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
2012-04-20 10:35:12 -07:00
Scott Main
ac2c989e84
am 6b719da3
: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
* commit '6b719da3162ef99db8b90379a9dc4724b571395f':
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
2012-04-20 10:35:11 -07:00
Scott Main
6b719da316
docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
...
Change-Id: I0125b1d585a0adde7f5f485f3288fdc7a8a55faf
2012-04-20 10:19:54 -07:00
Keun young Park
9283168e61
enable Java build for PDK build
...
- Highest LOCAL_SDK_VERSION forced for package build / java library build
- uses prebuilt tools for PDK
Bug: 6352960
Change-Id: Ibb5162a16aa8151a1675baac14adb0cdfc13592d
2012-04-20 10:07:31 -07:00
Jean-Baptiste Queru
d0427e493e
Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
2012-04-20 08:30:21 -07:00
Jean-Baptiste Queru
810b0d8bb4
Merge "Fix build problems with gcc-4.6.x."
2012-04-20 08:30:05 -07:00
Jing Yu
c856e31523
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
...
http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html
-fstrict-volatile-bitfields is set on by default on gcc-4.6
for ARM target. This causes an inline asm() error. While
upstream gcc community is working on the patch, we shut
off this option temporarily.
This patch does not affect gcc-4.4.3 build.
Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
2012-04-20 07:53:16 -07:00
Doug Kwan
422a3650d3
Fix build problems with gcc-4.6.x.
...
Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
2012-04-20 07:52:47 -07:00
Andrew Hsieh
ecd054c609
Add goldfish audio hw to board/generic_x86
...
Without it, app with audio may crash x86 emulator
Change-Id: Ie9b30a2827c0a559e7cf73b7b21604f36c379483
2012-04-20 16:08:14 +08:00
The Android Automerger
6e417bc37a
JRN19D
2012-04-19 20:10:01 -07:00
Scott Main
f689b77c05
am b3d8eecd
: am 76b0139a
: docs: update doc template to make the Resources side nav wider (+40px)
...
* commit 'b3d8eecd9ca47ac369ce420b6da21947a6a6d84f':
2012-04-19 19:31:16 -07:00
Scott Main
4793116d7a
am 1882adfd
: am 76b0139a
: docs: update doc template to make the Resources side nav wider (+40px)
...
* commit '1882adfd49b392acb6efe66a09bf753e1c830eef':
docs: update doc template to make the Resources side nav wider (+40px)
2012-04-19 19:30:33 -07:00
Scott Main
7291a4f784
am 27e53840
: am 76b0139a
: docs: update doc template to make the Resources side nav wider (+40px)
...
* commit '27e538405495b3d36b2750e376706e0ad583a03c':
docs: update doc template to make the Resources side nav wider (+40px)
2012-04-19 19:29:49 -07:00
Scott Main
b3d8eecd9c
am 76b0139a
: docs: update doc template to make the Resources side nav wider (+40px)
...
* commit '76b0139a50ecdfa5613af9563808cc42a72476d8':
docs: update doc template to make the Resources side nav wider (+40px)
2012-04-19 19:28:10 -07:00
Scott Main
1882adfd49
am 76b0139a
: docs: update doc template to make the Resources side nav wider (+40px)
...
* commit '76b0139a50ecdfa5613af9563808cc42a72476d8':
docs: update doc template to make the Resources side nav wider (+40px)
2012-04-19 19:27:59 -07:00
Scott Main
27e5384054
am 76b0139a
: docs: update doc template to make the Resources side nav wider (+40px)
...
* commit '76b0139a50ecdfa5613af9563808cc42a72476d8':
docs: update doc template to make the Resources side nav wider (+40px)
2012-04-19 19:27:39 -07:00
Scott Main
76b0139a50
docs: update doc template to make the Resources side nav wider (+40px)
...
Change-Id: I173e64d57f9ec31bf0c3912bca5d46a5f7c78338
2012-04-19 19:23:04 -07:00
Colin Cross
b01807b36d
Merge changes I9a390206,If3e9e846
...
* changes:
build: separate dist tools and ota tools
build: remove unused ota tools
2012-04-19 17:15:44 -07:00
The Android Automerger
5ededc0905
JRN19C
2012-04-19 15:37:21 -07:00
The Android Automerger
48ccb184f7
JRN19B
2012-04-19 15:21:43 -07:00
Jean-Baptiste Queru
700741cf45
Merge "Use an https URL"
2012-04-19 15:06:10 -07:00
Jean-Baptiste Queru
5d4bcb490e
Use an https URL
...
Change-Id: I9842d009b852df1882eaddb1bd53b216da0f4650
2012-04-19 14:53:27 -07:00
Iliyan Malchev
aad195e79e
vbox_x86: add a 256M ext4 cache partition
...
Change-Id: If88895f60308673526a579a96d5b1ed9206c0241
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-04-19 14:50:10 -07:00
Colin Cross
c312f31871
build: separate dist tools and ota tools
...
aapt is not needed for a dist build and not available in a pdk dist
build. Create a new list DISTTOOLS that dist builds depends on,
and change OTATOOLS to be DISTTOOLS plus aapt, which is build by
make otatools.
Change-Id: I9a39020640b0e2cade8073aa14ee2ada9a20d78b
2012-04-19 13:54:39 -07:00
Colin Cross
4049130cba
build: remove unused ota tools
...
genext2fs, tune2fs, and e2fsck are no longer used by mkuserimg.sh.
Change-Id: If3e9e846e021de0973bde2702e60acdc9f4c57c7
2012-04-19 13:29:27 -07:00
The Android Automerger
396c8cfa15
IMM76J
2012-04-19 12:15:03 -07:00