Jean-Baptiste Queru
e4abb37a73
am 27a4fa10: am 2d0055dd: Merge "Revert "Add module \'idmap\'.""
...
* commit '27a4fa10a90c754da307ddda14e16c3864dc0413':
Revert "Add module 'idmap'."
2012-05-23 16:16:30 -07:00
Jean-Baptiste Queru
4412133fb8
Revert "Add module 'idmap'."
...
This reverts commit eb7c4a5e9e
.
2012-05-23 16:03:14 -07:00
Jean-Baptiste Queru
a213c695a0
am 372936d8: am c47b90a9: Merge "Add module \'idmap\'."
...
* commit '372936d881a2b64333c88ccb012ec57f80a2e424':
Add module 'idmap'.
2012-05-23 16:01:09 -07:00
Jean-Baptiste Queru
c47b90a9a9
Merge "Add module 'idmap'."
2012-05-23 14:40:00 -07:00
Andrew Hsieh
b968c85edf
Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86
...
Change TARGET_ARCH_VARIANT from x86-atom to x86, for the reason
that atom-specific instruciton like "movbe" isn't "generic" to
x86 Android devices and x86 host running emulator-x86, which may
crash non-atom host in VT because "movbe" isn't supported natively.
Also revert previous fix in TARGET_linux-x86.mk which conservatively
disable "movbe" across the board
Change-Id: Ief93a3585566ffae558fcdc29741e6213a048d7d
2012-05-21 14:27:59 +08:00
James Dong
3ffbea3dcf
am 4007faf4: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
* commit '4007faf4c6bb99883f6ac7a8d80a956837909ff8':
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
2012-05-16 01:22:31 -07:00
James Dong
4007faf4c6
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
related-to-bug: 6502980
Change-Id: I02a735ff4897ed386fe9c5d886260b1363a1e019
2012-05-16 01:17:42 -07:00
James Dong
4d5c4dc3e0
am c8bfb1ca: Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" Fixed the broken build first.
...
* commit 'c8bfb1cad15822f31e3f3250d00b4ef6761c19c4':
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" Fixed the broken build first.
2012-05-15 14:59:09 -07:00
James Dong
c8bfb1cad1
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
...
Fixed the broken build first.
This reverts commit e85f05be14
.
2012-05-15 14:47:37 -07:00
James Dong
a0404bf3b7
am e85f05be: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
* commit 'e85f05be147bf7d916d1b1622f6f3038dac8913b':
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
2012-05-15 14:27:02 -07:00
James Dong
e85f05be14
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
related-to-bug: 6328360
Change-Id: Ia320d417497bc410f99f8ff7f11c727d1299afba
2012-05-15 00:45:45 -07:00
Jean-Baptiste Queru
44fd5580b5
am 7eb749d1: am 2d7274de: Merge "MIPS generic target support"
...
* commit '7eb749d134fd52e23be7218bf2ea7dfa1b1180b3':
MIPS generic target support
2012-05-11 21:53:54 -07:00
Victoria Lease
057366e21d
am 67095e00: Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
...
* commit '67095e005c48c639954d4ada60f391ff4923f0eb':
Parse external/cibu-fonts/fonts.mk.
2012-05-11 16:54:00 -07:00
Victoria Lease
67095e005c
Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
2012-05-11 16:51:47 -07:00
Jean-Baptiste Queru
2d7274de30
Merge "MIPS generic target support"
2012-05-11 14:46:38 -07:00
Jean-Baptiste Queru
8ff07372c1
am 0e2bc24e: am cd99ece7: Merge "x86: customize the malloced address to be 16-byte aligned"
...
* commit '0e2bc24ef002ec612e94a64da297a7698acde749':
x86: customize the malloced address to be 16-byte aligned
2012-05-11 14:12:10 -07:00
Jean-Michel Trivi
a5cb884640
am 0c5db81f: Merge "Add OMX IL FLAC encoder library" into jb-dev
...
* commit '0c5db81fb28f74491e7f17c6c81ae0b19342ca7c':
Add OMX IL FLAC encoder library
2012-05-10 10:45:15 -07:00
Jean-Michel Trivi
0c5db81fb2
Merge "Add OMX IL FLAC encoder library" into jb-dev
2012-05-10 09:54:41 -07:00
Jean-Michel Trivi
b8bc852d5d
Add OMX IL FLAC encoder library
...
Bug 5525503
Add the software FLAC encoder OMX IL wrapper to the build.
Change-Id: Iac69558088934e0db41e9cc7fa3fab7e72348568
2012-05-09 16:00:11 -07:00
Jeff Brown
9c55335afd
am 8c1028d4: Merge "Add keyboard layout package to build." into jb-dev
...
* commit '8c1028d45cfd7892a031e32b4e51bad729ebd2cb':
Add keyboard layout package to build.
2012-05-09 01:45:55 -07:00
Jean-Michel Trivi
8fda511103
am 0acb2064: Merge "Make audio downmixer part of the core platform" into jb-dev
...
* commit '0acb2064d7080ab1b3d993cfad66fbf852f9663a':
Make audio downmixer part of the core platform
2012-05-09 01:45:21 -07:00
Raghu Gandham
b53cc7a82b
MIPS generic target support
...
Change-Id: I76506eba9d11867e53069c97038996bddd7dd5a2
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Signed-off-by: Duane Sand <duanes@mips.com>
Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com>
2012-05-08 11:53:47 -07:00
Victoria Lease
c5fc79071a
Parse external/cibu-fonts/fonts.mk.
...
Bug: 6232193
Change-Id: I5a4b1077440ce9ab5bc504d5b2fca1a9648cc084
2012-05-08 09:28:34 -07:00
Jack Ren
6f28d9750c
x86: customize the malloced address to be 16-byte aligned
...
That can gain better memory performance than 8-byte alignment
Change-Id: Ibcc5bf7b96ed10166038357dd0c86c9171768f3e
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-05-08 13:38:25 +08:00
Jeff Brown
8c1028d45c
Merge "Add keyboard layout package to build." into jb-dev
2012-05-07 19:30:00 -07:00
Jeff Brown
b2d926898c
Add keyboard layout package to build.
...
Bug: 6110399
Change-Id: Ifb1d0126359750699244e481b49bbaf49371b7ae
2012-05-07 19:11:06 -07:00
Jean-Michel Trivi
d3763c4214
Make audio downmixer part of the core platform
...
Add the multichannel audio downmix effect to the core platform, as
it is now a core feature of the media framework.
Bug 6456547
Change-Id: I35f88f6bffc131d5fe837c3767879f2536cec05b
2012-05-07 17:10:12 -07:00
Elliott Hughes
559ffeb2ef
am 8e67348b: Merge "Track libnativehelper move for PDK." into jb-dev
...
* commit '8e67348b515636ec8314da44b3f583c5d053e81a':
Track libnativehelper move for PDK.
2012-05-04 16:50:41 -07:00
Elliott Hughes
8e67348b51
Merge "Track libnativehelper move for PDK." into jb-dev
2012-05-04 16:48:37 -07:00
Vikram Aggarwal
107339d84d
am aa6ffd75: Merge "Fix the build. Exchange -> Exchange2" into jb-dev
...
* commit 'aa6ffd7595966808a60341a449745d3d03d88768':
Fix the build. Exchange -> Exchange2
2012-05-04 16:42:05 -07:00
Vikram Aggarwal
e396df8cb5
Fix the build. Exchange -> Exchange2
...
Change-Id: I70b479b69ea60a60ee3725344aa410c6e4f9d6b7
2012-05-04 16:34:27 -07:00
Elliott Hughes
89898dff4e
Track libnativehelper move for PDK.
...
Bug: 6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
2012-05-04 15:36:42 -07:00
Jean-Baptiste Queru
5af27de0b5
resolved conflicts for merge of 343597c3
to jb-dev-plus-aosp
...
Change-Id: I84648a8044e6238a57b4a08a261146bfa3c8c1c7
2012-05-02 15:24:32 -07:00
Jean-Baptiste Queru
6ed1beed3d
am a4354dd8: am 2ba46ecd: Merge "Add Esperanto to the list of locales"
...
* commit 'a4354dd8ce98320a1e6ca895dc049b82c8e1fa46':
Add Esperanto to the list of locales
2012-05-02 14:18:27 -07:00
Jun Tian
07fe2cf7b4
Enable sound effect support in the SDK system image
...
Add the missing configuration in sdk.mk to support sound effect in the SDK building.
This patch can fix the CTS sound effect failues of media test in emulator system image.
Change-Id: I8c22e62201d48c2e56fb4c105795bb96ded8f34d
2012-05-02 12:18:52 -07:00
Jean-Baptiste Queru
2ba46ecdc4
Merge "Add Esperanto to the list of locales"
2012-05-02 07:39:16 -07:00
James Dong
a69e6194da
Build libstagefright_soft_mpeg4enc.so by default
...
o related-to-bug: 6401068
Change-Id: I3114d4b817acc85a6982d03ef3b161141413a079
2012-04-25 18:10:19 -07:00
James Dong
a56be342c2
Merge "Build libstagefright_soft_h264enc by default"
2012-04-24 18:02:49 -07:00
Ying Wang
64f642d688
Fix pdk build.
...
The pdk builds don't have access to development.
Change-Id: Ie7e9f8d24b788749481465311e64145e175b8c4f
2012-04-24 17:12:43 -07:00
Raphael Moll
b7567ea321
resolved conflicts for merge of 4a6e8b95
to master
...
Change-Id: I04abdad12266d7f0eb248528d9bbd35369d18413
2012-04-24 15:43:28 -07:00
Jean-Baptiste Queru
0cfde4016d
Merge 8664008c
to master
...
Change-Id: Ia6aa11892665b8aa42e5fbc69146db251d9a8636
2012-04-24 14:47:45 -07:00
James Dong
d5177950a5
Build libstagefright_soft_h264enc by default
...
related-to-bug: 6383440
Change-Id: I852941c72f9b7270ac6e5b094e4b2a0322643ac8
2012-04-24 14:02:25 -07:00
Raphael Moll
d0831659af
Merge "Split target/product/sdk.mk into sdk.git"
2012-04-23 12:44:00 -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
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
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
Brett Chabot
a8df794649
Merge "Add smoke tests to sdk build."
2012-04-18 14:56:18 -07:00
Mike Lockwood
8945c2609e
Merge "core.mk: Add rule for init.usb.rc"
2012-04-17 10:40:04 -07:00
Brett Chabot
1e420b6063
Add smoke tests to sdk build.
...
Change-Id: If614ad21b3323e16b358f248c44c15b0fe5f0e9a
2012-04-16 18:29:48 -07:00
Andrew Flynn
3bdcae333f
Merge "Default ro.carrier to unknown"
2012-04-16 10:25:27 -07:00