Commit graph

7450 commits

Author SHA1 Message Date
Jean-Baptiste Queru
316febd715 am 78b68045: am ffe03c98: Set OUT_DIR based on a common base path
* commit '78b680458b3ba53fb2f88a603e371c002eb8944b':
  Set OUT_DIR based on a common base path
2011-12-06 22:53:44 -08:00
Jean-Baptiste Queru
78b680458b am ffe03c98: Set OUT_DIR based on a common base path
* commit 'ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c':
  Set OUT_DIR based on a common base path
2011-12-06 19:32:37 -08:00
Jean-Baptiste Queru
ffe03c984b Set OUT_DIR based on a common base path
Change-Id: I2c4ba8b101d4d186ed4b371b9d07b3bcf75bbcc9
Author: Jean-Baptiste Queru<jbq@google.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-06 14:36:49 -08:00
The Android Open Source Project
7948c2557d Reconcile with ics-mr1-release
Change-Id: Ib87b7762bfc1eca5386bfc50c687547c6141dc29
2011-12-06 09:02:50 -08:00
The Android Open Source Project
598a8edbc7 am da4a1fc2: am aac7b445: Reconcile with ics-mr0-release
* commit 'da4a1fc216429a44c1befaf27f73350af2527a67':
  ICL53D
2011-12-06 09:00:17 -08:00
The Android Open Source Project
da4a1fc216 am aac7b445: Reconcile with ics-mr0-release
* commit 'aac7b4455a4dbfab5a136628864789eba8a31bb0':
  ICL53D
2011-12-06 08:57:52 -08:00
The Android Open Source Project
aac7b4455a Reconcile with ics-mr0-release
Change-Id: I224ac8e665f91c64935f7a20397b925aba767994
2011-12-06 08:56:01 -08:00
The Android Automerger
66f9dcdd25 ICL53D 2011-12-06 05:23:26 -08:00
The Android Automerger
4844adf4a9 IML66 2011-12-05 20:38:05 -08:00
The Android Automerger
7e9d3affc1 merge in ics-mr1-release history after reset to ics-mr1 2011-12-05 20:34:59 -08:00
The Android Open Source Project
bfcdc63c22 Reconcile with ics-mr1-release
Change-Id: Ia3ed1074e701cb1a74e3af1906ef3897fc293fd0
2011-12-05 08:52:52 -08:00
Doug Zongker
76651dfc9e am 4eef1296: am bd2dadc2: check entire recovery partition on startup
* commit '4eef12965b5dc39ba87eb71ac3548cc2ec8af729':
  check entire recovery partition on startup
2011-12-02 17:57:22 -08:00
The Android Automerger
77da392937 IML63B 2011-12-02 16:23:13 -08:00
The Android Automerger
eb41a7af1b merge in ics-mr1-release history after reset to ics-mr1 2011-12-02 16:20:17 -08:00
Doug Zongker
4eef12965b am bd2dadc2: check entire recovery partition on startup
* commit 'bd2dadc21a5db967972a7b8f81aad716609edacb':
  check entire recovery partition on startup
2011-12-02 13:58:08 -08:00
Doug Zongker
bd2dadc21a check entire recovery partition on startup
Checksum the entire recovery partition at boot time to see if we need
to rewrite it, rather than just the first 2kb.

Bug: 5668350
Change-Id: I777754f92e8da630ae3c09bb0d4c41884ff62f39
2011-12-02 13:55:57 -08:00
Doug Zongker
1030da2675 Merge "check entire recovery partition on startup" 2011-12-02 13:39:33 -08:00
Doug Zongker
0276d18873 check entire recovery partition on startup
Checksum the entire recovery partition at boot time to see if we need
to rewrite it, rather than just the first 2kb.

Bug: 5668350
Change-Id: I777754f92e8da630ae3c09bb0d4c41884ff62f39
2011-12-02 10:46:59 -08:00
Ying Wang
99bcbeb355 Print more info of the image size stats.
Bug: 5620615
Before this change it only reports the limit if the real size exceeeds
or approaches the limit.

Change-Id: Ie1737d6ba2dc2d57ad82c487990e109882526d6e
2011-12-02 10:34:45 -08:00
The Android Automerger
16da7247aa IML63 2011-12-02 10:27:28 -08:00
The Android Automerger
a214e6f5e8 merge in ics-mr1-release history after reset to ics-mr1 2011-12-02 10:24:07 -08:00
The Android Open Source Project
6f219744d8 Reconcile with ics-mr1-release
Change-Id: I7652f038082b7a8de4a210854f755c3127f3370a
2011-12-02 07:52:57 -08:00
Scott Main
28d831ee52 am d34204b9: am b83d8f15: am f5cbe002: Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add
* commit 'd34204b9ec3e79862f5101837ccc6f90909b9850':
  docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
2011-12-01 20:44:25 -08:00
Scott Main
d34204b9ec am b83d8f15: am f5cbe002: Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/
* commit 'b83d8f15ccc276b190a6c02002f6af94aa2e9cb4':
  docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
