Commit graph

11435 commits

Author SHA1 Message Date
Scott Main
f9b6e097cb 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.
2012-12-19 19:32:13 -08:00
Scott Main
97654bc68f 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.
2012-12-19 19:31:12 -08:00
Scott Main
db3da9bbc6 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.
2012-12-19 19:29:21 -08:00
Scott Main
c9cea375c3 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.
2012-12-19 19:25:37 -08:00
Scott Main
707909f2e0 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 2012-12-19 19:23:32 -08:00
Scott Main
b8d06a55e0 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
2012-12-19 18:42:16 -08:00
The Android Open Source Project
b4f5a32e49 am e57594a6: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'e57594a6934a912ab7b1bd0b8bdaff187ae25ca3':
  JDP80B
2012-12-19 14:35:35 -08:00
The Android Open Source Project
e57594a693 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I6f627ab7e473280d29846f3523d8cfe9b648df7d
2012-12-19 14:33:27 -08:00
The Android Automerger
4505bf3c29 JDP80B 2012-12-19 14:30:14 -08:00
The Android Automerger
da35afa180 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-19 14:29:53 -08:00
The Android Open Source Project
536a7b24a3 am 9cb91beb: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '9cb91beb705bc468028da0cd04471f5f3783d031':
  JDP80
2012-12-19 14:00:15 -08:00
The Android Open Source Project
9cb91beb70 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I4df1ba6a619529d9f5b96e8b7ed8bc470a81e2ad
2012-12-19 13:58:48 -08:00
The Android Automerger
e551d6b45e JDP80 2012-12-19 13:51:26 -08:00
The Android Automerger
76db451c3f merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-19 13:50:46 -08:00
The Android Open Source Project
bda85dddb7 am 4ec98335: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '4ec98335bab7a94bd583ac57da2711eb8abc0f14':
  Bump version to JDP79B
  JDP79
2012-12-19 09:51:19 -08:00
The Android Open Source Project
4ec98335ba Reconcile with jb-mr1.1-release - do not merge
Change-Id: I8c005f84138fa3c89e006790fcf107e521dfa20e
2012-12-19 08:36:52 -08:00
Ying Wang
9c95c4ac91 am c46bd076: am ead4b642: am 5f97f2b6: am 6a6c1121: Run e2fsck on built sparse images.
* commit 'c46bd076ffc46581a38e518a852e62f8932adf16':
  Run e2fsck on built sparse images.
2012-12-18 23:11:25 -08:00
Ying Wang
c46bd076ff am ead4b642: am 5f97f2b6: am 6a6c1121: Run e2fsck on built sparse images.
* commit 'ead4b642cffe258e08326628af2c83c99c14df1f':
  Run e2fsck on built sparse images.
2012-12-18 23:09:09 -08:00
Chad Jones
341d8f8ee6 Bump version to JDP79B 2012-12-18 19:40:22 -08:00
Stephen Hines
d4244eb063 Merge "Clean up libRSSupport.so and libclcore.bc dependencies." 2012-12-18 15:54:02 -08:00
Ying Wang
ead4b642cf am 5f97f2b6: am 6a6c1121: Run e2fsck on built sparse images.
* commit '5f97f2b6d6503eca8ae02ea8941fe1db7b6b399c':
  Run e2fsck on built sparse images.
2012-12-18 15:32:51 -08:00
Ying Wang
5f97f2b6d6 am 6a6c1121: Run e2fsck on built sparse images.
* commit '6a6c11215bdf3f114ed3589ede4bda006adacf7e':
  Run e2fsck on built sparse images.
2012-12-18 15:28:50 -08:00
The Android Automerger
e40ae3abe9 JDP79 2012-12-18 15:19:35 -08:00
The Android Automerger
aa7a07b0f6 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-18 15:19:02 -08:00
The Android Open Source Project
53f9c03036 am 70c9917b: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '70c9917bbc5ccff41ea1482c444bf00f14cf15bb':
  JDP78
