Commit Graph

9484 Commits

Author SHA1 Message Date
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
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
The Android Open Source Project
28f37bb992 Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: Ibe50742a45ef532acf13f4edb8166b6e6c1ef30c
2012-08-27 14:10:49 -07:00
Chris Dearman
6858d51a03 Include all standard shared library paths in /system/lib
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Ib33ce42532cc8cedc6f48036a257a2a225c82a69
2012-08-27 12:57:04 -07:00
The Android Automerger
75874cac14 JRO03U 2012-08-27 12:52:54 -07:00
Conley Owens
d8a3285797 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
2012-08-24 16:24:45 -07:00
The Android Automerger
bf687f8464 JRO03T 2012-08-24 13:23:58 -07:00
Jean-Baptiste Queru
dbf6ad0692 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
2012-08-24 13:04:48 -07:00
Jean-Baptiste Queru
713bac96d6 Merge "ARM: put crtbegin_so.o at the beginning where it belongs" 2012-08-24 13:00:10 -07:00
The Android Automerger
0bd5415fa0 JZO54 2012-08-23 21:31:01 -07:00
The Android Automerger
59492596c9 merge in jb-mr0-release history after reset to jb-dev 2012-08-23 21:30:08 -07:00
Jean-Baptiste Queru
83af736f28 am 5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"
* commit '5ac65f869601df5e73fb84b67e57af8ef95cc3bf':
  Fix reporting wrong error message for zipalign output file
2012-08-23 15:09:15 -07:00
Jean-Baptiste Queru
5ac65f8696 Merge "Fix reporting wrong error message for zipalign output file" 2012-08-23 14:52:41 -07:00
Jean-Baptiste Queru
e3479ea503 am 15012c11: Merge "Build on Mac OS X : add experimental SDK versions"
* commit '15012c115dca7bc0d2edd8dd2689117546b1360e':
  Build on Mac OS X : add experimental SDK versions
2012-08-22 09:55:25 -07:00
Jean-Baptiste Queru
15012c115d Merge "Build on Mac OS X : add experimental SDK versions" 2012-08-22 09:44:48 -07:00
The Android Open Source Project
9c6df3cdcc Reconcile with jb-release - do not merge
Change-Id: I89dbc5ee1f1765f334f5dd5d1feb7c05a7d9360f
2012-08-21 16:12:25 -07:00
The Android Automerger
f649352b3f JRO03S 2012-08-21 15:34:59 -07:00
Andrew Hsieh
cd3050c541 am 4d69e06b: Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"
* commit '4d69e06b764d030dcc3ce9bc8b103a75eff3175a':
  Added BUILD_HOST_static to build statically linked executable/shared-lib
2012-08-21 12:58:45 -07:00
SangWook Han
691e0243ca Build on Mac OS X : add experimental SDK versions
Change-Id: Ifc67d1745e72fc048cd6e8c8ef0521ab92468086
2012-08-22 02:59:58 +09:00
Andrew Hsieh
4d69e06b76 Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib" 2012-08-21 10:21:55 -07:00
Ard Biesheuvel
6c1f9ccfb1 ARM: put crtbegin_so.o at the beginning where it belongs
Change-Id: I9466fe9277c58a7b8f8a9964b2d578a65e579995
2012-08-21 10:42:32 +02:00
Andrew Hsieh
31ef1037bf Added BUILD_HOST_static to build statically linked executable/shared-lib
Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.

In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread

Change-Id: I615f574e918c83ed1ab82db2453b69d0420cb59c
2012-08-21 14:40:16 +08:00
Scott Main
50187e5345 am f5089846: docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c
* commit 'f5089846a1876f8e976d4bd1ddf383d3ed68d558':
  docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change 9edfa6db8c
2012-08-20 17:01:19 -07:00