2011-12-01 20:42:55 -08:00
Scott Main
b83d8f15cc am f5cbe002: Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous link
* commit 'f5cbe0024328f6d716dc13b8a836f058c9c74c64':
  docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button.
2011-12-01 20:40:59 -08:00
Scott Main
f5cbe00243 Merge "docs: update template and css for android u Add a custom version of docpage.cs to the droiddoc template, because it adds a good deal of custom design and behavior (instead of updating the doclava version of the file). Add CSS for next/previous links in android u lessons and revise style for download button." into ics-mr0 2011-12-01 20:39:29 -08:00
The Android Automerger
f63cb4f0d0 IML62B 2011-12-01 16:47:38 -08:00
The Android Automerger
c422e6e0b9 merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 16:45:02 -08:00
The Android Automerger
c8f87721ba IML62 2011-12-01 06:48:19 -08:00
The Android Automerger
8edea4c3a6 merge in ics-mr1-release history after reset to ics-mr1 2011-12-01 06:45:22 -08:00
Scott Main
adc61d6a0e docs: update template and css for android u
Add a custom version of docpage.cs to the droiddoc template, because
it adds a good deal of custom design and behavior (instead of updating
the doclava version of the file). Add CSS for next/previous links in
android u lessons and revise style for download button.

Change-Id: I829c4fb134d6f5c3cee82fb86958d23ef64e8481
2011-11-30 18:55:01 -08:00
The Android Automerger
bf14d43c4d IML61B 2011-11-30 16:59:51 -08:00
Alon Albert
6a9024ed0a Merge "Add support for building specific modules with mmm using the following syntax: Build all modules: mmm dir Build a single module: mmm dir:module Build multiple modules: mmm dir:module1,module2 Or in other words:" 2011-11-30 13:04:32 -08:00
The Android Open Source Project
df8e43494e Reconcile with ics-mr1-release
Change-Id: I91cfa5357d3530b04123a4faf703598994b2ed5a
2011-11-30 12:55:27 -08:00
Alon Albert
68895a9699 Add support for building specific modules with mmm using the following syntax:
Build all modules:       mmm dir
Build a single module:   mmm dir:module
Build multiple modules:  mmm dir:module1,module2
Or in other words:

Change-Id: If32770c19f03a4d460f32046a3dd06656e33ee11
2011-11-30 12:40:19 -08:00
Marius Renn
33abebcc3f am f945235a: am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1
* commit 'f945235a8adc6b163a0e46941791bb305ef37034':
  Google Add-On API Documentation Fixes (5429077)
2011-11-30 10:51:17 -08:00
Jean-Baptiste Queru
26dea7a3e2 am 8dd412a9: Merge from AOSP
* commit '8dd412a900c73144b0d868e3e872938052071d95':
  English must be the first language specified
2011-11-30 10:51:12 -08:00
Marius Renn
f945235a8a am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1
* commit '72db32c744744ae1ace26830ecce968b6a95e173':
  Google Add-On API Documentation Fixes (5429077)
2011-11-30 09:53:05 -08:00
Marius Renn
72db32c744 Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1 2011-11-30 09:51:17 -08:00
Jean-Baptiste Queru
8dd412a900 Merge from AOSP
Change-Id: I992d4a0baefc08e105f76b7e6f6950516047670a
2011-11-30 07:26:18 -08:00
The Android Automerger
b1cb2404f5 IML61 2011-11-30 06:48:37 -08:00
The Android Automerger
2ca7547d90 merge in ics-mr1-release history after reset to ics-mr1 2011-11-30 06:45:15 -08:00
The Android Automerger
b3e5a0ec1c IML60C 2011-11-29 17:08:24 -08:00
Bruce Beare
37db6cf627 English must be the first language specified
The first language specified in PRODUCT_LOCALS is the default.

Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-11-29 15:46:28 -08:00
The Android Automerger
71a53c5328 IML60B 2011-11-29 15:28:27 -08:00
The Android Automerger
fad12ed790 IML60 2011-11-29 12:05:06 -08:00
The Android Automerger
158cf177dc merge in ics-mr1-release history after reset to ics-mr1 2011-11-29 12:02:12 -08:00
Ying Wang
b50bd7f009 Move the prebuilt NDKs to their own git project prebuilts/ndk/.
Change-Id: If85986da436d412cff139af1fd8426e420bec121
2011-11-29 11:20:16 -08:00
Ying Wang
9978faf8f5 Move prebuilt SDKs to their own git project.
Change-Id: Ie6e9614e43bf82b8dd1f8702968be40cfb76b6c5
2011-11-29 10:24:27 -08:00
The Android Open Source Project
e296b937d4 am d719f6a8: am c99c8c08: Reconcile with ics-mr0-release
* commit 'd719f6a81bc285b437c1babd8f8443d115b0833c':
  ICL53C
2011-11-29 07:58:17 -08:00