Conley Owens
aa1e31358a
am ef502c6d
: am 52bd431e
: am d65bb799
: am 86ffa1cd
: am 5da7ec4f
: Merge "Follow symlinks in findleaves"
...
* commit 'ef502c6da0933e7eb51ff769a61c8321d51573a1':
Follow symlinks in findleaves
2012-09-04 11:12:56 -07:00
Conley Owens
ef502c6da0
am 52bd431e
: am d65bb799
: am 86ffa1cd
: am 5da7ec4f
: Merge "Follow symlinks in findleaves"
...
* commit '52bd431e37a23af3ef97cc27acb8d635e5045752':
Follow symlinks in findleaves
2012-09-04 11:11:03 -07:00
Conley Owens
52bd431e37
am d65bb799
: am 86ffa1cd
: am 5da7ec4f
: Merge "Follow symlinks in findleaves"
...
* commit 'd65bb799ab31699067fd3b61b106a067575b154f':
Follow symlinks in findleaves
2012-09-04 11:08:16 -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
Keun young Park
dbe4fdf7bc
am 6c03166c
: am ead692e5
: Merge "add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build" into jb-mr1-dev
...
* commit '6c03166c3a5e5f571d47a954a8ee5a2d1d2287b8':
add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build
2012-08-31 20:11:38 -07:00
Keun young Park
6c03166c3a
am ead692e5
: Merge "add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build" into jb-mr1-dev
...
* commit 'ead692e5f3083bb5eea5e383b3a8ae3775f0bb68':
add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build
2012-08-31 20:08:48 -07:00
Keun young Park
ead692e5f3
Merge "add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build" into jb-mr1-dev
2012-08-31 20:07:29 -07:00
Daniel Sandler
37755bb1c8
am 7138e336
: am ce9ecf38
: Merge "Add basic Dreams set to builds." into jb-mr1-dev
...
* commit '7138e336dd753394ec7a008e1836891f6e0b1ca1':
Add basic Dreams set to builds.
2012-08-31 13:38:43 -07:00
Daniel Sandler
7138e336dd
am ce9ecf38
: Merge "Add basic Dreams set to builds." into jb-mr1-dev
...
* commit 'ce9ecf38e953e642704c696d6abc26233b0cee05':
Add basic Dreams set to builds.
2012-08-31 13:36:25 -07:00
Daniel Sandler
ce9ecf38e9
Merge "Add basic Dreams set to builds." into jb-mr1-dev
2012-08-31 13:34:38 -07:00
Daniel Sandler
eeed3cf2c5
Add basic Dreams set to builds.
...
Change-Id: I7b7e84a84f9fc6c594662baf4dd991ff9af5f162
2012-08-31 15:57:09 -04:00
Keun young Park
59254f1194
add libsurfaceflinger_ddmconnection to PRODUCT_PACKAGES for PDK build
...
- the library is dlopened from libsurfaceflinger
Bug: 7089510
Change-Id: I5526c0390efd161e596b08c0bf823090b3969dfe
2012-08-31 10:00:53 -07:00
Chiao Cheng
833d4b304c
Merge "Adding OneTimeInitializer to build."
2012-08-30 14:44:30 -07:00
Ying Wang
fb12f71fe7
am 18c8d9eb
: am 3a6f7589
: Add LOCAL_DONT_DELETE_JAR_META_INF
...
* commit '18c8d9eb1e0c0776862d554f0834e7ee3018375a':
Add LOCAL_DONT_DELETE_JAR_META_INF
2012-08-30 14:16:31 -07:00
Ying Wang
18c8d9eb1e
am 3a6f7589
: Add LOCAL_DONT_DELETE_JAR_META_INF
...
* commit '3a6f7589e8fcc691ec768b1fdcbf0364ff4596f2':
Add LOCAL_DONT_DELETE_JAR_META_INF
2012-08-30 14:14:12 -07:00
Kenny Root
6306e42569
am 6180d5c8
: am 565de5c9
: am a4f2f34a
: am d6a46969
: Add make_ext4fs to all builds
...
* commit '6180d5c8f2293e6fee7481d13d45559734c0c1bd':
Add make_ext4fs to all builds
2012-08-30 13:33:39 -07:00
Ying Wang
3a6f7589e8
Add LOCAL_DONT_DELETE_JAR_META_INF
...
To support to not delete META_INF directory from the static Java
libraries.
Change-Id: I720bfa059c43dd457a74a0c60bb6797aa408ecaf
2012-08-30 12:59:42 -07:00
Kenny Root
6180d5c8f2
am 565de5c9
: am a4f2f34a
: am d6a46969
: Add make_ext4fs to all builds
...
* commit '565de5c97c49ece0e6dc8f95833956ae27afe598':
Add make_ext4fs to all builds
2012-08-30 12:16:33 -07:00
Kenny Root
565de5c97c
am a4f2f34a
: am d6a46969
: Add make_ext4fs to all builds
...
* commit 'a4f2f34a45a35c5c49308d336b822ea4af4a543d':
Add make_ext4fs to all builds
2012-08-30 12:13:56 -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
Jean-Baptiste Queru
7857925ddb
am a1ffbfc5
: am 780364f0
: am 9993b126
: am bb369a58
: Merge "Add make_ext4fs to support installing apps to SD card"
...
* commit 'a1ffbfc59d2907de13ca820c8d3a83b5097a1e26':
Add make_ext4fs to support installing apps to SD card
2012-08-30 11:49:09 -07:00
Jean-Baptiste Queru
a1ffbfc59d
am 780364f0
: am 9993b126
: am bb369a58
: Merge "Add make_ext4fs to support installing apps to SD card"
...
* commit '780364f0cbd497359dc75b3e1f1e6605a9ec4990':
Add make_ext4fs to support installing apps to SD card
2012-08-30 11:47:05 -07:00
Jean-Baptiste Queru
780364f0cb
am 9993b126
: am bb369a58
: Merge "Add make_ext4fs to support installing apps to SD card"
...
* commit '9993b1265ec108957c1b4a35bdc62940a350b3e4':
Add make_ext4fs to support installing apps to SD card
2012-08-30 11:44:17 -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
Chiao Cheng
6c7341cac9
Adding OneTimeInitializer to build.
...
Bug: 6993891
Change-Id: Id3c0275846a4dd93d82dcfde0249fec0e226a9bd
2012-08-28 18:53:00 -07:00
Jean-Baptiste Queru
f3ca2f3507
am 68d43bfd
: am d4ace138
: am 4dc6ed96
: am 9eb87b8d
: Merge "Add pattern to check for GCC 4.6"
...
* commit '68d43bfd402a2dc63da91846972262fd3150d3d4':
Add pattern to check for GCC 4.6
2012-08-28 13:44:05 -07:00
Jean-Baptiste Queru
1e2b7b8164
am 6d904be7
: am c8d10774
: am fe95bc0f
: am 1d0f5f91
: Merge "Include all standard shared library paths in /system/lib"
...
* commit '6d904be725b5ed09b815b6c5dff42a12a0974c0c':
Include all standard shared library paths in /system/lib
2012-08-28 13:44:04 -07:00
Jean-Baptiste Queru
3ddaa04cb3
am 2c83b090
: am d5096c6a
: resolved conflicts for merge of 5c903372
to jb-mr1-dev
...
* commit '2c83b09034d5be5369168697eab3e825ef13610d':
Use gold linker on x86
2012-08-28 13:44:03 -07:00
Jean-Baptiste Queru
68d43bfd40
am d4ace138
: am 4dc6ed96
: am 9eb87b8d
: Merge "Add pattern to check for GCC 4.6"
...
* commit 'd4ace13802810b58de8c744e810dc8e87776d3f0':
Add pattern to check for GCC 4.6
2012-08-28 13:42:28 -07:00
Jean-Baptiste Queru
6d904be725
am c8d10774
: am fe95bc0f
: am 1d0f5f91
: Merge "Include all standard shared library paths in /system/lib"
...
* commit 'c8d107740f526c0a63f46106120cdc3a81787879':
Include all standard shared library paths in /system/lib
2012-08-28 13:42:27 -07:00
Jean-Baptiste Queru
2c83b09034
am d5096c6a
: resolved conflicts for merge of 5c903372
to jb-mr1-dev
...
* commit 'd5096c6a5c59a0f78833ea86b620bfbedc863aba':
Use gold linker on x86
2012-08-28 13:42:26 -07:00
Jean-Baptiste Queru
d4ace13802
am 4dc6ed96
: am 9eb87b8d
: Merge "Add pattern to check for GCC 4.6"
...
* commit '4dc6ed96a0612d4693cca5ed5674873754bcb37e':
Add pattern to check for GCC 4.6
2012-08-28 13:41:09 -07:00
Jean-Baptiste Queru
c8d107740f
am fe95bc0f
: am 1d0f5f91
: Merge "Include all standard shared library paths in /system/lib"
...
* commit 'fe95bc0fd6bf5c45e264740654ee4ad45fcb37d4':
Include all standard shared library paths in /system/lib
2012-08-28 13:41:08 -07:00
Jean-Baptiste Queru
d5096c6a5c
resolved conflicts for merge of 5c903372
to jb-mr1-dev
...
Change-Id: I4994c77a6570ce654915bfb8c5f6ee4583db86b7
2012-08-28 13:40:19 -07: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
Ying Wang
97d7be8224
am 759f05a2
: am 6f4de4bd
: Allow Java resource in apk.
...
* commit '759f05a2cbd6ece18c95bc415bd22f0847540c78':
Allow Java resource in apk.
2012-08-28 13:02:44 -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
Ying Wang
759f05a2cb
am 6f4de4bd
: Allow Java resource in apk.
...
* commit '6f4de4bd13f0acaaa8b7c59e141c28d64aba48f4':
Allow Java resource in apk.
2012-08-28 12:41:46 -07:00
Ying Wang
6f4de4bd13
Allow Java resource in apk.
...
Bug: 6892294
Change-Id: Ib7664e3d9e396dc8ccccecbae9103884014f3ddd
2012-08-28 12:37:27 -07:00
Jean-Baptiste Queru
9e2b4718a0
Merge "Use gold linker on x86"
2012-08-28 12:27:21 -07:00
Evgeniy Stepanov
e1d27e210f
Split out ASFLAGS from CFLAGS in Clang config.
...
Change-Id: I4e3fc3c737fd7c1baff7e30f01d2b26bda557f71
2012-08-28 10:08:24 -07:00
Chris Wren
ab42a8341c
am 00743e38
: am 07791f87
: Merge "Include stock Dreams in the build." into jb-mr1-dev
...
* commit '00743e38849df7fbc5d6a723bbd5e79658941b69':
Include stock Dreams in the build.
2012-08-28 07:13:29 -07:00