OSDN Git Service
The Android Automerger [Tue, 15 May 2012 22:51:10 +0000 (15:51 -0700)]
JRN45B
The Android Automerger [Tue, 15 May 2012 14:11:21 +0000 (07:11 -0700)]
JRN45
The Android Automerger [Tue, 15 May 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 15 May 2012 00:49:29 +0000 (17:49 -0700)]
JRN44C
The Android Automerger [Mon, 14 May 2012 22:57:17 +0000 (15:57 -0700)]
JRN44B
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
The Android Automerger [Mon, 14 May 2012 14:09:46 +0000 (07:09 -0700)]
JRN44
The Android Automerger [Mon, 14 May 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 12 May 2012 21:36:59 +0000 (14:36 -0700)]
JRN40I
The Android Automerger [Sat, 12 May 2012 04:30:39 +0000 (21:30 -0700)]
JRN40H take three
The Android Automerger [Sat, 12 May 2012 01:03:22 +0000 (18:03 -0700)]
JRN40H take two
Victoria Lease [Fri, 11 May 2012 23:51:47 +0000 (16:51 -0700)]
Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
The Android Automerger [Fri, 11 May 2012 23:29:04 +0000 (16:29 -0700)]
JRN40H
The Android Automerger [Fri, 11 May 2012 23:04:09 +0000 (16:04 -0700)]
JRN40G
The Android Automerger [Fri, 11 May 2012 19:30:28 +0000 (12:30 -0700)]
JRN40F
The Android Automerger [Fri, 11 May 2012 18:41:47 +0000 (11:41 -0700)]
JRN41
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
The Android Automerger [Fri, 11 May 2012 01:09:44 +0000 (18:09 -0700)]
JRN40E
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: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
The Android Automerger [Thu, 10 May 2012 22:00:59 +0000 (15:00 -0700)]
JRN40D
The Android Automerger [Thu, 10 May 2012 19:27:23 +0000 (12:27 -0700)]
JRN40C
Jean-Michel Trivi [Thu, 10 May 2012 16:54:41 +0000 (09:54 -0700)]
Merge "Add OMX IL FLAC encoder library" into jb-dev
The Android Automerger [Thu, 10 May 2012 15:36:38 +0000 (08:36 -0700)]
JRN40B
The Android Automerger [Thu, 10 May 2012 15:23:04 +0000 (08:23 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 10 May 2012 14:09:55 +0000 (07:09 -0700)]
JRN40
The Android Automerger [Thu, 10 May 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 9 May 2012 23:06:13 +0000 (16:06 -0700)]
JRN39D
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
The Android Automerger [Wed, 9 May 2012 22:59:12 +0000 (15:59 -0700)]
JRN39C
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
The Android Automerger [Wed, 9 May 2012 19:51:17 +0000 (12:51 -0700)]
JRN39B
The Android Automerger [Wed, 9 May 2012 14:49:20 +0000 (07:49 -0700)]
JRN39
The Android Automerger [Wed, 9 May 2012 14:46:07 +0000 (07:46 -0700)]
merge in jb-release history after reset to jb-dev
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
The Android Automerger [Tue, 8 May 2012 22:54:41 +0000 (15:54 -0700)]
JRN38B
Victoria Lease [Tue, 8 May 2012 16:28:34 +0000 (09:28 -0700)]
Parse external/cibu-fonts/fonts.mk.
Bug:
6232193
Change-Id: I5a4b1077440ce9ab5bc504d5b2fca1a9648cc084
The Android Automerger [Tue, 8 May 2012 15:34:20 +0000 (08:34 -0700)]
JRN38
The Android Automerger [Tue, 8 May 2012 15:12:17 +0000 (08:12 -0700)]
merge in jb-release history after reset to jb-dev
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
The Android Automerger [Mon, 7 May 2012 23:32:42 +0000 (16:32 -0700)]
JRN37B
The Android Automerger [Mon, 7 May 2012 14:08:00 +0000 (07:08 -0700)]
JRN37
The Android Automerger [Mon, 7 May 2012 13:59:21 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Mon, 7 May 2012 05:55:14 +0000 (22:55 -0700)]
JRN36B
The Android Automerger [Sun, 6 May 2012 21:23:05 +0000 (14:23 -0700)]
JRN36
The Android Automerger [Sun, 6 May 2012 21:21:17 +0000 (14:21 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 5 May 2012 04:45:33 +0000 (21:45 -0700)]
JRN34B
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: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
The Android Automerger [Fri, 4 May 2012 23:21:45 +0000 (16:21 -0700)]
JRN34
The Android Automerger [Fri, 4 May 2012 23:09:04 +0000 (16:09 -0700)]
merge in jb-release history after reset to jb-dev
Elliott Hughes [Thu, 3 May 2012 23:37:40 +0000 (16:37 -0700)]
Track libnativehelper move for PDK.
Bug:
6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
The Android Automerger [Fri, 4 May 2012 19:39:53 +0000 (12:39 -0700)]
JRN33F
The Android Automerger [Fri, 4 May 2012 00:01:38 +0000 (17:01 -0700)]
JRN33E
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
The Android Automerger [Thu, 3 May 2012 21:59:25 +0000 (14:59 -0700)]
JRN33D
The Android Automerger [Thu, 3 May 2012 21:11:22 +0000 (14:11 -0700)]
JRN33C
The Android Automerger [Thu, 3 May 2012 17:59:16 +0000 (10:59 -0700)]
JRN33B
The Android Automerger [Thu, 3 May 2012 14:32:52 +0000 (07:32 -0700)]
JRN33
The Android Automerger [Thu, 3 May 2012 13:59:51 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 3 May 2012 01:06:48 +0000 (18:06 -0700)]
JRN32D
The Android Automerger [Wed, 2 May 2012 22:05:54 +0000 (15:05 -0700)]
JRN32C
The Android Automerger [Wed, 2 May 2012 17:48:05 +0000 (10:48 -0700)]
JRN32B
The Android Automerger [Wed, 2 May 2012 14:23:42 +0000 (07:23 -0700)]
JRN32
The Android Automerger [Wed, 2 May 2012 14:00:02 +0000 (07:00 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 2 May 2012 00:16:37 +0000 (17:16 -0700)]
JRN31B
The Android Automerger [Tue, 1 May 2012 14:11:03 +0000 (07:11 -0700)]
JRN31
The Android Automerger [Tue, 1 May 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 1 May 2012 00:53:33 +0000 (17:53 -0700)]
JRN30C
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
The Android Automerger [Mon, 30 Apr 2012 21:59:53 +0000 (14:59 -0700)]
JRN30B
The Android Automerger [Mon, 30 Apr 2012 14:10:11 +0000 (07:10 -0700)]
JRN30
The Android Automerger [Mon, 30 Apr 2012 13:59:31 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 27 Apr 2012 22:47:29 +0000 (15:47 -0700)]
26D take two
The Android Automerger [Fri, 27 Apr 2012 21:28:29 +0000 (14:28 -0700)]
JRN26D
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
The Android Automerger [Fri, 27 Apr 2012 01:49:08 +0000 (18:49 -0700)]
JRN26C
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
The Android Automerger [Thu, 26 Apr 2012 20:34:21 +0000 (13:34 -0700)]
JRN26B
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
The Android Automerger [Thu, 26 Apr 2012 14:11:03 +0000 (07:11 -0700)]
JRN26
The Android Automerger [Thu, 26 Apr 2012 13:59:27 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
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
The Android Automerger [Wed, 25 Apr 2012 21:31:57 +0000 (14:31 -0700)]
JRN25B
The Android Automerger [Wed, 25 Apr 2012 14:51:17 +0000 (07:51 -0700)]
JRN25
The Android Automerger [Wed, 25 Apr 2012 14:47:07 +0000 (07:47 -0700)]
merge in jb-release history after reset to jb-dev
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