2012-12-18 09:46:51 -08:00
The Android Open Source Project
70c9917bbc Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ic8d9ce1145f5905986ee9b567f020a8cc7a58058
2012-12-18 09:44:14 -08:00
The Android Automerger
714d7c7db5 JDP78 2012-12-17 20:50:14 -08:00
The Android Automerger
87fefda594 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-17 20:49:28 -08:00
Stephen Hines
f692513071 Clean up libRSSupport.so and libclcore.bc dependencies.
Bug: 7419958
Change-Id: I62453bb6830cc2c82ca9dbbf576b52da95eef4b1
2012-12-17 17:59:47 -08:00
The Android Open Source Project
2db5636452 am d1b25b86: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'd1b25b86ad8eca832ccb1af43e3992d9441b8bfc':
  JDP75
  JDP74
  JDP73
2012-12-14 16:48:43 -08:00
Ying Wang
3a990aee1e Merge "Build from source or prebuilt" 2012-12-14 14:52:16 -08:00
Ying Wang
63d94fa305 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
2012-12-14 14:48:00 -08:00
The Android Open Source Project
d1b25b86ad Reconcile with jb-mr1.1-release - do not merge
Change-Id: I9499ee080c842e363f7aa78057f714dd3e32d43d
2012-12-14 14:03:11 -08:00
The Android Automerger
20bfc920bf JDP75 2012-12-14 13:56:39 -08:00
The Android Automerger
9d1c9df4ea merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-14 13:56:02 -08:00
Stephen Hines
08d58814c3 Merge "Add -nostdlib to RS bc->so linker command line." 2012-12-14 11:39:29 -08:00
Stephen Hines
7d6ec71965 Add -nostdlib to RS bc->so linker command line.
Change-Id: Ic715060c3d037ec9fecb0ad9b2be6c2e7052ce0a
2012-12-13 19:24:50 -08:00
Ying Wang
51b5840de7 am 0adc185a: am 9eedd3ab: Merge "Use "\cd" to disable alias temporarily."
* commit '0adc185a8cf117c5c7edda7cf5a8257343948342':
  Use "\cd" to disable alias temporarily.
2012-12-13 18:00:14 -08:00
Ben Cheng
780a916e1d 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.
2012-12-13 18:00:13 -08:00
Ying Wang
0adc185a8c am 9eedd3ab: Merge "Use "\cd" to disable alias temporarily."
* commit '9eedd3abed1d38ac5639a1f47ee80a7dbd0fb207':
  Use "\cd" to disable alias temporarily.
2012-12-13 15:51:30 -08:00
Ben Cheng
24b321b15c am 5ece4724: Merge "Enable lunch command to pick up new toolchain version."
* commit '5ece4724d19712225d4fbb6d91d86619015d81b3':
  Enable lunch command to pick up new toolchain version.
2012-12-13 15:51:29 -08:00
The Android Automerger
127f6a2fd4 JDP74 2012-12-13 15:31:33 -08:00
The Android Automerger
c79811b516 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-13 15:30:36 -08:00
Ying Wang
9eedd3abed Merge "Use "\cd" to disable alias temporarily." 2012-12-13 11:08:38 -08:00
Ben Cheng
9c68f06a54 Merge commit 'ec4caba7' into manualmerge
Conflicts:
	CleanSpec.mk

Change-Id: Idd8f8f4a896b47bd6275daeb71a24a317da4c98a
2012-12-13 11:03:58 -08:00
Ying Wang
9cd1764814 Use "\cd" to disable alias temporarily.
http://code.google.com/p/android/issues/detail?id=41372

Change-Id: I78e468cb5d57e51774d2e42376ef1f4b52096d33
2012-12-13 10:52:56 -08:00
Ben Cheng
ec4caba79c Enable lunch command to pick up new toolchain version.
Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.

Change-Id: Icdacb8c46034b8a24a9875b7596b31d00861512a
2012-12-13 10:43:55 -08:00
Ben Cheng
5ece4724d1 Merge "Enable lunch command to pick up new toolchain version." 2012-12-13 10:11:21 -08:00
Ben Cheng
914f7fd938 Enable lunch command to pick up new toolchain version.
Otherwise the previously exported value will be sticky and the value
defined in the TARGET makefile is ignored.

Change-Id: I13b9cca2d288f7ab09104c57e7cad9f23de2548a
2012-12-12 21:56:58 -08:00
The Android Automerger
ba45cc19c9 JDP73 2012-12-12 15:06:52 -08:00