The Android Automerger
b9e7ead0b6
HLK18B
...
Change-Id: Id19ef186c942370c8ddf9c2e0bdfa5651469fbb5
2011-07-18 16:03:14 -07:00
The Android Automerger
5403844657
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-07-18 16:03:08 -07:00
Marco Nelissen
f0fee66e50
Add music effects control panel to the build.
...
Change-Id: If4cccd929b103d43dcd48f9ad453e2f850061b5d
2011-07-18 15:08:39 -07:00
Kenny Root
bf8cf79f60
am 3146eb76
: am 1708a6f7
: am 4880b436
: am 62a2b188
: Merge "Avoid complaining about empty directories"
...
* commit '3146eb76cf193ce95f0f88a477b1c708a1b5cf9b':
Avoid complaining about empty directories
2011-07-18 14:47:21 -07:00
Kenny Root
3146eb76cf
am 1708a6f7
: am 4880b436
: am 62a2b188
: Merge "Avoid complaining about empty directories"
...
* commit '1708a6f74bf36ad6d520476895695c26bdaf7306':
Avoid complaining about empty directories
2011-07-18 13:48:43 -07:00
Kenny Root
1708a6f74b
am 4880b436
: am 62a2b188
: Merge "Avoid complaining about empty directories"
...
* commit '4880b436656d7cfd00bb82ebde1b408e0bd19bda':
Avoid complaining about empty directories
2011-07-18 13:47:16 -07:00
Kenny Root
4880b43665
am 62a2b188
: Merge "Avoid complaining about empty directories"
...
* commit '62a2b1882fb95e960b5889b46fe8f669ddc7c8ac':
Avoid complaining about empty directories
2011-07-18 13:45:15 -07:00
Kenny Root
62a2b1882f
Merge "Avoid complaining about empty directories"
2011-07-18 13:41:25 -07:00
Kenny Root
7546d613af
Avoid complaining about empty directories
...
Change-Id: If46bffd1c4e6b94f2e476b2d7d506ef337bbf8e1
2011-07-18 13:12:31 -07:00
Kenny Root
b080a7392c
am 1b61d1ba
: am db549686
: am 099aa4cf
: am b8a1c89b
: Merge "Only include "[a-z]*.bash" files for completion"
...
* commit '1b61d1ba7b7f2c0017193bcfc3a28e30af1ce603':
Only include "[a-z]*.bash" files for completion
2011-07-18 12:06:40 -07:00
Kenny Root
1b61d1ba7b
am db549686
: am 099aa4cf
: am b8a1c89b
: Merge "Only include "[a-z]*.bash" files for completion"
...
* commit 'db5496867968fe592de807e606dc11287ca61c6a':
Only include "[a-z]*.bash" files for completion
2011-07-18 12:01:29 -07:00
Kenny Root
db54968679
am 099aa4cf
: am b8a1c89b
: Merge "Only include "[a-z]*.bash" files for completion"
...
* commit '099aa4cf4d82218110c6edf3edede0e72450216e':
Only include "[a-z]*.bash" files for completion
2011-07-18 11:57:24 -07:00
Kenny Root
099aa4cf4d
am b8a1c89b
: Merge "Only include "[a-z]*.bash" files for completion"
...
* commit 'b8a1c89b3a848ea343c897b33e77455dc2f98119':
Only include "[a-z]*.bash" files for completion
2011-07-18 11:54:15 -07:00
Kenny Root
b8a1c89b3a
Merge "Only include "[a-z]*.bash" files for completion"
2011-07-18 11:44:26 -07:00
Kenny Root
85cb556e2e
Only include "[a-z]*.bash" files for completion
...
Some people were using case-insensitive filesystems which broke when
including simply [a-z]* since it matched the uppercase files. Use this
to filter only the actual bash scripts.
Change-Id: Ibfdcf2c091a154f0485545537a044667783a19f7
2011-07-18 11:15:31 -07:00
Eric Laurent
46f9aa84c2
Merge "Added audio pre processing library"
2011-07-18 08:43:35 -07:00
The Android Open Source Project
90e5a92abb
Reconcile with gingerbread-release honeycomb-LTE-release
...
Change-Id: I8e396934afd0c48b07bb5e28973f0c3e16beb8bb
2011-07-18 08:09:54 -07:00
The Android Automerger
1adcfe00b2
HLK18
...
Change-Id: Ib9de1e5c3155d1a712015611e8839afcd4848aca
2011-07-18 07:25:51 -07:00
The Android Automerger
80f75ed2f7
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-07-18 07:25:47 -07:00
Eric Laurent
35787e0d5b
Added audio pre processing library
...
Added wrapper library on top of webrtc audio processing modules.
Change-Id: I72105accb5d2159d5d69d28ec5b557a888b06e63
2011-07-17 14:37:50 -07:00
Jean-Baptiste Queru
ff13078be4
Merge "Remove Camera app from the generic build."
2011-07-15 18:12:28 -07:00
Jean-Baptiste Queru
2c6a62f8fb
Remove Camera app from the generic build.
...
That's because a camera isn't required for compatibility and some
devices don't have a camera.
Add the Camera app in the emulator builds, since the emulator does
have a camera.
Change-Id: I56a1fe9f703c3b05dec99200a9353d75338c5f40
2011-07-15 17:47:14 -07:00
Kenny Root
50bab23178
resolved conflicts for merge of 5cc2e94f
to master
...
Change-Id: I7707603ae64fa3e4371fab2e81aab7ec37e69d33
2011-07-15 15:14:51 -07:00
The Android Automerger
687e5ffb6e
GWK15
...
Change-Id: Ie8bb113d5c260d11a662c5fcc74b46bcab4a90ad
2011-07-15 14:55:43 -07:00
Kenny Root
5cc2e94fa8
am cb255e51
: am 8985d033
: am 88dcfccb
: Merge "Add bash completion to envsetup"
...
* commit 'cb255e514093eaa839b1ac2487bdc2ec60797415':
Add bash completion to envsetup
2011-07-15 14:55:26 -07:00
Kenny Root
cb255e5140
am 8985d033
: am 88dcfccb
: Merge "Add bash completion to envsetup"
...
* commit '8985d0337814219235a9698c99cf318682367560':
Add bash completion to envsetup
2011-07-15 14:52:57 -07:00
Kenny Root
8985d03378
am 88dcfccb
: Merge "Add bash completion to envsetup"
...
* commit '88dcfccb5b064735177e1a87f578d6c734b47bc7':
Add bash completion to envsetup
2011-07-15 14:50:05 -07:00
Kenny Root
88dcfccb5b
Merge "Add bash completion to envsetup"
2011-07-15 14:41:14 -07:00
Hugo Hudson
cfcbb69f23
Merge "Add in the variable speed library for use in the voicemail playback ui."
2011-07-15 12:49:13 -07:00
Hugo Hudson
3e4de5d226
Add in the variable speed library for use in the voicemail playback ui.
...
- The variable speed audio library has been added to frameworks/ex.
Change-Id: Id4e3f8f3f36a504bed11026a9c5a05455c19cdf4
2011-07-15 20:17:55 +01:00
Kenny Root
52aa81cab9
Add bash completion to envsetup
...
Change-Id: I0b4d74e72deede42d7e5f229593d79417f16bb55
2011-07-15 11:22:31 -07:00
The Android Automerger
32b3c3afcd
HLK15B
...
Change-Id: Ia0e0315a0f2917aa53329625d39b54e40ab9c239
2011-07-15 10:45:25 -07:00
The Android Automerger
ea18c7e0b0
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-07-15 10:45:20 -07:00
The Android Automerger
2830614f4f
HLK15
...
Change-Id: I4fe9536484604add3126a99539991e6d3c45f435
2011-07-15 07:19:48 -07:00
The Android Automerger
0ecc92c144
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-07-15 07:19:44 -07:00
The Android Automerger
411c45b0c5
GWK14B
...
Change-Id: I26218c911d10efd23801652459887583ab389a05
2011-07-14 22:26:02 -07:00
Doug Kwan
be3689e981
Conditionally disable -Wno-unused-but-set-variable for gcc-4.6.
...
We used to do that unconditionally but that caused lots of spurious
warnings in gcc-4.4.x about an unrecognized gcc option.
Change-Id: Idb5118b069871859e07a7efa04914ab6ed0b1372
2011-07-14 16:34:26 -07:00
The Android Automerger
2164d29f25
GWK14
...
Change-Id: Idd736ac92e1dc000148f7124015ab75e40533707
2011-07-14 16:16:30 -07:00
Ying Wang
c7e34c40ff
am 8264e8f0
: am 46db7b79
: am fbfd654f
: Switch Unbundled apps from generic.mk to full.mk.
...
* commit '8264e8f0f2a8ed2e4bfd5eb76934c6539c47fbc8':
Switch Unbundled apps from generic.mk to full.mk.
2011-07-14 10:56:06 -07:00
Ying Wang
8264e8f0f2
am 46db7b79
: am fbfd654f
: Switch Unbundled apps from generic.mk to full.mk.
...
* commit '46db7b791af1ec1d086f7dd73c737a79322e3e3e':
Switch Unbundled apps from generic.mk to full.mk.
2011-07-14 09:18:31 -07:00
The Android Automerger
b33f24d84b
HLK14
...
Change-Id: I66abf43ce1ae0af8d08014cb5dabfddfe28f8010
2011-07-14 07:20:34 -07:00
The Android Automerger
f3e9f601e3
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
2011-07-14 07:20:29 -07:00
Ying Wang
46db7b791a
am fbfd654f
: Switch Unbundled apps from generic.mk to full.mk.
...
* commit 'fbfd654f67609d019de8111480ebe374669ffef2':
Switch Unbundled apps from generic.mk to full.mk.
2011-07-13 22:38:35 -07:00
Tsu Chiang Chuang
64000a2a00
Merge "fix mixing argument in makefile."
2011-07-13 16:59:08 -07:00
Tsu Chiang Chuang
44802a22e3
fix mixing argument in makefile.
...
Change-Id: I659d996dda0a2047ebb3240607e66411fc60fda6
2011-07-13 16:40:33 -07:00
android-merger
7855c79d8f
GRJ90J
...
Change-Id: Ia1ca32f69dba721878e2190f8f841dda7aeb2055
2011-07-13 16:31:56 -07:00
David 'Digit' Turner
a576286228
am d19750e8
: (-s ours) am 36331f84
: resolved conflicts for merge of 09636e17
to gingerbread-plus-aosp
...
* commit 'd19750e87f454507a9cee01989416ffbd14ea3f5': (23 commits)
sdk-addon.mk: Copy image files to ABI-specific dir
emulator: Enable dex-preoptimization
sdk: provide ABI-dependent atree files
emulator: Build emulator platform images as ARMv7-A
x86: Add proper gcc-4.4.3 x86 toolchain support.
sdk: Add pc-bios files for IA qemu emulator
x86: qemu emulator is the default build target
Add full_x86 product.
x86: sdk_x86 build target
Minor cleanup - DO NOT MERGE
Clean up full config - DO NOT MERGE
Make a full list of locales available
Truly default to the full config.
generic_x86 builds don't need/use the sparse ext4 format.
Use ext4 file system for generic_x86 userdata partition
GB Updates for init.rc and boot command line
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
Display the TARGET_ARCH_VARIANT
Add generic_x86-eng to the lunch menu
Move buildspec vars to BoardConfig.mk
...
2011-07-13 14:53:40 -07:00
Ying Wang
035eafebdc
Merge "Use the LOCAL_* as dependency."
2011-07-13 14:30:30 -07:00
Ying Wang
a7d9ca371e
Use the LOCAL_* as dependency.
...
PRIVATE_* should be used only in the build commands.
Change-Id: Ie1d8db7c78012a8615b893d3ef3be893da7466f4
2011-07-13 14:29:33 -07:00
Eric Laurent
8feafd421f
Merge "Added webrtc audio processing library"
2011-07-13 13:16:57 -07:00