OSDN Git Service
Ben Cheng [Tue, 15 Jan 2013 22:36:42 +0000 (14:36 -0800)]
Stash TARGET_CPU_VARIANT and print it in dumpvar.
Bug:
7961327
Change-Id: I8a3637a87b5a0f791568fe74e44a4a173541deb7
Ying Wang [Tue, 15 Jan 2013 23:28:08 +0000 (15:28 -0800)]
Support to switch between prebuilt and buiding from source
For target shared library and executable.
Change-Id: I40a4e4e0c971811ac60e9bd04206f2422387d3d0
Scott Main [Tue, 15 Jan 2013 05:16:42 +0000 (21:16 -0800)]
am
85ab41eb: am
fb959d01: am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
85ab41eb6b7229dd1fcb08187f27a32ee754c05d':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 05:13:27 +0000 (21:13 -0800)]
am
fb959d01: am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
fb959d01d56e2d44e8833a8a9beca5ee5b04a24d':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 05:10:48 +0000 (21:10 -0800)]
am
474b3f11: am
eb41035f: docs: add the ability to pause the carousel
* commit '
474b3f1198223b61f912c29d2e5c069dcfe322e0':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 05:07:29 +0000 (21:07 -0800)]
am
eb41035f: docs: add the ability to pause the carousel
* commit '
eb41035fcfe1c223a794a24ee2fe8a8b133e67b1':
docs: add the ability to pause the carousel
Scott Main [Tue, 15 Jan 2013 03:03:40 +0000 (19:03 -0800)]
docs: add the ability to pause the carousel
Change-Id: I1ffc929cf93217b578397d825e1eb41369d2666c
Ben Cheng [Mon, 14 Jan 2013 23:07:59 +0000 (15:07 -0800)]
Merge "Use -mcpu=cortex-a15 for gcc arch dependent compilation."
Ben Cheng [Mon, 14 Jan 2013 21:45:45 +0000 (13:45 -0800)]
Use -mcpu=cortex-a15 for gcc arch dependent compilation.
If TARGET_CPU_VARIANT=cortex-a15 is specified in the BoardConfig.mk file.
Bug:
7961327
Change-Id: Ic459df378293237c54263f5315ac3be62dad4273
Ying Wang [Fri, 11 Jan 2013 23:31:06 +0000 (15:31 -0800)]
Add new LOCAL_PROGUARD_ENABLED option "nosystem"
With which we don't include proguard flags defined by the build system.
Bug:
7990659
Change-Id: I78384d2fbaccdd714d646e1b648417195bbd8dde
Scott Main [Thu, 10 Jan 2013 23:38:23 +0000 (15:38 -0800)]
am
18ae42f3: am
468a239d: am
8d0a978a: am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
18ae42f3c84744eca9fd96afcbcf365427e1578f':
docs: update analytics script to support event tracking
Ying Wang [Thu, 10 Jan 2013 22:28:56 +0000 (14:28 -0800)]
resolved conflicts for merge of
e016e80c to jb-mr1-dev-plus-aosp
Change-Id: Ic1546db5d009307789e0c7fda811982f80655dea
Scott Main [Wed, 9 Jan 2013 02:59:29 +0000 (18:59 -0800)]
am
468a239d: am
8d0a978a: am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
468a239d0cc522623f1896b3837092f629393292':
docs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:56:40 +0000 (18:56 -0800)]
am
8d0a978a: am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
8d0a978aea9110bcb6f0d28e504ad1a9540acbe4':
docs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:49:51 +0000 (18:49 -0800)]
am
869f3d1f: Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
* commit '
869f3d1f68194b5962070394882b85f46a415c4c':
docs: update analytics script to support event tracking
Scott Main [Wed, 9 Jan 2013 02:47:45 +0000 (18:47 -0800)]
Merge "docs: update analytics script to support event tracking" into jb-mr1-dev
Scott Main [Wed, 9 Jan 2013 02:45:08 +0000 (18:45 -0800)]
docs: update analytics script to support event tracking
Change-Id: Ie670a3ae91442ec734d146a76ecab254cb3572d4
Jean-Baptiste Queru [Tue, 8 Jan 2013 16:17:19 +0000 (08:17 -0800)]
am
b81bc684: am
7a184cb7: Merge "Change Email2 reference back to Email"
* commit '
b81bc6842e6743e548a76a1c2f2ac59b4f080b10':
Change Email2 reference back to Email
Jean-Baptiste Queru [Tue, 8 Jan 2013 16:13:50 +0000 (08:13 -0800)]
am
7a184cb7: Merge "Change Email2 reference back to Email"
* commit '
7a184cb70f7fbdf7f9f64b88338dcd155cfe1e3d':
Change Email2 reference back to Email
Jean-Baptiste Queru [Tue, 8 Jan 2013 15:55:50 +0000 (07:55 -0800)]
Merge "Change Email2 reference back to Email"
Roger Chen [Tue, 8 Jan 2013 13:20:32 +0000 (21:20 +0800)]
Change Email2 reference back to Email
Change-Id: Id07d81793d2921be95b30f608cc558312f210c4e
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
Ying Wang [Sat, 5 Jan 2013 01:50:46 +0000 (17:50 -0800)]
am
71195ec7: am
d01d0bf8: am
58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit '
71195ec71fe3498b19ff9ff8e4eb924b8fa507e6':
core/Makefile: Allow specification of file locations
Ying Wang [Sat, 5 Jan 2013 01:50:43 +0000 (17:50 -0800)]
am
a40166d1: am
5455455a: am
a6f10400: am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
a40166d11c597038b30eab6122f8967ee1c810b3':
Add simg2img and e2fsck to the otatools.
Ying Wang [Fri, 4 Jan 2013 23:30:28 +0000 (15:30 -0800)]
am
d01d0bf8: am
58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit '
d01d0bf86c2309a7a950549c9c124b303c0c3f82':
core/Makefile: Allow specification of file locations
Ying Wang [Fri, 4 Jan 2013 23:28:20 +0000 (15:28 -0800)]
am
58a87c5c: Merge "core/Makefile: Allow specification of file locations"
* commit '
58a87c5c010e474a1e321d3fe6ce1ad8267576b5':
core/Makefile: Allow specification of file locations
Ying Wang [Fri, 4 Jan 2013 23:01:49 +0000 (15:01 -0800)]
Merge "core/Makefile: Allow specification of file locations"
Ying Wang [Fri, 4 Jan 2013 23:01:18 +0000 (15:01 -0800)]
am
5455455a: am
a6f10400: am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
5455455a3e550821b381d061803133c82956d7ec':
Add simg2img and e2fsck to the otatools.
Ying Wang [Fri, 4 Jan 2013 22:59:20 +0000 (14:59 -0800)]
am
a6f10400: am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
a6f10400e16e80529e2dbbcd44742e55a99e0c3b':
Add simg2img and e2fsck to the otatools.
Ying Wang [Fri, 4 Jan 2013 22:55:21 +0000 (14:55 -0800)]
am
7dc45a8b: Add simg2img and e2fsck to the otatools.
* commit '
7dc45a8bdc744db4d9c742dc21bfe328ad9ba10f':
Add simg2img and e2fsck to the otatools.
Ying Wang [Fri, 4 Jan 2013 22:43:18 +0000 (14:43 -0800)]
Add simg2img and e2fsck to the otatools.
Change-Id: I31225399c6ef9cae38c825755e301fdc70ce194b
Andrew Boie [Fri, 28 Sep 2012 16:33:45 +0000 (09:33 -0700)]
core/Makefile: Allow specification of file locations
If multiple build targets use a common recovery.fstab or system.prop,
this allows them to live in a centralized location and not be copied
or symlinked to the device directories.
Change-Id: I7aeb31ed9dc9b43a5e2c9e46fe582b10cba71b24
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Doug Zongker [Thu, 3 Jan 2013 23:19:19 +0000 (15:19 -0800)]
am
96045fb5: am
f09b7a0e: Merge "SignApk: perform the whole file signature in a single streaming pass."
* commit '
96045fb58488a24689e7449700c53614d9336572':
SignApk: perform the whole file signature in a single streaming pass.
Doug Zongker [Thu, 3 Jan 2013 23:12:43 +0000 (15:12 -0800)]
am
f09b7a0e: Merge "SignApk: perform the whole file signature in a single streaming pass."
* commit '
f09b7a0eaa0aa2ae6a1d0e1cf0f701f1f56e0cda':
SignApk: perform the whole file signature in a single streaming pass.
Doug Zongker [Thu, 3 Jan 2013 22:50:36 +0000 (14:50 -0800)]
Merge "SignApk: perform the whole file signature in a single streaming pass."
Koushik Dutta [Tue, 18 Dec 2012 06:25:22 +0000 (22:25 -0800)]
SignApk: perform the whole file signature in a single streaming pass.
Author: Koushik Dutta <koushd@gmail.com>
Change-Id: I58a68fa4bd4c0c3bb0e025d4311186195fb90e5a
Doug Zongker [Thu, 3 Jan 2013 00:34:54 +0000 (16:34 -0800)]
am
2d867bd2: am
57a5e52d: Merge "add multiple key support to signapk"
* commit '
2d867bd207014abc803199f8a76de84c90f9a4aa':
add multiple key support to signapk
Doug Zongker [Wed, 2 Jan 2013 22:45:12 +0000 (14:45 -0800)]
am
57a5e52d: Merge "add multiple key support to signapk"
* commit '
57a5e52d3692b5f7e4008c8e6aa591aee67de130':
add multiple key support to signapk
Doug Zongker [Wed, 2 Jan 2013 21:49:02 +0000 (13:49 -0800)]
Merge "add multiple key support to signapk"
Doug Zongker [Tue, 16 Oct 2012 00:10:13 +0000 (17:10 -0700)]
add multiple key support to signapk
Support signing .apks (but not OTA packages) with multiple keys.
Bug:
7350459
Change-Id: I794e1da0555e2bb9247a59c756656d4ca7ee04cf
Andrew Hsieh [Fri, 28 Dec 2012 17:47:53 +0000 (09:47 -0800)]
am
dd319cef: am
26f47aba: Merge "Switch to GCC 4.7 for X86 and MIPS"
* commit '
dd319cef3f0e351f0b1621167b22eb39e86b27ad':
Switch to GCC 4.7 for X86 and MIPS
The Android Open Source Project [Fri, 28 Dec 2012 17:47:32 +0000 (09:47 -0800)]
am
f6315729: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
f6315729088bb1ebbf5d8ab6e810dd3462973018':
JDP82
The Android Open Source Project [Fri, 28 Dec 2012 17:46:43 +0000 (09:46 -0800)]
am
9b2ef223: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
9b2ef2237229ca1ce38df2d54550985ec5f7fdaf':
JDP81B
Andrew Hsieh [Fri, 21 Dec 2012 23:51:44 +0000 (15:51 -0800)]
am
26f47aba: Merge "Switch to GCC 4.7 for X86 and MIPS"
* commit '
26f47aba2d973bc1cc459a63df7bd0eec799f4ff':
Switch to GCC 4.7 for X86 and MIPS
Andrew Hsieh [Fri, 21 Dec 2012 23:43:55 +0000 (15:43 -0800)]
Merge "Switch to GCC 4.7 for X86 and MIPS"
The Android Open Source Project [Fri, 21 Dec 2012 22:10:50 +0000 (14:10 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Iff920fa574533c1c22a8c1408291f43e81ab7a2f
The Android Automerger [Fri, 21 Dec 2012 21:47:17 +0000 (13:47 -0800)]
JDP82
The Android Automerger [Fri, 21 Dec 2012 21:46:40 +0000 (13:46 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Open Source Project [Fri, 21 Dec 2012 15:59:28 +0000 (07:59 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ic86ea3815748a11695d10b369d957ebdf647ab57
Andrew Hsieh [Fri, 21 Dec 2012 01:23:05 +0000 (09:23 +0800)]
Switch to GCC 4.7 for X86 and MIPS
Change-Id: I1c2021a15f53e064baf69084894c114289ef7c54
The Android Automerger [Fri, 21 Dec 2012 00:17:20 +0000 (16:17 -0800)]
JDP81B
The Android Automerger [Fri, 21 Dec 2012 00:17:02 +0000 (16:17 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Open Source Project [Thu, 20 Dec 2012 23:48:35 +0000 (15:48 -0800)]
am
8f7ac8ca: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
8f7ac8caa62326d28a50c9aeb037a805eda661f1':
JDP81
The Android Open Source Project [Thu, 20 Dec 2012 23:46:18 +0000 (15:46 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I522981a273e1844811c7a53ca76c75a3e3365b77
The Android Automerger [Thu, 20 Dec 2012 22:31:50 +0000 (14:31 -0800)]
JDP81
The Android Automerger [Thu, 20 Dec 2012 22:31:01 +0000 (14:31 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Scott Main [Thu, 20 Dec 2012 03:32:13 +0000 (19:32 -0800)]
am
97654bc6: am
db3da9bb: am
c9cea375: am
707909f2: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it wi
* commit '
97654bc68fe98ec443599b46fa0ad2c518fa4875':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
Scott Main [Thu, 20 Dec 2012 03:31:12 +0000 (19:31 -0800)]
am
db3da9bb: am
c9cea375: am
707909f2: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scro
* commit '
db3da9bbc62be22d96cdf61f02afe271174f50be':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
Scott Main [Thu, 20 Dec 2012 03:29:21 +0000 (19:29 -0800)]
am
c9cea375: am
707909f2: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway
* commit '
c9cea375c3c66df33f4535e986c00a68f390ac62':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
Scott Main [Thu, 20 Dec 2012 03:25:37 +0000 (19:25 -0800)]
am
707909f2: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscr
* commit '
707909f2e0fb9ccc0db859ec075a3557f5265e56':
docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.
Scott Main [Thu, 20 Dec 2012 03:23:32 +0000 (19:23 -0800)]
Merge "docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce." into jb-mr1-dev
Scott Main [Thu, 20 Dec 2012 02:38:24 +0000 (18:38 -0800)]
docs: don't allow setting the sidenav fixed if the doc body is
shorter than the sidenav. Scrolling won't be possible in this case
anyway, but this change fixes a glitch that happens on OSX Lion because
it will allow scrolling anyway for the overscroll bounce.
Change-Id: I1be1c170e327f3cdfe81076a473f74425b8bd080
The Android Open Source Project [Wed, 19 Dec 2012 22:35:35 +0000 (14:35 -0800)]
am
e57594a6: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
e57594a6934a912ab7b1bd0b8bdaff187ae25ca3':
JDP80B
The Android Open Source Project [Wed, 19 Dec 2012 22:33:27 +0000 (14:33 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I6f627ab7e473280d29846f3523d8cfe9b648df7d
The Android Automerger [Wed, 19 Dec 2012 22:30:14 +0000 (14:30 -0800)]
JDP80B
The Android Automerger [Wed, 19 Dec 2012 22:29:53 +0000 (14:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Open Source Project [Wed, 19 Dec 2012 22:00:15 +0000 (14:00 -0800)]
am
9cb91beb: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
9cb91beb705bc468028da0cd04471f5f3783d031':
JDP80
The Android Open Source Project [Wed, 19 Dec 2012 21:58:48 +0000 (13:58 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I4df1ba6a619529d9f5b96e8b7ed8bc470a81e2ad
The Android Automerger [Wed, 19 Dec 2012 21:51:26 +0000 (13:51 -0800)]
JDP80
The Android Automerger [Wed, 19 Dec 2012 21:50:46 +0000 (13:50 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Open Source Project [Wed, 19 Dec 2012 17:51:19 +0000 (09:51 -0800)]
am
4ec98335: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
4ec98335bab7a94bd583ac57da2711eb8abc0f14':
Bump version to JDP79B
JDP79
The Android Open Source Project [Wed, 19 Dec 2012 16:36:52 +0000 (08:36 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I8c005f84138fa3c89e006790fcf107e521dfa20e
Ying Wang [Wed, 19 Dec 2012 07:11:25 +0000 (23:11 -0800)]
am
c46bd076: am
ead4b642: am
5f97f2b6: am
6a6c1121: Run e2fsck on built sparse images.
* commit '
c46bd076ffc46581a38e518a852e62f8932adf16':
Run e2fsck on built sparse images.
Ying Wang [Wed, 19 Dec 2012 07:09:09 +0000 (23:09 -0800)]
am
ead4b642: am
5f97f2b6: am
6a6c1121: Run e2fsck on built sparse images.
* commit '
ead4b642cffe258e08326628af2c83c99c14df1f':
Run e2fsck on built sparse images.
Chad Jones [Wed, 19 Dec 2012 03:40:22 +0000 (19:40 -0800)]
Bump version to JDP79B
Stephen Hines [Tue, 18 Dec 2012 23:54:02 +0000 (15:54 -0800)]
Merge "Clean up libRSSupport.so and libclcore.bc dependencies."
Ying Wang [Tue, 18 Dec 2012 23:32:51 +0000 (15:32 -0800)]
am
5f97f2b6: am
6a6c1121: Run e2fsck on built sparse images.
* commit '
5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c':
Run e2fsck on built sparse images.
Ying Wang [Tue, 18 Dec 2012 23:28:50 +0000 (15:28 -0800)]
am
6a6c1121: Run e2fsck on built sparse images.
* commit '
6a6c11215bdf3f114ed3589ede4bda006adacf7e':
Run e2fsck on built sparse images.
The Android Automerger [Tue, 18 Dec 2012 23:19:35 +0000 (15:19 -0800)]
JDP79
The Android Automerger [Tue, 18 Dec 2012 23:19:02 +0000 (15:19 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Open Source Project [Tue, 18 Dec 2012 17:46:51 +0000 (09:46 -0800)]
am
70c9917b: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
70c9917bbc5ccff41ea1482c444bf00f14cf15bb':
JDP78
The Android Open Source Project [Tue, 18 Dec 2012 17:44:14 +0000 (09:44 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ic8d9ce1145f5905986ee9b567f020a8cc7a58058
The Android Automerger [Tue, 18 Dec 2012 04:50:14 +0000 (20:50 -0800)]
JDP78
The Android Automerger [Tue, 18 Dec 2012 04:49:28 +0000 (20:49 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Stephen Hines [Mon, 17 Dec 2012 22:23:14 +0000 (14:23 -0800)]
Clean up libRSSupport.so and libclcore.bc dependencies.
Bug:
7419958
Change-Id: I62453bb6830cc2c82ca9dbbf576b52da95eef4b1
The Android Open Source Project [Sat, 15 Dec 2012 00:48:43 +0000 (16:48 -0800)]
am
d1b25b86: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
d1b25b86ad8eca832ccb1af43e3992d9441b8bfc':
JDP75
JDP74
JDP73
Ying Wang [Fri, 14 Dec 2012 22:52:16 +0000 (14:52 -0800)]
Merge "Build from source or prebuilt"
Ying Wang [Fri, 14 Dec 2012 02:23:01 +0000 (18:23 -0800)]
Build from source or prebuilt
With this change, you can easily switch between building from source
code and prebuilt.
Set LOCAL_PREBUILT_MODULE_FILE to the path of the prebuilt file,
relative to the top of the source tree, in the usual module definition.
The prebuilt will be used unless any of the followings satisfied:
1) ANDROID_BUILD_FROM_SOURCE is "true", which disable prebuilt globally;
2) The module name is in ANDROID_NO_PREBUILT_MODULES;
3) The LOCAL_PATH is prefixed by any of ANDROID_NO_PREBUILT_PATHS.
A developer can set ANDROID_NO_PREBUILT_MODULES or
ANDROID_NO_PREBUILT_PATHS to build only his own module(s) from source,
while build other modules from prebuilts.
You can set ANDROID_BUILD_FROM_SOURCE to true to build everything from
source.
Those variables can be set with shell environmental variable or in your
buildspec.mk.
Sometimes module B is able to be built from source only if module A is
also
built from source, for example, if B is the test apk of A.
In that case, you can use the macro include-if-build-from-source to
include B's Android.mk only if A is built from source too, or
if-build-from-source to conditionally include the definition of module
B,
if their module definitions are in the same Android.mk.
Support host-executable-hook and host-shared-library-hook.
Change-Id: Icab7cf028c87eaba0dd7efc2a7749fd6f32b44e4
The Android Open Source Project [Fri, 14 Dec 2012 22:03:11 +0000 (14:03 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I9499ee080c842e363f7aa78057f714dd3e32d43d
The Android Automerger [Fri, 14 Dec 2012 21:56:39 +0000 (13:56 -0800)]
JDP75
The Android Automerger [Fri, 14 Dec 2012 21:56:02 +0000 (13:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Stephen Hines [Fri, 14 Dec 2012 19:39:29 +0000 (11:39 -0800)]
Merge "Add -nostdlib to RS bc->so linker command line."
Stephen Hines [Fri, 14 Dec 2012 03:24:50 +0000 (19:24 -0800)]
Add -nostdlib to RS bc->so linker command line.
Change-Id: Ic715060c3d037ec9fecb0ad9b2be6c2e7052ce0a
Ying Wang [Fri, 14 Dec 2012 02:00:14 +0000 (18:00 -0800)]
am
0adc185a: am
9eedd3ab: Merge "Use "\cd" to disable alias temporarily."
* commit '
0adc185a8cf117c5c7edda7cf5a8257343948342':
Use "\cd" to disable alias temporarily.
Ben Cheng [Fri, 14 Dec 2012 02:00:13 +0000 (18:00 -0800)]
am
24b321b1: am
5ece4724: Merge "Enable lunch command to pick up new toolchain version."
* commit '
24b321b15cb1fe31cc1432f868b740686194bca7':
Enable lunch command to pick up new toolchain version.
Ying Wang [Thu, 13 Dec 2012 23:51:30 +0000 (15:51 -0800)]
am
9eedd3ab: Merge "Use "\cd" to disable alias temporarily."
* commit '
9eedd3abed1d38ac5639a1f47ee80a7dbd0fb207':
Use "\cd" to disable alias temporarily.
Ben Cheng [Thu, 13 Dec 2012 23:51:29 +0000 (15:51 -0800)]
am
5ece4724: Merge "Enable lunch command to pick up new toolchain version."
* commit '
5ece4724d19712225d4fbb6d91d86619015d81b3':
Enable lunch command to pick up new toolchain version.
The Android Automerger [Thu, 13 Dec 2012 23:31:33 +0000 (15:31 -0800)]
JDP74
The Android Automerger [Thu, 13 Dec 2012 23:30:36 +0000 (15:30 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Ying Wang [Thu, 13 Dec 2012 19:08:37 +0000 (11:08 -0800)]
Merge "Use "\cd" to disable alias temporarily."
Ben Cheng [Thu, 13 Dec 2012 19:03:58 +0000 (11:03 -0800)]
Merge commit '
ec4caba7' into manualmerge
Conflicts:
CleanSpec.mk
Change-Id: Idd8f8f4a896b47bd6275daeb71a24a317da4c98a