Commit Graph

9492 Commits

Author SHA1 Message Date
Elliott Hughes 01b2aaaa89 am 69a49f75: Merge changes I21eb93f3,I0be5e272,I158b0d7e
* commit '69a49f75860b4849fd1c2fe68d97fa2243171131':
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm
2012-10-03 11:55:24 -07:00
Elliott Hughes 69a49f7586 Merge changes I21eb93f3,I0be5e272,I158b0d7e
* changes:
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm
2012-10-03 11:29:24 -07:00
Ying Wang e37c3dc3f6 Build only modules required by the current product.
Don't build modules_to_check by default.
Instead add "checkbuild" to the command line as a build goal, if you
want to build everything.
We can use the "checkbuild" goal to make sure some build targets on the
build server still build everything.

(cherry-pick of 5a88269ad6ed44fb163f96847954faac21292567.)

Bug: 7253452
Change-Id: I21eb93f3cb430c9531fe41a2f5d7b445c09938b9
2012-10-03 10:27:31 -07:00
Ying Wang 0c4eb41885 Load only the current product config makefile.
To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.

(cherry-pick of 157a5e1695593f935c3223430f4530e21f990378.)

Bug: 7186768,7169854
Change-Id: I0be5e2721efa66a80f112acf8f95e177ebc2f65b
2012-10-03 10:27:08 -07:00
Ying Wang e113fb1d41 Run clean steps in only given paths when using mm/mmm
To speed up mm/mmm start time.
At the same time, we should copy over the other clean steps.

(cherry-pick of 6ea58cb3dc564ce112b28f1a7c6936317168d931.)

Bug: 7186768
Change-Id: I158b0d7e4ecaa773ec3a336cd326e27ee8c26a88
2012-10-03 10:26:36 -07:00
Conley Owens 672b189368 am 8c37f49f: Merge "Follow symlinks when using find"
* commit '8c37f49fd02d00b6371fb808d9a9dc836f565e02':
  Follow symlinks when using find
2012-10-02 16:24:42 -07:00
Conley Owens 8c37f49fd0 Merge "Follow symlinks when using find" 2012-10-02 16:06:41 -07:00
Conley Owens f435739bac Follow symlinks when using find
This allows more flexibility with symlinking subtrees within projects.
For example, a build bot with a read-only copy of the src can copy
directories which will be affected by applied patches while symlinking
to directories that will remain untouched.

Change-Id: I9c783180f3ebdd737d8daf17550f562e4f00b200
2012-10-02 14:34:36 -07:00
Jean-Baptiste Queru a068907570 Update version number for AOSP master
Change-Id: I5bc11420932d62a2f6bc12410fe7c8ac2dca069b
2012-09-14 07:43:41 -07:00
Andrew Hsieh 0f47a94d2e am 7e300d60: Merge "Enable stack-protector for x86"
* commit '7e300d60bfc325e3cbf3e7656297c14109e513b8':
  Enable stack-protector for x86
2012-09-12 14:20:11 -07:00
Andrew Hsieh 7e300d60bf Merge "Enable stack-protector for x86" 2012-09-12 13:44:01 -07:00
Ying Wang 6a6723a0a9 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.
2012-09-11 12:12:23 -07:00
Ying Wang 4458452ef6 Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." 2012-09-11 11:49:11 -07:00
Ying Wang 6adcf0180a android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
2012-09-11 11:47:22 -07:00
Ying Wang 410420ed66 am 9efa5bae: Merge "Add transform-d-to-p-args"
* commit '9efa5bae8645988a0d24af14142df9572bf7bd57':
  Add transform-d-to-p-args
2012-09-10 10:21:57 -07:00
Ying Wang 9efa5bae86 Merge "Add transform-d-to-p-args" 2012-09-10 09:48:26 -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
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
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 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
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
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
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