OSDN Git Service
Scott Main [Tue, 18 Sep 2012 22:40:02 +0000 (15:40 -0700)]
am
7039b4a7: create consistent spacing between lists and the paragraphs within them
* commit '
7039b4a7bca269a898aacad9ddde693598ccecfc':
create consistent spacing between lists and the paragraphs within them
Scott Main [Tue, 18 Sep 2012 18:27:59 +0000 (11:27 -0700)]
create consistent spacing between lists and the paragraphs within them
Change-Id: I792cca40a4cca6f811d1528219e51b3895d4d626
The Android Open Source Project [Sat, 15 Sep 2012 15:21:27 +0000 (08:21 -0700)]
Reconcile with jb-nakasig-release - do not merge
Change-Id: I48d8019902c8848541677a7ddc1aa63edf74b23c
The Android Automerger [Sat, 15 Sep 2012 15:09:11 +0000 (08:09 -0700)]
JGO77
The Android Automerger [Sat, 15 Sep 2012 15:09:03 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Fri, 14 Sep 2012 15:09:16 +0000 (08:09 -0700)]
JGO76
The Android Automerger [Fri, 14 Sep 2012 15:09:01 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
Jean-Baptiste Queru [Fri, 14 Sep 2012 14:45:44 +0000 (07:45 -0700)]
am
a0689075: Update version number for AOSP master
* commit '
a06890757028f7f8ae77a2c7616885a800aee15f':
Update version number for AOSP master
Jean-Baptiste Queru [Fri, 14 Sep 2012 14:43:41 +0000 (07:43 -0700)]
Update version number for AOSP master
Change-Id: I5bc11420932d62a2f6bc12410fe7c8ac2dca069b
The Android Open Source Project [Thu, 13 Sep 2012 18:25:29 +0000 (11:25 -0700)]
Reconcile with jb-nakasig-release - do not merge
Change-Id: Ic4af6ed24af4503222b6b31e87a2e45fc07cb47e
The Android Automerger [Thu, 13 Sep 2012 15:09:21 +0000 (08:09 -0700)]
JGO75
The Android Automerger [Thu, 13 Sep 2012 15:09:05 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
Andrew Hsieh [Wed, 12 Sep 2012 21:21:07 +0000 (14:21 -0700)]
am
0f47a94d: am
7e300d60: Merge "Enable stack-protector for x86"
* commit '
0f47a94d2eb50f30b7f559c7c7fc2a8632412cc8':
Enable stack-protector for x86
Andrew Hsieh [Wed, 12 Sep 2012 21:20:11 +0000 (14:20 -0700)]
am
7e300d60: Merge "Enable stack-protector for x86"
* commit '
7e300d60bfc325e3cbf3e7656297c14109e513b8':
Enable stack-protector for x86
Andrew Hsieh [Wed, 12 Sep 2012 20:44:00 +0000 (13:44 -0700)]
Merge "Enable stack-protector for x86"
Scott Main [Wed, 12 Sep 2012 17:34:15 +0000 (10:34 -0700)]
am
5b5ff1a6: more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
* commit '
5b5ff1a6aeb0d12ecdf817d6ec3e585fd2c892e3':
more specific selector for new blockquote style to fix regressions on other pages that use <blockquote>
Scott Main [Wed, 12 Sep 2012 17:29:45 +0000 (10:29 -0700)]
more specific selector for new blockquote style to fix regressions
on other pages that use <blockquote>
Change-Id: Icf37f515cfe2204afb58a796222c166088d0f131
The Android Automerger [Wed, 12 Sep 2012 15:09:20 +0000 (08:09 -0700)]
JGO74
The Android Automerger [Wed, 12 Sep 2012 15:09:04 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Open Source Project [Wed, 12 Sep 2012 14:49:09 +0000 (07:49 -0700)]
Reconcile with jb-nakasig-release jb-mr0-release - do not merge
Change-Id: Ieff44ac588f6e8b8dd4ec52f28b94d38fbf985ca
The Android Automerger [Wed, 12 Sep 2012 05:18:30 +0000 (22:18 -0700)]
JZO54G
Scott Main [Tue, 11 Sep 2012 21:42:43 +0000 (14:42 -0700)]
am
ee7cb463: Merge "add \'small\' style for long headings in Training courses" into jb-dev
* commit '
ee7cb4637dd257e0f9610ed87d14ab10d07bd106':
add 'small' style for long headings in Training courses
Scott Main [Tue, 11 Sep 2012 21:41:28 +0000 (14:41 -0700)]
Merge "add 'small' style for long headings in Training courses" into jb-dev
Scott Main [Tue, 11 Sep 2012 21:27:34 +0000 (14:27 -0700)]
add 'small' style for long headings in Training courses
Change-Id: I385df22d12ad419ad6883c0e94d3053e7e520a09
Ying Wang [Tue, 11 Sep 2012 19:14:34 +0000 (12:14 -0700)]
am
6a6723a0: am
4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
* commit '
6a6723a0a9c2b3c1756ce8cdf1910ade264c26ef':
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Ying Wang [Tue, 11 Sep 2012 19:12:23 +0000 (12:12 -0700)]
am
4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
* commit '
4458452ef64f271906914e79ffd9923630ae22f2':
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Ying Wang [Tue, 11 Sep 2012 18:49:11 +0000 (11:49 -0700)]
Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."
Ying Wang [Tue, 21 Aug 2012 18:54:49 +0000 (11:54 -0700)]
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Bug:
7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
The Android Automerger [Tue, 11 Sep 2012 16:54:42 +0000 (09:54 -0700)]
JGO73
The Android Automerger [Tue, 11 Sep 2012 16:54:29 +0000 (09:54 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Mon, 10 Sep 2012 22:11:04 +0000 (15:11 -0700)]
JZO54F
Ying Wang [Mon, 10 Sep 2012 17:23:29 +0000 (10:23 -0700)]
am
410420ed: am
9efa5bae: Merge "Add transform-d-to-p-args"
* commit '
410420ed667f869e15df0d3204834282984d4f6a':
Add transform-d-to-p-args
Ying Wang [Mon, 10 Sep 2012 17:21:57 +0000 (10:21 -0700)]
am
9efa5bae: Merge "Add transform-d-to-p-args"
* commit '
9efa5bae8645988a0d24af14142df9572bf7bd57':
Add transform-d-to-p-args
Ying Wang [Mon, 10 Sep 2012 16:48:26 +0000 (09:48 -0700)]
Merge "Add transform-d-to-p-args"
The Android Automerger [Mon, 10 Sep 2012 15:09:13 +0000 (08:09 -0700)]
JGO72
The Android Automerger [Mon, 10 Sep 2012 15:09:11 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Sun, 9 Sep 2012 15:09:10 +0000 (08:09 -0700)]
JGO71
The Android Automerger [Sun, 9 Sep 2012 15:09:06 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Sat, 8 Sep 2012 15:09:14 +0000 (08:09 -0700)]
JGO70
The Android Automerger [Sat, 8 Sep 2012 15:09:05 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
Ying Wang [Sat, 8 Sep 2012 00:04:06 +0000 (17:04 -0700)]
Add transform-d-to-p-args
This new indirection allows us too to output .P files when we are
generating non-.o files, such as .s or .S files.
Bug:
7127743
Change-Id: I9e46c417031764fefc9909ba4a3eb63885f34f9e
Scott Main [Fri, 7 Sep 2012 23:17:11 +0000 (16:17 -0700)]
am
65511c0a: fix script bug. we were running some scripts that are only used in the reference
* commit '
65511c0a726751e9973486198086d8db6a141455':
fix script bug. we were running some scripts that are only used in the reference
Scott Main [Fri, 7 Sep 2012 22:51:32 +0000 (15:51 -0700)]
fix script bug. we were running some scripts that are only used in the reference
Change-Id: I0693a7a7af5e41283942b387e53a254903b83427
The Android Open Source Project [Fri, 7 Sep 2012 22:20:57 +0000 (15:20 -0700)]
Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge
Change-Id: Ibb66fb1e9c4c3066c8a27139922300a511ff9e7b
The Android Automerger [Fri, 7 Sep 2012 17:29:09 +0000 (10:29 -0700)]
JRO03W
The Android Automerger [Fri, 7 Sep 2012 17:28:17 +0000 (10:28 -0700)]
JRO69
The Android Automerger [Fri, 7 Sep 2012 17:28:12 +0000 (10:28 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Fri, 7 Sep 2012 15:09:06 +0000 (08:09 -0700)]
JGO69
The Android Automerger [Fri, 7 Sep 2012 15:09:00 +0000 (08:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Thu, 6 Sep 2012 22:09:18 +0000 (15:09 -0700)]
JGO68
The Android Automerger [Thu, 6 Sep 2012 22:09:17 +0000 (15:09 -0700)]
merge in jb-nakasig-release history after reset to jb-dev
The Android Automerger [Thu, 6 Sep 2012 22:08:50 +0000 (15:08 -0700)]
JGO67
The Android Automerger [Thu, 6 Sep 2012 20:30:11 +0000 (13:30 -0700)]
JZO54E
Ying Wang [Thu, 6 Sep 2012 17:43:07 +0000 (10:43 -0700)]
am
1c27ac0e: am
1b70bb21: Merge "Clean step for libc."
* commit '
1c27ac0ea9d2e43d8ff05c61aa4fe6f3d9558334':
Clean step for libc.
Ying Wang [Thu, 6 Sep 2012 17:40:43 +0000 (10:40 -0700)]
am
1b70bb21: Merge "Clean step for libc."
* commit '
1b70bb2162d74a304bd0d00674a0fed80f936961':
Clean step for libc.
Ying Wang [Thu, 6 Sep 2012 17:36:30 +0000 (10:36 -0700)]
Merge "Clean step for libc."
Ying Wang [Wed, 5 Sep 2012 22:58:29 +0000 (15:58 -0700)]
Clean step for libc.
(cherry-pick of
ab1e93d4d4f4a46fa922df5ba7ccd41dde1221ac.)
Change-Id: I304312d6eb0346c050d02bd834565e0d43d8b4dd
The Android Open Source Project [Thu, 6 Sep 2012 15:08:09 +0000 (08:08 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: I788e28f1f2a2d2a41c5c49097da31417b476cfcb
Ying Wang [Thu, 6 Sep 2012 01:37:46 +0000 (18:37 -0700)]
am
0ee362ea: am
478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
* commit '
0ee362ea0485f6885c81fa1a6cb9868ae304f3e3':
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
Ying Wang [Thu, 6 Sep 2012 01:35:50 +0000 (18:35 -0700)]
am
478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
* commit '
478d0fc6a311b236fddc9d18c9a1b922f8ecf1ea':
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
Ying Wang [Thu, 6 Sep 2012 01:15:11 +0000 (18:15 -0700)]
Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
Ying Wang [Thu, 6 Sep 2012 01:08:29 +0000 (18:08 -0700)]
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
Before setting up the rules.
Change-Id: Ifedbc0e988895a899cae315dc730a152bae91ae2
Conley Owens [Tue, 4 Sep 2012 17:31:46 +0000 (10:31 -0700)]
am
86ffa1cd: am
5da7ec4f: Merge "Follow symlinks in findleaves"
* commit '
86ffa1cd63ede2c8b923d124aca9adab5aaca260':
Follow symlinks in findleaves
Conley Owens [Tue, 4 Sep 2012 17:29:43 +0000 (10:29 -0700)]
am
5da7ec4f: Merge "Follow symlinks in findleaves"
* commit '
5da7ec4fbdc8c2ac30f7dafb33327e9bfa337d5b':
Follow symlinks in findleaves
Conley Owens [Tue, 4 Sep 2012 17:24:54 +0000 (10:24 -0700)]
Merge "Follow symlinks in findleaves"
The Android Automerger [Fri, 31 Aug 2012 20:54:56 +0000 (13:54 -0700)]
JZO54D
The Android Automerger [Thu, 30 Aug 2012 23:00:32 +0000 (16:00 -0700)]
JZO54C
Kenny Root [Thu, 9 Aug 2012 19:20:16 +0000 (12:20 -0700)]
Add make_ext4fs to all builds
make_ext4fs is needed for all builds because ASEC containers use it now.
Any product not having this will not be able to create an ASEC
container.
(cherry-pick of
720479ea7e6307648c56f61d82ac12d65f218dda)
Bug:
6960586
Change-Id: I6864ce339a3593c5043e6a55b5af118b3169cc01
Kenny Root [Thu, 30 Aug 2012 19:11:40 +0000 (12:11 -0700)]
am
d6a46969: Add make_ext4fs to all builds
* commit '
d6a469693fe77884bc902d6ec8be6f04d7d8e21a':
Add make_ext4fs to all builds
The Android Automerger [Thu, 30 Aug 2012 19:07:12 +0000 (12:07 -0700)]
JZO54B
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:40:13 +0000 (11:40 -0700)]
am
bb369a58: Merge "Add make_ext4fs to support installing apps to SD card"
* commit '
bb369a582b9756347959f6ef389507455f805df1':
Add make_ext4fs to support installing apps to SD card
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:01:29 +0000 (11:01 -0700)]
Merge "Add make_ext4fs to support installing apps to SD card"
Jun Tian [Thu, 30 Aug 2012 02:59:17 +0000 (10:59 +0800)]
Add make_ext4fs to support installing apps to SD card
The default createSecureContainer format is changed from fat32 to ext4 in PackageHelper::CreateSdDir in:
/frameworks/base/core/java/com/android/internal/content/PackageHelper.java
We need to add make_ext4fs into the system image to support installing apps to SD card.
In kernel, we also need to add ext4 filesystem support.
Change-Id: If4817a95663144a6bfaeeed0c7cb081063a0daad
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Signed-off-by: Liang Chen <liang.l.chen@intel.com>
Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
Kenny Root [Thu, 9 Aug 2012 19:20:16 +0000 (12:20 -0700)]
Add make_ext4fs to all builds
make_ext4fs is needed for all builds because ASEC containers use it now.
Any product not having this will not be able to create an ASEC
container.
(cherry-pick of
720479ea7e6307648c56f61d82ac12d65f218dda)
Bug:
6960586
Change-Id: I6864ce339a3593c5043e6a55b5af118b3169cc01
The Android Automerger [Wed, 29 Aug 2012 21:30:05 +0000 (14:30 -0700)]
JRO03V
The Android Automerger [Wed, 29 Aug 2012 21:29:50 +0000 (14:29 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 29 Aug 2012 19:43:26 +0000 (12:43 -0700)]
JRO03V
The Android Automerger [Wed, 29 Aug 2012 19:43:01 +0000 (12:43 -0700)]
merge in jb-release history after reset to jb-dev
Andrew Hsieh [Wed, 29 Aug 2012 07:13:23 +0000 (15:13 +0800)]
Enable stack-protector for x86
Change-Id: I7a169075ca49ab831c37625d416c1d4b026bfec3
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:16:59 +0000 (13:16 -0700)]
am
9eb87b8d: Merge "Add pattern to check for GCC 4.6"
* commit '
9eb87b8d2011e65462ea42de6899158cd35a492a':
Add pattern to check for GCC 4.6
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:16:58 +0000 (13:16 -0700)]
am
1d0f5f91: Merge "Include all standard shared library paths in /system/lib"
* commit '
1d0f5f914ae1406b976f69c265f0042c0279974e':
Include all standard shared library paths in /system/lib
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:16:57 +0000 (13:16 -0700)]
am
9e2b4718: Merge "Use gold linker on x86"
* commit '
9e2b4718a0e11a723904ba205a5156bae450be30':
Use gold linker on x86
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:47:34 +0000 (12:47 -0700)]
Merge "Add pattern to check for GCC 4.6"
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:46:43 +0000 (12:46 -0700)]
Merge "Include all standard shared library paths in /system/lib"
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:27:20 +0000 (12:27 -0700)]
Merge "Use gold linker on x86"
Pavel Chupin [Tue, 28 Aug 2012 08:20:55 +0000 (12:20 +0400)]
Use gold linker on x86
Patch removes fallback -fuse-ld=bfd for x86 target and
--copy-dt-needed-entries which is not supported by gold linker.
Change-Id: Ie5603f98e3f2f9d4f81678c718e39b130a75d057
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Andrew Hsieh [Tue, 28 Aug 2012 02:49:05 +0000 (10:49 +0800)]
Add pattern to check for GCC 4.6
GCC 4.6 --version can return 4.6.x-google but also simply 4.6
as of https://android-review.googlesource.com/#/c/42028.
Add more pattern to detect it.
Change-Id: Ibf34fba9afdf01bd3eafc011cc4d059b59f25d3d
The Android Open Source Project [Mon, 27 Aug 2012 21:10:49 +0000 (14:10 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: Ibe50742a45ef532acf13f4edb8166b6e6c1ef30c
Chris Dearman [Thu, 2 Feb 2012 22:16:52 +0000 (14:16 -0800)]
Include all standard shared library paths in /system/lib
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Ib33ce42532cc8cedc6f48036a257a2a225c82a69
The Android Automerger [Mon, 27 Aug 2012 19:52:54 +0000 (12:52 -0700)]
JRO03U
Conley Owens [Fri, 24 Aug 2012 23:24:45 +0000 (16:24 -0700)]
Follow symlinks in findleaves
If we replace the project directories with symlinks to the actual
directories, everything should build fine. Unfortunately, without
this fix, it does not.
Change-Id: Id19fef9696d0f599a7b3a14b6a8fc10ae857f9c7
The Android Automerger [Fri, 24 Aug 2012 20:23:58 +0000 (13:23 -0700)]
JRO03T
Jean-Baptiste Queru [Fri, 24 Aug 2012 20:04:48 +0000 (13:04 -0700)]
am
713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
* commit '
713bac96d628d6ca040fb1fe5d7a8abdcb932553':
ARM: put crtbegin_so.o at the beginning where it belongs
Jean-Baptiste Queru [Fri, 24 Aug 2012 20:00:10 +0000 (13:00 -0700)]
Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
The Android Automerger [Fri, 24 Aug 2012 04:31:01 +0000 (21:31 -0700)]
JZO54
The Android Automerger [Fri, 24 Aug 2012 04:30:08 +0000 (21:30 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Jean-Baptiste Queru [Thu, 23 Aug 2012 22:09:15 +0000 (15:09 -0700)]
am
5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"
* commit '
5ac65f869601df5e73fb84b67e57af8ef95cc3bf':
Fix reporting wrong error message for zipalign output file
Jean-Baptiste Queru [Thu, 23 Aug 2012 21:52:40 +0000 (14:52 -0700)]
Merge "Fix reporting wrong error message for zipalign output file"
Jean-Baptiste Queru [Wed, 22 Aug 2012 16:55:25 +0000 (09:55 -0700)]
am
15012c11: Merge "Build on Mac OS X : add experimental SDK versions"
* commit '
15012c115dca7bc0d2edd8dd2689117546b1360e':
Build on Mac OS X : add experimental SDK versions
Jean-Baptiste Queru [Wed, 22 Aug 2012 16:44:48 +0000 (09:44 -0700)]
Merge "Build on Mac OS X : add experimental SDK versions"
OSDN Git Service
