OSDN Git Service
The Android Automerger [Fri, 25 May 2012 18:14:20 +0000 (11:14 -0700)]
JRN54C
The Android Automerger [Fri, 25 May 2012 05:41:54 +0000 (22:41 -0700)]
JRN54B
The Android Automerger [Thu, 24 May 2012 14:05:47 +0000 (07:05 -0700)]
JRN54
The Android Automerger [Thu, 24 May 2012 13:57:40 +0000 (06:57 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 24 May 2012 13:53:04 +0000 (06:53 -0700)]
JRN53E
The Android Automerger [Thu, 24 May 2012 06:18:26 +0000 (23:18 -0700)]
JRN53D
The Android Automerger [Thu, 24 May 2012 04:37:08 +0000 (21:37 -0700)]
JRN53C
The Android Automerger [Thu, 24 May 2012 00:37:06 +0000 (17:37 -0700)]
JRN53B
The Android Automerger [Wed, 23 May 2012 14:10:16 +0000 (07:10 -0700)]
JRN53
The Android Automerger [Wed, 23 May 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Ying Wang [Wed, 23 May 2012 01:29:02 +0000 (18:29 -0700)]
Set PWD to the absolute path of the top tree.
Previously PWD is passed in as a shell environmental variable,
which does not point to top of the source tree if you run mm/mmm.
That in turn breaks mm/mmm if OUT_DIR_COMMON_BASE is set to an absolute
path.
Change-Id: Iac99d5668aee1bbd3cb9897750afc2149bd9f973
The Android Automerger [Tue, 22 May 2012 19:31:22 +0000 (12:31 -0700)]
JRN52B
The Android Automerger [Tue, 22 May 2012 14:11:08 +0000 (07:11 -0700)]
JRN52
The Android Automerger [Tue, 22 May 2012 13:59:23 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Tue, 22 May 2012 05:02:14 +0000 (22:02 -0700)]
JRN51C
The Android Automerger [Mon, 21 May 2012 19:52:03 +0000 (12:52 -0700)]
JRN51B
The Android Automerger [Mon, 21 May 2012 14:10:56 +0000 (07:10 -0700)]
JRN51
The Android Automerger [Mon, 21 May 2012 13:59:35 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sun, 20 May 2012 14:40:09 +0000 (07:40 -0700)]
JRN50
The Android Automerger [Sun, 20 May 2012 14:39:35 +0000 (07:39 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 19 May 2012 18:45:04 +0000 (11:45 -0700)]
JRN47E
The Android Automerger [Sat, 19 May 2012 18:42:50 +0000 (11:42 -0700)]
JRN49
The Android Automerger [Sat, 19 May 2012 17:53:39 +0000 (10:53 -0700)]
JRN47E
The Android Automerger [Fri, 18 May 2012 22:21:39 +0000 (15:21 -0700)]
JRN47D
The Android Automerger [Fri, 18 May 2012 21:55:08 +0000 (14:55 -0700)]
JRN48
The Android Automerger [Thu, 17 May 2012 22:51:47 +0000 (15:51 -0700)]
JRN47C
The Android Automerger [Thu, 17 May 2012 22:05:00 +0000 (15:05 -0700)]
JRN47B
The Android Automerger [Thu, 17 May 2012 16:27:59 +0000 (09:27 -0700)]
JRN47
The Android Automerger [Thu, 17 May 2012 16:25:37 +0000 (09:25 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 17 May 2012 16:25:00 +0000 (09:25 -0700)]
force version reset
The Android Automerger [Thu, 17 May 2012 14:11:04 +0000 (07:11 -0700)]
JRN47
The Android Automerger [Thu, 17 May 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 16 May 2012 23:50:44 +0000 (16:50 -0700)]
JRN46D
The Android Automerger [Wed, 16 May 2012 22:52:26 +0000 (15:52 -0700)]
JRN46C
The Android Automerger [Wed, 16 May 2012 19:47:02 +0000 (12:47 -0700)]
JRN46B
The Android Automerger [Wed, 16 May 2012 14:10:44 +0000 (07:10 -0700)]
JRN46
The Android Automerger [Wed, 16 May 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
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:
6502980
Change-Id: I02a735ff4897ed386fe9c5d886260b1363a1e019
The Android Automerger [Tue, 15 May 2012 22:51:10 +0000 (15:51 -0700)]
JRN45B
Ying Wang [Tue, 15 May 2012 22:16:33 +0000 (15:16 -0700)]
Merge "Don't set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev
James Dong [Tue, 15 May 2012 21:47:37 +0000 (14:47 -0700)]
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
Fixed the broken build first.
This reverts commit
e85f05be147bf7d916d1b1622f6f3038dac8913b.
Ying Wang [Tue, 15 May 2012 21:31:26 +0000 (14:31 -0700)]
Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
Change-Id: I98ab2f6c0d49a87aaeeba29fdf676277e4e65592
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
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
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
OSDN Git Service
