Commit Graph

9035 Commits

Author SHA1 Message Date
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
The Android Automerger 222237b375 JRN37B 2012-05-07 16:32:42 -07:00
Jean-Baptiste Queru 269a40d140 am b031afab: am bf3d3287: Merge "Use the same compilation flags on OS X 10.8 as 10.7"
* commit 'b031afab543d8bf9bb236ff4c297f5ced70f8943':
  Use the same compilation flags on OS X 10.8 as 10.7
2012-05-07 13:59:56 -07:00
Jean-Baptiste Queru b031afab54 am bf3d3287: Merge "Use the same compilation flags on OS X 10.8 as 10.7"
* commit 'bf3d3287acad729c5db51df24ba443ea0d94c9aa':
  Use the same compilation flags on OS X 10.8 as 10.7
2012-05-07 13:56:19 -07:00
Jean-Baptiste Queru bf3d3287ac Merge "Use the same compilation flags on OS X 10.8 as 10.7" 2012-05-07 09:34:39 -07:00
The Android Automerger 667aa3323e JRN37 2012-05-07 07:08:00 -07:00
The Android Automerger 36798fa83f merge in jb-release history after reset to jb-dev 2012-05-07 06:59:21 -07:00
Al Sutton 35bb6422bc Use the same compilation flags on OS X 10.8 as 10.7
Added Mountain Lion to the list of versions which don't need ranlib
and don't need the pre-Lion linker flags

Change-Id: I0c785f0c66e324af9a209520c5a5b3c9bf7df0d5
Signed-off-by: Al Sutton <al@funkyandroid.com>
2012-05-07 09:44:28 +01:00
The Android Automerger 4348eb5319 JRN36B 2012-05-06 22:55:14 -07:00
The Android Automerger 3d86eb189c JRN36 2012-05-06 14:23:05 -07:00
The Android Automerger a7b5858517 merge in jb-release history after reset to jb-dev 2012-05-06 14:21:17 -07:00
The Android Automerger 7a54af9890 JRN34B 2012-05-04 21:45:33 -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 aa6ffd7595 Merge "Fix the build. Exchange -> Exchange2" into jb-dev 2012-05-04 16:39:14 -07:00
Vikram Aggarwal e396df8cb5 Fix the build. Exchange -> Exchange2
Change-Id: I70b479b69ea60a60ee3725344aa410c6e4f9d6b7
2012-05-04 16:34:27 -07:00
Doug Zongker 2f11b071b7 am fffe1d5e: use the file uid/gid/mode saved in the target_files
* commit 'fffe1d5e9c65dcb2321643e25d77d465f7763ba6':
  use the file uid/gid/mode saved in the target_files
2012-05-04 16:34:02 -07:00
The Android Automerger 876ce3ae52 JRN34 2012-05-04 16:21:45 -07:00
The Android Automerger 4818517c7e merge in jb-release history after reset to jb-dev 2012-05-04 16:09:04 -07:00
Elliott Hughes 89898dff4e Track libnativehelper move for PDK.
Bug: 6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
2012-05-04 15:36:42 -07:00
The Android Automerger f822f5e1a6 JRN33F 2012-05-04 12:39:53 -07:00
Jun Tian 020e159f2d Enable DRM support in the SDK system image
Move the DRM packages from full_base.mk to core.mk to support DRM both on full and SDK building.
It can fix the DRM CTS failures in the system image for emulator.

Change-Id: Id12b0ca83a815aac90860230582882e370693522
2012-05-04 10:36:03 +08:00
The Android Automerger b985e6940c JRN33E 2012-05-03 17:01:38 -07:00
Doug Zongker fffe1d5e9c use the file uid/gid/mode saved in the target_files
When building a bootable image with mkbootfs, use the set of file
metadata that's stored in the target_files zip (when available),
rather than whatever is built into the mkbootfs binary at the time the
image is built.

