OSDN Git Service
James Dong [Tue, 15 May 2012 21:27:02 +0000 (14:27 -0700)]
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
James Dong [Tue, 15 May 2012 07:45:19 +0000 (00:45 -0700)]
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug:
6328360
Change-Id: Ia320d417497bc410f99f8ff7f11c727d1299afba
Ying Wang [Tue, 15 May 2012 02:34:26 +0000 (19:34 -0700)]
am
3ceecfa3: Check the well-formedness of an xml file before copying.
* commit '
3ceecfa3daeb187c0631a84e6ee6b4dd89f111f8':
Check the well-formedness of an xml file before copying.
Ying Wang [Mon, 14 May 2012 21:39:00 +0000 (14:39 -0700)]
Check the well-formedness of an xml file before copying.
Bug:
6491991
Change-Id: I3dbf9a7e1fefd9fea2636c78a85bae63ea8391b8
Jean-Baptiste Queru [Sat, 12 May 2012 04:53:54 +0000 (21:53 -0700)]
am
7eb749d1: am
2d7274de: Merge "MIPS generic target support"
* commit '
7eb749d134fd52e23be7218bf2ea7dfa1b1180b3':
MIPS generic target support
Jean-Baptiste Queru [Sat, 12 May 2012 04:51:52 +0000 (21:51 -0700)]
am
2d7274de: Merge "MIPS generic target support"
* commit '
2d7274de30e35eb13d2934707601ef91ce0f6d4d':
MIPS generic target support
Victoria Lease [Fri, 11 May 2012 23:54:00 +0000 (16:54 -0700)]
am
67095e00: Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
* commit '
67095e005c48c639954d4ada60f391ff4923f0eb':
Parse external/cibu-fonts/fonts.mk.
Victoria Lease [Fri, 11 May 2012 23:51:47 +0000 (16:51 -0700)]
Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
Jean-Baptiste Queru [Fri, 11 May 2012 21:46:37 +0000 (14:46 -0700)]
Merge "MIPS generic target support"
Jean-Baptiste Queru [Fri, 11 May 2012 21:12:10 +0000 (14:12 -0700)]
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
Jean-Baptiste Queru [Fri, 11 May 2012 21:09:16 +0000 (14:09 -0700)]
am
cd99ece7: Merge "x86: customize the malloced address to be 16-byte aligned"
* commit '
cd99ece706771d4141b8fc51104224946cf1df65':
x86: customize the malloced address to be 16-byte aligned
Jean-Baptiste Queru [Fri, 11 May 2012 18:25:10 +0000 (11:25 -0700)]
Merge "x86: customize the malloced address to be 16-byte aligned"
Doug Zongker [Fri, 11 May 2012 17:44:38 +0000 (10:44 -0700)]
am
7bb04231: add copy of public cert used for signing to OTA packages
* commit '
7bb042317ab4df86b9962f30399c7728e8b84599':
add copy of public cert used for signing to OTA packages
Jean-Baptiste Queru [Fri, 11 May 2012 17:42:24 +0000 (10:42 -0700)]
Merge
3742983d from jb-dev
Change-Id: I6a9d140fdfac55fd0ada1c9c7e3b1d1a7cb8d8c9
Doug Zongker [Fri, 11 May 2012 16:20:50 +0000 (09:20 -0700)]
add copy of public cert used for signing to OTA packages
When signing a file with -w (ie, an OTA package), add the file
META-INF/com/android/otacert, which is a copy of the public key
certificate. While this can be extracted from the CERT.RSA file,
having a copy of it more easily accessible makes it easier to write
tools.
Bug:
6477365
Change-Id: I8cdb19536eca9a223c2b954e3f8ea0d9f3f86f02
Dianne Hackborn [Thu, 10 May 2012 05:14:37 +0000 (22:14 -0700)]
JellyBean is now 4.1.
Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
Ying Wang [Fri, 11 May 2012 01:11:23 +0000 (18:11 -0700)]
am
a1ff6290: Now current is also a valid prebuilt SDK.
* commit '
a1ff6290e1e14d48dc42d1eacf804172c5913916':
Now current is also a valid prebuilt SDK.
Ying Wang [Fri, 11 May 2012 01:07:33 +0000 (18:07 -0700)]
Now current is also a valid prebuilt SDK.
Change-Id: Id05d20f17a4b46e19df88516f50e58f6cdb62c1c
Ying Wang [Fri, 11 May 2012 00:58:46 +0000 (17:58 -0700)]
am
0ec188f1: Support to build against prebuilt current SDK in unbundled branch
* commit '
0ec188f1c197709cf61d0de647b5220539b97322':
Support to build against prebuilt current SDK in unbundled branch
Ying Wang [Fri, 11 May 2012 00:25:51 +0000 (17:25 -0700)]
Support to build against prebuilt current SDK in unbundled branch
Bug:
6465084
With this change and prebuilt current SDK checked in, you can build
unbundled apps with LOCAL_SDK_VERSION current in an unbundled branch.
Change-Id: I4efcee611d08a3a903bd6bf5a80de11500564206
Jean-Michel Trivi [Thu, 10 May 2012 17:45:15 +0000 (10:45 -0700)]
am
0c5db81f: Merge "Add OMX IL FLAC encoder library" into jb-dev
* commit '
0c5db81fb28f74491e7f17c6c81ae0b19342ca7c':
Add OMX IL FLAC encoder library
Jean-Michel Trivi [Thu, 10 May 2012 16:54:41 +0000 (09:54 -0700)]
Merge "Add OMX IL FLAC encoder library" into jb-dev
Nick Kralevich [Thu, 10 May 2012 16:24:10 +0000 (09:24 -0700)]
am
ecb1a565: x86: compile everything with relro / bind_now
* commit '
ecb1a565849b40ab7aa45b7fe71e24e29a059376':
x86: compile everything with relro / bind_now
Jean-Michel Trivi [Fri, 27 Apr 2012 20:38:17 +0000 (13:38 -0700)]
Add OMX IL FLAC encoder library
Bug
5525503
Add the software FLAC encoder OMX IL wrapper to the build.
Change-Id: Iac69558088934e0db41e9cc7fa3fab7e72348568
Nick Kralevich [Wed, 9 May 2012 21:49:04 +0000 (14:49 -0700)]
x86: compile everything with relro / bind_now
Enable relro / bind_now when compiling Android applications.
This marks certain regions of memory as read-only after linking,
making memory corruption security vulnerabilities are harder
to exploit.
See:
* http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
* http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html
relro support has been enabled for ARM since
233d460f21d372f964f8078b8b0d5fd17af7c6b6.
This change enables it for x86.
Change-Id: Ib90704f2fecffcfdc3587607112804faa0e16385
Stephen Hines [Wed, 9 May 2012 08:49:45 +0000 (01:49 -0700)]
am
b6956bdd: Merge "Add LLVM_AS to tools." into jb-dev
* commit '
b6956bdd19242cde11b2e9c1f3941585706f3cd3':
Add LLVM_AS to tools.
Jeff Brown [Wed, 9 May 2012 08:45:55 +0000 (01:45 -0700)]
am
8c1028d4: Merge "Add keyboard layout package to build." into jb-dev
* commit '
8c1028d45cfd7892a031e32b4e51bad729ebd2cb':
Add keyboard layout package to build.
Jean-Michel Trivi [Wed, 9 May 2012 08:45:21 +0000 (01:45 -0700)]
am
0acb2064: Merge "Make audio downmixer part of the core platform" into jb-dev
* commit '
0acb2064d7080ab1b3d993cfad66fbf852f9663a':
Make audio downmixer part of the core platform
Elliott Hughes [Wed, 9 May 2012 08:45:01 +0000 (01:45 -0700)]
am
9264e4a5: The \'localize\' tool is dead.
* commit '
9264e4a5f63352cd6abc3d81b18be779a33c7b10':
The 'localize' tool is dead.
Stephen Hines [Wed, 9 May 2012 01:47:43 +0000 (18:47 -0700)]
Merge "Add LLVM_AS to tools." into jb-dev
Stephen Hines [Wed, 9 May 2012 01:43:48 +0000 (18:43 -0700)]
Add LLVM_AS to tools.
Change-Id: If9b4900e743b9efbf4b12eee4ed5e713ce82db9b
Raghu Gandham [Mon, 7 May 2012 14:04:57 +0000 (07:04 -0700)]
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>
Victoria Lease [Tue, 8 May 2012 16:28:34 +0000 (09:28 -0700)]
Parse external/cibu-fonts/fonts.mk.
Bug:
6232193
Change-Id: I5a4b1077440ce9ab5bc504d5b2fca1a9648cc084
Jack Ren [Sat, 17 Mar 2012 09:16:48 +0000 (17:16 +0800)]
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>
Jeff Brown [Tue, 8 May 2012 02:30:00 +0000 (19:30 -0700)]
Merge "Add keyboard layout package to build." into jb-dev
Jeff Brown [Tue, 8 May 2012 02:08:32 +0000 (19:08 -0700)]
Add keyboard layout package to build.
Bug:
6110399
Change-Id: Ifb1d0126359750699244e481b49bbaf49371b7ae
Jean-Michel Trivi [Tue, 8 May 2012 00:47:10 +0000 (17:47 -0700)]
Merge "Make audio downmixer part of the core platform" into jb-dev
Elliott Hughes [Tue, 8 May 2012 00:33:19 +0000 (17:33 -0700)]
The 'localize' tool is dead.
Change-Id: I75c43ce064664412e45c304c15f363015c0a4697
Jean-Michel Trivi [Tue, 8 May 2012 00:10:12 +0000 (17:10 -0700)]
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
Jean-Baptiste Queru [Mon, 7 May 2012 20:59:56 +0000 (13:59 -0700)]
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
Jean-Baptiste Queru [Mon, 7 May 2012 20:56:19 +0000 (13:56 -0700)]
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
Jean-Baptiste Queru [Mon, 7 May 2012 16:34:39 +0000 (09:34 -0700)]
Merge "Use the same compilation flags on OS X 10.8 as 10.7"
Al Sutton [Mon, 7 May 2012 08:33:34 +0000 (09:33 +0100)]
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>
Elliott Hughes [Fri, 4 May 2012 23:50:41 +0000 (16:50 -0700)]
am
8e67348b: Merge "Track libnativehelper move for PDK." into jb-dev
* commit '
8e67348b515636ec8314da44b3f583c5d053e81a':
Track libnativehelper move for PDK.
Elliott Hughes [Fri, 4 May 2012 23:48:37 +0000 (16:48 -0700)]
Merge "Track libnativehelper move for PDK." into jb-dev
Vikram Aggarwal [Fri, 4 May 2012 23:42:05 +0000 (16:42 -0700)]
am
aa6ffd75: Merge "Fix the build. Exchange -> Exchange2" into jb-dev
* commit '
aa6ffd7595966808a60341a449745d3d03d88768':
Fix the build. Exchange -> Exchange2
Vikram Aggarwal [Fri, 4 May 2012 23:39:14 +0000 (16:39 -0700)]
Merge "Fix the build. Exchange -> Exchange2" into jb-dev
Vikram Aggarwal [Fri, 4 May 2012 23:34:27 +0000 (16:34 -0700)]
Fix the build. Exchange -> Exchange2
Change-Id: I70b479b69ea60a60ee3725344aa410c6e4f9d6b7
Doug Zongker [Fri, 4 May 2012 23:34:02 +0000 (16:34 -0700)]
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
Elliott Hughes [Thu, 3 May 2012 23:37:40 +0000 (16:37 -0700)]
Track libnativehelper move for PDK.
Bug:
6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
Doug Zongker [Thu, 3 May 2012 23:15:29 +0000 (16:15 -0700)]
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
Jean-Baptiste Queru [Thu, 3 May 2012 00:05:04 +0000 (17:05 -0700)]
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
Jean-Baptiste Queru [Thu, 3 May 2012 00:03:12 +0000 (17:03 -0700)]
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
Jean-Baptiste Queru [Wed, 2 May 2012 22:22:34 +0000 (15:22 -0700)]
resolved conflicts for merge of
343597c3 to jb-dev-plus-aosp
Change-Id: I84648a8044e6238a57b4a08a261146bfa3c8c1c7
Jean-Baptiste Queru [Wed, 2 May 2012 21:18:28 +0000 (14:18 -0700)]
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
Jean-Baptiste Queru [Wed, 2 May 2012 21:18:27 +0000 (14:18 -0700)]
am
a4354dd8: am
2ba46ecd: Merge "Add Esperanto to the list of locales"
* commit '
a4354dd8ce98320a1e6ca895dc049b82c8e1fa46':
Add Esperanto to the list of locales
Jean-Baptiste Queru [Wed, 2 May 2012 20:26:49 +0000 (13:26 -0700)]
Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
Jean-Baptiste Queru [Wed, 2 May 2012 20:02:26 +0000 (13:02 -0700)]
am
c45cb0bf: Merge "Enable sound effect support in the SDK system image"
* commit '
c45cb0bf074b6fec4e9810cfa442cf1c89645dd7':
Enable sound effect support in the SDK system image
Jean-Baptiste Queru [Wed, 2 May 2012 19:20:15 +0000 (12:20 -0700)]
Merge "Enable sound effect support in the SDK system image"
Jun Tian [Wed, 2 May 2012 06:47:04 +0000 (14:47 +0800)]
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
Jean-Baptiste Queru [Wed, 2 May 2012 18:27:36 +0000 (11:27 -0700)]
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
Jean-Baptiste Queru [Wed, 2 May 2012 18:27:35 +0000 (11:27 -0700)]
am
2ba46ecd: Merge "Add Esperanto to the list of locales"
* commit '
2ba46ecdc4bca804ffedc38694910dc1322b42d1':
Add Esperanto to the list of locales
Jean-Baptiste Queru [Wed, 2 May 2012 16:40:13 +0000 (09:40 -0700)]
Merge "Force use of compatibility compilers on Apple's command line tools"
Jean-Baptiste Queru [Wed, 2 May 2012 14:39:15 +0000 (07:39 -0700)]
Merge "Add Esperanto to the list of locales"
Al Sutton [Thu, 23 Feb 2012 18:14:27 +0000 (18:14 +0000)]
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>
Jean-Baptiste Queru [Tue, 1 May 2012 15:48:04 +0000 (08:48 -0700)]
Restore AOSP-style version numbers - do not merge
Change-Id: I70e3568a78feed4ff69bcdbf4fe2bd13f5211b4c
Ying Wang [Mon, 30 Apr 2012 23:37:11 +0000 (16:37 -0700)]
am
000e89a5: Strengthen dependencies on LOCAL_REQUIRED_MODULES
* commit '
000e89a5b95a1d3071277ff279263204f49cbd78':
Strengthen dependencies on LOCAL_REQUIRED_MODULES
Ying Wang [Mon, 30 Apr 2012 22:48:27 +0000 (15:48 -0700)]
Strengthen dependencies on LOCAL_REQUIRED_MODULES
Bug:
6418863
This change expands the PRODUCT_PACKAGES with the required modules.
Before this change, since the required modules are not in the
PRODUCT_PACKAGES, they are not directly depended on by the image files.
If the dependent is not to be included in the image but the required
modules are to be included, the dependency of the image on the required
modules gets lost!
That would lead to build race condition.
Change-Id: I0b656db1538ca43d3785dbf17364ffa88b80ac41
Jean-Baptiste Queru [Sun, 29 Apr 2012 18:50:18 +0000 (11:50 -0700)]
Move stuff from prebuilt/ to prebuilts/misc
Change-Id: Ia13f5d09b24e3540042b6924ead6c96e94983ff4
Robert Greenwalt [Fri, 27 Apr 2012 18:55:06 +0000 (11:55 -0700)]
Merge "Add Development/scripts to path." into jb-dev
Robert Greenwalt [Fri, 27 Apr 2012 17:02:37 +0000 (10:02 -0700)]
Add Development/scripts to path.
Adding a script to there and people thought it would be nice if it were
available/in seach path.
bug:
4208971
Change-Id: I58475f5f0149cec2485dc5bc787b5fb3cc68ba0a
Colin Cross [Fri, 27 Apr 2012 00:04:54 +0000 (17:04 -0700)]
Use split-long-arguments to touch pdk platform.zip files
touch $(_pdk_fusion_files) is too long for some systems, use
split-long-arguments to execute touch multiple times with a
subset of the list of files.
Change-Id: I8e8c6770936337b93e0fdf381eca8c79fd722523
Ying Wang [Thu, 26 Apr 2012 19:26:33 +0000 (12:26 -0700)]
Option to keep the generated R class in static Java libarry
Bug:
6404748
Set LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY to true to do that.
Change-Id: Ieee3cae431e3b1484ec598312729f2c871db2315
Nick Kralevich [Thu, 26 Apr 2012 18:38:51 +0000 (11:38 -0700)]
Merge "ARM: compile everything with relro / bind_now." into jb-dev
Nick Kralevich [Thu, 26 Apr 2012 16:09:24 +0000 (09:09 -0700)]
ARM: compile everything with relro / bind_now.
Enable relro / bind_now when compiling Android applications.
This marks certain regions of memory as read-only after linking,
making memory corruption security vulnerabilities are harder
to exploit.
See:
* http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
* http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html
Stop using the custom linker script, which inhibits
relro / bind_now support.
Change-Id: Ie97ccdd2845886bbc2ba2fdd47eed0ff4b29b60b
James Dong [Thu, 26 Apr 2012 01:09:34 +0000 (18:09 -0700)]
Build libstagefright_soft_mpeg4enc.so by default
o related-to-bug:
6401068
Change-Id: I3114d4b817acc85a6982d03ef3b161141413a079
James Dong [Wed, 25 Apr 2012 01:02:49 +0000 (18:02 -0700)]
Merge "Build libstagefright_soft_h264enc by default"
Ying Wang [Wed, 25 Apr 2012 00:12:43 +0000 (17:12 -0700)]
Fix pdk build.
The pdk builds don't have access to development.
Change-Id: Ie7e9f8d24b788749481465311e64145e175b8c4f
Raphael Moll [Tue, 24 Apr 2012 22:43:28 +0000 (15:43 -0700)]
resolved conflicts for merge of
4a6e8b95 to master
Change-Id: I04abdad12266d7f0eb248528d9bbd35369d18413
The Android Open Source Project [Tue, 24 Apr 2012 22:19:29 +0000 (15:19 -0700)]
am
30a6d7e3: am
76f57fe3: Reconcile with ics-mr1-release
* commit '
30a6d7e3e5904c2e0a833a2adef83db6cd54e9ba':
IMM76K
IMM76J
IMM76I
IMM76H
IMM76G
IMM76F
IMM76E
Jean-Baptiste Queru [Tue, 24 Apr 2012 21:54:15 +0000 (14:54 -0700)]
am
80879a6e: (-s ours) am
695a2b3f: am
9b16b129: Merge "Switch to new locations of toolchains"
* commit '
80879a6ea4be133c222911055d83e3e43dc15be5':
Switch to new locations of toolchains
Jean-Baptiste Queru [Tue, 24 Apr 2012 21:47:45 +0000 (14:47 -0700)]
Merge
8664008c to master
Change-Id: Ia6aa11892665b8aa42e5fbc69146db251d9a8636
Jean-Baptiste Queru [Tue, 24 Apr 2012 21:31:31 +0000 (14:31 -0700)]
am
77df1f2a: am
9987dbbb: am
d0427e49: Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
* commit '
77df1f2aeceaeabfc058a1938b672fe02a4fed93':
Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
Jean-Baptiste Queru [Tue, 24 Apr 2012 21:31:25 +0000 (14:31 -0700)]
am
7ed999aa: (-s ours) am
c4aa4ff3: am
810b0d8b: Merge "Fix build problems with gcc-4.6.x."
* commit '
7ed999aaf00a71d99975a4a068ba2562c0aabc88':
Fix build problems with gcc-4.6.x.
Scott Main [Tue, 24 Apr 2012 21:27:31 +0000 (14:27 -0700)]
am
4054a158: am
7a086316: am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
4054a1587a878d2c5f9dc64433bf7ae8ebbe6bd3':
Scott Main [Tue, 24 Apr 2012 21:27:30 +0000 (14:27 -0700)]
am
217a4d89: am
9041aa50: am
6b719da3: docs: update sidenav-width-adjust script so Training classes save the width for the Resources section
* commit '
217a4d896b9bd5bd91cccc8077f7ebd353538f7b':
James Dong [Tue, 24 Apr 2012 01:02:34 +0000 (18:02 -0700)]
Build libstagefright_soft_h264enc by default
related-to-bug:
6383440
Change-Id: I852941c72f9b7270ac6e5b094e4b2a0322643ac8
Scott Main [Tue, 24 Apr 2012 20:58:00 +0000 (13:58 -0700)]
am
f689b77c: am
b3d8eecd: am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
f689b77c0519f1c73006d55d8ca3ed35bfb64ad1':
Scott Main [Tue, 24 Apr 2012 20:57:59 +0000 (13:57 -0700)]
am
7291a4f7: am
27e53840: am
76b0139a: docs: update doc template to make the Resources side nav wider (+40px)
* commit '
7291a4f78408651d78a8ff05eda22ce3805603dd':
Ying Wang [Tue, 24 Apr 2012 20:29:05 +0000 (13:29 -0700)]
Merge "Make export_includes depend on the module's definition makefile."
Colin Cross [Tue, 24 Apr 2012 19:45:47 +0000 (12:45 -0700)]
Merge "Set timestamps of files from platform.zip to current time"
Colin Cross [Tue, 24 Apr 2012 01:49:04 +0000 (18:49 -0700)]
Set timestamps of files from platform.zip to current time
Touch files unzipped from platform.zip to update their timestamp.
Prevents make dependency confusion from files with old times.
Also add a dependency for the implicit copy rule on the
pdk_fusion.stamp file to force make to use the updated
files.
Change-Id: Ia54454518d229ce3670023819836f586fef65d3f
Jean-Baptiste Queru [Tue, 24 Apr 2012 17:37:30 +0000 (10:37 -0700)]
Merge "On linux, always use the prebuilt host toolchain"
Ying Wang [Tue, 24 Apr 2012 04:29:18 +0000 (21:29 -0700)]
Make export_includes depend on the module's definition makefile.
Bug:
6383397
Note that LOCAL_MODULE_MAKEFILE is calculated in the macro my-dir,
which must be called at the beginning of your Android.mk to calculate
LOCAL_PATH.
Change-Id: I7aa079e37253fbda25ffb85c2e5bbf0663340e27
Jean-Baptiste Queru [Tue, 24 Apr 2012 01:27:18 +0000 (18:27 -0700)]
Whitelist audience
Change-Id: I3a39f4bdc5c52e01b7d5d187e35b6fbf770756e2
Raphael Moll [Mon, 23 Apr 2012 22:47:39 +0000 (15:47 -0700)]
am
c094c0a6: am
d0831659: Merge "Split target/product/sdk.mk into sdk.git"
* commit '
c094c0a68fe311ea671b4c95756d300bc6a540f4':
Split target/product/sdk.mk into sdk.git
Raphael Moll [Mon, 23 Apr 2012 22:43:35 +0000 (15:43 -0700)]
am
d0831659: Merge "Split target/product/sdk.mk into sdk.git"
* commit '
d0831659af544b93f3a9592a1cd4f85ff89e8635':
Split target/product/sdk.mk into sdk.git
The Android Open Source Project [Mon, 23 Apr 2012 21:42:27 +0000 (14:42 -0700)]
am
76f57fe3: Reconcile with ics-mr1-release
* commit '
76f57fe3737a5f88c536f3fe936f2343bbe3b1f3':
IMM76K
IMM76J
IMM76I
IMM76H
IMM76G
IMM76F
IMM76E
The Android Open Source Project [Mon, 23 Apr 2012 21:40:15 +0000 (14:40 -0700)]
Reconcile with ics-mr1-release
Change-Id: I7c50185d28ff8b3818d66b2e232e5e5507fa7902
Raphael Moll [Mon, 23 Apr 2012 19:44:00 +0000 (12:44 -0700)]
Merge "Split target/product/sdk.mk into sdk.git"