The Android Automerger
0c7a9ba323
merge in jb-nakasig-release history after reset to jb-dev
2012-09-09 08:09:06 -07:00
The Android Automerger
95b1b4560b
JGO70
2012-09-08 08:09:14 -07:00
The Android Automerger
13ccbda2a2
merge in jb-nakasig-release history after reset to jb-dev
2012-09-08 08:09:05 -07:00
Ying Wang
c23f4efdbb
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
2012-09-07 17:04:06 -07:00
Scott Main
65cdbdcdf0
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
2012-09-07 16:17:11 -07:00
Scott Main
65511c0a72
fix script bug. we were running some scripts that are only used in the reference
...
Change-Id: I0693a7a7af5e41283942b387e53a254903b83427
2012-09-07 15:51:32 -07:00
The Android Open Source Project
a7b0ec3c48
Reconcile with jb-nakasig-release jb-mr0-release jb-release - do not merge
...
Change-Id: Ibb66fb1e9c4c3066c8a27139922300a511ff9e7b
2012-09-07 15:20:58 -07:00
The Android Automerger
783924163e
JRO03W
2012-09-07 10:29:09 -07:00
The Android Automerger
0527b10bc2
JRO69
2012-09-07 10:28:17 -07:00
The Android Automerger
26acee7edb
merge in jb-release history after reset to jb-dev
2012-09-07 10:28:12 -07:00
The Android Automerger
16dfdcc0c1
JGO69
2012-09-07 08:09:06 -07:00
The Android Automerger
6b40d9dd7a
merge in jb-nakasig-release history after reset to jb-dev
2012-09-07 08:09:00 -07:00
The Android Automerger
248961ca4e
JGO68
2012-09-06 15:09:18 -07:00
The Android Automerger
cba5291918
merge in jb-nakasig-release history after reset to jb-dev
2012-09-06 15:09:17 -07:00
The Android Automerger
2686236196
JGO67
2012-09-06 15:08:50 -07:00
The Android Automerger
dbf1b57d3f
JZO54E
2012-09-06 13:30:11 -07:00
Ying Wang
b4199b869b
am 1c27ac0e: am 1b70bb21: Merge "Clean step for libc."
...
* commit '1c27ac0ea9d2e43d8ff05c61aa4fe6f3d9558334':
Clean step for libc.
2012-09-06 10:43:07 -07:00
Ying Wang
1c27ac0ea9
am 1b70bb21: Merge "Clean step for libc."
...
* commit '1b70bb2162d74a304bd0d00674a0fed80f936961':
Clean step for libc.
2012-09-06 10:40:43 -07:00
Ying Wang
1b70bb2162
Merge "Clean step for libc."
2012-09-06 10:36:31 -07:00
Ying Wang
7d862475fd
Clean step for libc.
...
(cherry-pick of ab1e93d4d4f4a46fa922df5ba7ccd41dde1221ac.)
Change-Id: I304312d6eb0346c050d02bd834565e0d43d8b4dd
2012-09-06 10:34:37 -07:00
The Android Open Source Project
11f2612325
Reconcile with jb-mr0-release jb-release - do not merge
...
Change-Id: I788e28f1f2a2d2a41c5c49097da31417b476cfcb
2012-09-06 08:08:09 -07:00
Ying Wang
19c06156b6
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
2012-09-05 18:37:46 -07:00
Ying Wang
0ee362ea04
am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
...
* commit '478d0fc6a311b236fddc9d18c9a1b922f8ecf1ea':
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
2012-09-05 18:35:50 -07:00
Ying Wang
478d0fc6a3
Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
2012-09-05 18:15:12 -07:00
Ying Wang
619fccf9f3
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
...
Before setting up the rules.
Change-Id: Ifedbc0e988895a899cae315dc730a152bae91ae2
2012-09-05 18:09:49 -07:00
Conley Owens
d65bb799ab
am 86ffa1cd: am 5da7ec4f: Merge "Follow symlinks in findleaves"
...
* commit '86ffa1cd63ede2c8b923d124aca9adab5aaca260':
Follow symlinks in findleaves
2012-09-04 10:31:46 -07:00
Conley Owens
86ffa1cd63
am 5da7ec4f: Merge "Follow symlinks in findleaves"
...
* commit '5da7ec4fbdc8c2ac30f7dafb33327e9bfa337d5b':
Follow symlinks in findleaves
2012-09-04 10:29:43 -07:00
Conley Owens
5da7ec4fbd
Merge "Follow symlinks in findleaves"
2012-09-04 10:24:54 -07:00
The Android Automerger
f33d47b53c
JZO54D
2012-08-31 13:54:56 -07:00
The Android Automerger
3c47c4ee72
JZO54C
2012-08-30 16:00:32 -07:00
Kenny Root
ef6f4f6b9c
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 720479ea7e
)
Bug: 6960586
Change-Id: I6864ce339a3593c5043e6a55b5af118b3169cc01
2012-08-30 12:11:47 -07:00
Kenny Root
a4f2f34a45
am d6a46969: Add make_ext4fs to all builds
...
* commit 'd6a469693fe77884bc902d6ec8be6f04d7d8e21a':
Add make_ext4fs to all builds
2012-08-30 12:11:40 -07:00
The Android Automerger
bdfc1bb1ed
JZO54B
2012-08-30 12:07:12 -07:00
Jean-Baptiste Queru
9993b1265e
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
2012-08-30 11:40:13 -07:00
Jean-Baptiste Queru
bb369a582b
Merge "Add make_ext4fs to support installing apps to SD card"
2012-08-30 11:01:29 -07:00
Jun Tian
536c8bed37
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>
2012-08-30 09:53:03 -07:00
Kenny Root
d6a469693f
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 720479ea7e
)
Bug: 6960586
Change-Id: I6864ce339a3593c5043e6a55b5af118b3169cc01
2012-08-30 09:08:27 -07:00
The Android Automerger
9905256bea
JRO03V
2012-08-29 14:30:05 -07:00
The Android Automerger
720c0015f7
merge in jb-release history after reset to jb-dev
2012-08-29 14:29:50 -07:00
The Android Automerger
edfd5385de
JRO03V
2012-08-29 12:43:26 -07:00
The Android Automerger
dcc3cefd1d
merge in jb-release history after reset to jb-dev
2012-08-29 12:43:01 -07:00
Andrew Hsieh
c2fb2391f4
Enable stack-protector for x86
...
Change-Id: I7a169075ca49ab831c37625d416c1d4b026bfec3
2012-08-29 15:13:23 +08:00
Jean-Baptiste Queru
4dc6ed96a0
am 9eb87b8d: Merge "Add pattern to check for GCC 4.6"
...
* commit '9eb87b8d2011e65462ea42de6899158cd35a492a':
Add pattern to check for GCC 4.6
2012-08-28 13:16:59 -07:00
Jean-Baptiste Queru
fe95bc0fd6
am 1d0f5f91: Merge "Include all standard shared library paths in /system/lib"
...
* commit '1d0f5f914ae1406b976f69c265f0042c0279974e':
Include all standard shared library paths in /system/lib
2012-08-28 13:16:58 -07:00
Jean-Baptiste Queru
5c90337229
am 9e2b4718: Merge "Use gold linker on x86"
...
* commit '9e2b4718a0e11a723904ba205a5156bae450be30':
Use gold linker on x86
2012-08-28 13:16:57 -07:00
Jean-Baptiste Queru
9eb87b8d20
Merge "Add pattern to check for GCC 4.6"
2012-08-28 12:47:34 -07:00
Jean-Baptiste Queru
1d0f5f914a
Merge "Include all standard shared library paths in /system/lib"
2012-08-28 12:46:43 -07:00
Jean-Baptiste Queru
9e2b4718a0
Merge "Use gold linker on x86"
2012-08-28 12:27:21 -07:00
Pavel Chupin
b205b46153
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>
2012-08-28 13:10:18 +04:00
Andrew Hsieh
26c7805781
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
2012-08-28 10:49:05 +08:00