Bug: 6435132
Change-Id: If6c59149bdbcc9a67e5ab9161398f355bd1f511d
2012-05-03 16:15:29 -07:00
The Android Automerger 12b152b485 JRN33D 2012-05-03 14:59:25 -07:00
The Android Automerger 8867a14b70 JRN33C 2012-05-03 14:11:22 -07:00
The Android Automerger b0a58da262 JRN33B 2012-05-03 10:59:16 -07:00
The Android Automerger 48469a60d9 JRN33 2012-05-03 07:32:52 -07:00
The Android Automerger 97d4382158 merge in jb-release history after reset to jb-dev 2012-05-03 06:59:51 -07:00
The Android Automerger 218fe74f9f JRN32D 2012-05-02 18:06:48 -07:00
Jean-Baptiste Queru 76cc34ca0a am 6dfbf024: am 9e4e3b37: Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
* commit '6dfbf0240b77acaf7d6b650b4c206deb29337e7b':
  TARGET_linux-arm.mk: use single slash version of -print-whatever
2012-05-02 17:05:04 -07:00
Jean-Baptiste Queru 6dfbf0240b am 9e4e3b37: Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
* commit '9e4e3b378fd9a62651e216f18dc26cf2b877412a':
  TARGET_linux-arm.mk: use single slash version of -print-whatever
2012-05-02 17:03:12 -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
The Android Automerger 2afad408ba JRN32C 2012-05-02 15:05:54 -07:00
Jean-Baptiste Queru 9bdc290792 am 8571ee47: am f562adc8: Merge "Force use of compatibility compilers on Apple\'s command line tools"
* commit '8571ee478ee352827ec37460d23e6e0dbb1e96db':
  Force use of compatibility compilers on Apple's command line tools
2012-05-02 14:18:28 -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
Jean-Baptiste Queru 9e4e3b378f Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever" 2012-05-02 13:26:50 -07:00
Jean-Baptiste Queru 343597c3aa am c45cb0bf: Merge "Enable sound effect support in the SDK system image"
* commit 'c45cb0bf074b6fec4e9810cfa442cf1c89645dd7':
  Enable sound effect support in the SDK system image
2012-05-02 13:02:26 -07:00
Jean-Baptiste Queru c45cb0bf07 Merge "Enable sound effect support in the SDK system image" 2012-05-02 12:20:16 -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 8571ee478e am f562adc8: Merge "Force use of compatibility compilers on Apple\'s command line tools"
* commit 'f562adc85f05b17c2c10993f3da07e61a7a24b74':
  Force use of compatibility compilers on Apple's command line tools
2012-05-02 11:27:36 -07:00
Jean-Baptiste Queru a4354dd8ce am 2ba46ecd: Merge "Add Esperanto to the list of locales"
* commit '2ba46ecdc4bca804ffedc38694910dc1322b42d1':
  Add Esperanto to the list of locales
2012-05-02 11:27:35 -07:00
The Android Automerger 5ff168feec JRN32B 2012-05-02 10:48:05 -07:00
Jean-Baptiste Queru f562adc85f Merge "Force use of compatibility compilers on Apple's command line tools" 2012-05-02 09:40:13 -07:00
Jean-Baptiste Queru 2ba46ecdc4 Merge "Add Esperanto to the list of locales" 2012-05-02 07:39:16 -07:00
The Android Automerger 39bf18fe78 JRN32 2012-05-02 07:23:42 -07:00
Al Sutton 0d07c732c7 Force use of compatibility compilers on Apple's command line tools
The cc and c++ compilers included in Apple's command line tools show some
unusual behaviour which causes the build to fail in several projects under
Xcode 4.3

This patch uses the gnu compatibility gcc and g++ compilers on OS X instead
to reduce problems, and generates an error when an llvm based compiler is
detected because they currently do not generate usable emulator executables
due to them not honouring global register variables.

Change-Id: I506c22dad3dcbd41df3c7672802a675d3655e262
Signed-off-by: Al Sutton <al@funkyandroid.com>
2012-05-02 07:11:27 -07:00
The Android Automerger 8346870a22 merge in jb-release history after reset to jb-dev 2012-05-02 07:00:02 -07:00
The Android Automerger af9bd9c381 JRN31B 2012-05-01 17:16:37 -07:00