OSDN Git Service

android-x86/build.git
12 years agoRemove the restriction that PHONY_PACKAGE needs LOCAL_REQUIRED_MODULES
Ying Wang [Fri, 23 Dec 2011 01:40:05 +0000 (17:40 -0800)]
Remove the restriction that PHONY_PACKAGE needs LOCAL_REQUIRED_MODULES

Change-Id: I19a285234f1ddcac5e59312b9164026547652053

12 years agoWe should include factory ramdisk if one shot makefile is NOT defined.
Ying Wang [Thu, 22 Dec 2011 02:54:36 +0000 (18:54 -0800)]
We should include factory ramdisk if one shot makefile is NOT defined.

Change-Id: I92c7f26d13a05c4306c22b2e9e513cdd22e839ce

12 years agoDisable factory ramdisk if build with mm/mmm
Ying Wang [Thu, 22 Dec 2011 00:20:12 +0000 (16:20 -0800)]
Disable factory ramdisk if build with mm/mmm

Because factory ramdisk build depends on the global view of all modules.

Change-Id: I51de434e7800ac6e55b0eeca9394361e5e14cd55

12 years agoFix multiple modules with the same name in FACTORY_RAMDISK_MODULES
Ying Wang [Wed, 21 Dec 2011 19:30:59 +0000 (11:30 -0800)]
Fix multiple modules with the same name in FACTORY_RAMDISK_MODULES

With this change, if a module name is associated with multiple modules,
you can specify multiple install paths in
PRODUCT_FACTORY_RAMDISK_MODULES.
For example, if we have 2 modules named "foo", one is Java library and
the other is executable, then you can write:
PRODUCT_FACTORY_RAMDISK_MODULES += \
  foo:system/bin/foo:system/framework/foo.jar
Or:
PRODUCT_FACTORY_RAMDISK_MODULES += \
  foo:system/bin/foo \
  foo:system/framework/foo.jar

The build system will choose the correct built files based on the
install paths.

Change-Id: I6efc72e8abd1e81710ada16731b6792989aefd85

12 years agoFilter out static library in PRODUCT_FACTORY_RAMDISK_MODULES
Ying Wang [Wed, 21 Dec 2011 01:25:31 +0000 (17:25 -0800)]
Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES

If there is shared library with the same name.

Change-Id: I6c18ffc2a6c1f6d5b6468677cc420be817ea950d

12 years agoSupport to build factory ramdisk image.
Ying Wang [Fri, 16 Dec 2011 19:27:52 +0000 (11:27 -0800)]
Support to build factory ramdisk image.

Bug: 5769921

With this change, to build factory_ramdisk.img, set
PRODUCT_FACTORY_RAMDISK_MODULES in your product config.
PRODUCT_FACTORY_RAMDISK_MODULES consists of
"<module_name>:<install_path>" pairs.
<install_path> is relative to the root of the factory ramdisk output.
For example:
PRODUCT_FACTORY_RAMDISK_MODULES := \
    toolbox:bin/toolbox adbd:sbin/adbd adb:bin/adb

On the other hand you can use PRODUCT_COPY_FILES to copy prebuilt files
to the factory ramdisk.
Or you can define modules that are specific for the factory ramdisk
(with LOCAL_MODULE_PATH pointing to TARGET_FACTORY_RAMDISK_OUT) and add
the module names to PRODUCT_PACKAGES.

Change-Id: I3778e3d091979261cb476628da1365f931e11f49

12 years agoam c4e8801c: am 50d6f97c: docs: revise space wrapping to avoid "new" tags from breaki...
Scott Main [Fri, 16 Dec 2011 04:10:53 +0000 (20:10 -0800)]
am c4e8801c: am 50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix

* commit 'c4e8801c2d059aa68e59069c5cc03adb2d464e6b':
  docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix

12 years agoam 50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines...
Scott Main [Fri, 16 Dec 2011 04:09:04 +0000 (20:09 -0800)]
am 50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix

* commit '50d6f97c46934014894a43d3610029f579145713':
  docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix

12 years agodocs: revise space wrapping to avoid "new" tags from breaking new lines alone
Scott Main [Fri, 16 Dec 2011 04:06:32 +0000 (20:06 -0800)]
docs: revise space wrapping to avoid "new" tags from breaking new lines alone
Temp fix

Change-Id: If99ce3442ec179a46fe3bbe0a06f690527d05eb5

12 years agoam 0af80fb4: am 0f429ebe: docs: fix bug in script for tab cookies
Scott Main [Fri, 16 Dec 2011 03:16:20 +0000 (19:16 -0800)]
am 0af80fb4: am 0f429ebe: docs: fix bug in script for tab cookies

* commit '0af80fb409708d86b360e842bc834b3cbe4bc443':
  docs: fix bug in script for tab cookies

12 years agoam 0f429ebe: docs: fix bug in script for tab cookies
Scott Main [Fri, 16 Dec 2011 03:14:31 +0000 (19:14 -0800)]
am 0f429ebe: docs: fix bug in script for tab cookies

* commit '0f429ebe63acbf8ccc1efe3c4185151eb15a4783':
  docs: fix bug in script for tab cookies

12 years agodocs: fix bug in script for tab cookies
Scott Main [Fri, 16 Dec 2011 03:12:17 +0000 (19:12 -0800)]
docs: fix bug in script for tab cookies

Change-Id: I09a49764f66673b3f55032158efd44c228832e8f

12 years agoam 9839afdd: am 1d42360a: docs: style and script changes for android u classes
Scott Main [Fri, 16 Dec 2011 01:39:50 +0000 (17:39 -0800)]
am 9839afdd: am 1d42360a: docs: style and script changes for android u classes

* commit '9839afddfcade4db1989718216b592aed76e73e7':
  docs: style and script changes for android u classes

12 years agoam 1d42360a: docs: style and script changes for android u classes
Scott Main [Fri, 16 Dec 2011 01:37:35 +0000 (17:37 -0800)]
am 1d42360a: docs: style and script changes for android u classes

* commit '1d42360a028b2d55f6d4d29bd99e8ef3de6e8402':
  docs: style and script changes for android u classes

12 years agodocs: style and script changes for android u classes
Scott Main [Fri, 16 Dec 2011 01:34:40 +0000 (17:34 -0800)]
docs: style and script changes for android u classes

Change-Id: I5866541bb9dd41329aa02328b805959c8f675f8c

12 years agoam fea66cee: Merge "Build Support for CTS Native Tests" into ics-mr1
Brian Muramatsu [Wed, 14 Dec 2011 23:33:33 +0000 (15:33 -0800)]
am fea66cee: Merge "Build Support for CTS Native Tests" into ics-mr1

* commit 'fea66cee1cd661b6bf8ead1988cf008fa61b01a7':
  Build Support for CTS Native Tests

12 years agoMerge "Build Support for CTS Native Tests" into ics-mr1
Brian Muramatsu [Wed, 14 Dec 2011 23:31:35 +0000 (15:31 -0800)]
Merge "Build Support for CTS Native Tests" into ics-mr1

12 years agoBuild Support for CTS Native Tests
Brian Muramatsu [Tue, 13 Dec 2011 07:54:49 +0000 (23:54 -0800)]
Build Support for CTS Native Tests

Bug 4970300

Adds two new variables, CTS_TEST_CASES and CTS_TEST_XMLS, to be read
from CtsTestCaseList.mk. The CTS_TEST_CASES variable can be used to
copy any sort of file to the repository/testcases CTS directory.
The CTS_TEST_XMLS variable can be used to inject test package xmls
from any source rather than relying upon the monolithic and
mostly serial buildCts.py script.

The existing CTS_CORE_CASE_LIST is coded to only support APKs, so
it could not be retrofitted to support native tests. However, the
two new variables can do even more than CTS_CORE_CASE_LIST due to
their generality. In the future, the idea is move away from
CTS_CORE_CASE_LIST and also generate XMLs using separate tools
rather than just buildCts.py.

Change-Id: Ib52722861c37e0f4d511f9041928395bcaba5dea

12 years agoam 615d2ffa: Enable the OpenGL View renderer on the emulator
Jesse Hall [Tue, 13 Dec 2011 02:09:44 +0000 (18:09 -0800)]
am 615d2ffa: Enable the OpenGL View renderer on the emulator

* commit '615d2ffa926d03ba44fbc58b4593ce96ef831783':
  Enable the OpenGL View renderer on the emulator

12 years agoEnable the OpenGL View renderer on the emulator
Jesse Hall [Thu, 1 Dec 2011 19:45:49 +0000 (11:45 -0800)]
Enable the OpenGL View renderer on the emulator

If the emulator is run without GL acceleration enabled, the OpenGL
renderer will disable itself at runtime.

Change-Id: Ie40c7895120f51bb6a817c2f3cf7fab0a3dda292

12 years agoam 91789538: Reconcile with ics-mr0-release
The Android Open Source Project [Thu, 8 Dec 2011 18:27:17 +0000 (10:27 -0800)]
am 91789538: Reconcile with ics-mr0-release

* commit '917895384fb7c9fb9ca858fdf792ec165e151de9':
  ICL53F

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Thu, 8 Dec 2011 18:25:56 +0000 (10:25 -0800)]
Reconcile with ics-mr0-release

Change-Id: I7b413162b41b52be626b4ebc5c3f3ea37fdc6288

12 years agoICL53F
The Android Automerger [Thu, 8 Dec 2011 00:42:26 +0000 (16:42 -0800)]
ICL53F

12 years agoam e73b24cc: Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
Dianne Hackborn [Wed, 7 Dec 2011 19:04:02 +0000 (11:04 -0800)]
am e73b24cc: Did I say 4.1?  Oh well what I *really* meant was 4.0.3, of course.

* commit 'e73b24ccbe728476e5bc77aaf2fd6865276cacc3':
  Did I say 4.1?  Oh well what I *really* meant was 4.0.3, of course.

12 years agoam febd861a: Reconcile with ics-mr0-release
The Android Open Source Project [Wed, 7 Dec 2011 19:03:46 +0000 (11:03 -0800)]
am febd861a: Reconcile with ics-mr0-release

* commit 'febd861a073b0500b6e7f0ea117b71df3bc6822c':
  ICL53E

12 years agoDid I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
Dianne Hackborn [Tue, 6 Dec 2011 02:14:12 +0000 (18:14 -0800)]
Did I say 4.1?  Oh well what I *really* meant was 4.0.3, of course.

Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246

12 years agoam aac7b445: Reconcile with ics-mr0-release
The Android Open Source Project [Wed, 7 Dec 2011 17:27:44 +0000 (09:27 -0800)]
am aac7b445: Reconcile with ics-mr0-release

* commit 'aac7b4455a4dbfab5a136628864789eba8a31bb0':
  ICL53D

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Wed, 7 Dec 2011 15:24:51 +0000 (07:24 -0800)]
Reconcile with ics-mr0-release

Change-Id: Ifdc1b145e1f778260a1445c954ea2e7848e67c19

12 years agoICL53E
The Android Automerger [Tue, 6 Dec 2011 22:23:43 +0000 (14:23 -0800)]
ICL53E

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Tue, 6 Dec 2011 16:56:01 +0000 (08:56 -0800)]
Reconcile with ics-mr0-release

Change-Id: I224ac8e665f91c64935f7a20397b925aba767994

12 years agoICL53D
The Android Automerger [Tue, 6 Dec 2011 13:23:26 +0000 (05:23 -0800)]
ICL53D

12 years agoam bd2dadc2: check entire recovery partition on startup
Doug Zongker [Fri, 2 Dec 2011 21:58:17 +0000 (13:58 -0800)]
am bd2dadc2: check entire recovery partition on startup

* commit 'bd2dadc21a5db967972a7b8f81aad716609edacb':
  check entire recovery partition on startup

12 years agocheck entire recovery partition on startup
Doug Zongker [Fri, 2 Dec 2011 18:46:59 +0000 (10:46 -0800)]
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

12 years agoam b83d8f15: am f5cbe002: Merge "docs: update template and css for android u Add...
Scott Main [Fri, 2 Dec 2011 04:43:02 +0000 (20:43 -0800)]
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.

12 years agoam f5cbe002: Merge "docs: update template and css for android u Add a custom version...
Scott Main [Fri, 2 Dec 2011 04:40:59 +0000 (20:40 -0800)]
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.

12 years agoMerge "docs: update template and css for android u Add a custom version of docpage...
Scott Main [Fri, 2 Dec 2011 04:39:29 +0000 (20:39 -0800)]
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

12 years agodocs: update template and css for android u
Scott Main [Thu, 1 Dec 2011 02:55:01 +0000 (18:55 -0800)]
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

12 years agoam 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1
Marius Renn [Wed, 30 Nov 2011 17:54:25 +0000 (09:54 -0800)]
am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1

* commit '72db32c744744ae1ace26830ecce968b6a95e173':
  Google Add-On API Documentation Fixes (5429077)

12 years agoMerge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1
Marius Renn [Wed, 30 Nov 2011 17:51:17 +0000 (09:51 -0800)]
Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1

12 years agoam c99c8c08: Reconcile with ics-mr0-release
The Android Open Source Project [Tue, 29 Nov 2011 15:56:26 +0000 (07:56 -0800)]
am c99c8c08: Reconcile with ics-mr0-release

* commit 'c99c8c081467085c548edf03cbc1500ba3852b44':
  ICL53C

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Tue, 29 Nov 2011 15:54:00 +0000 (07:54 -0800)]
Reconcile with ics-mr0-release

Change-Id: I612e5d0bd573f86dd61cbe0b47d0b691973539a5

12 years agoam 3997910e: am 5dd51bde: Build fix - include sdk/lint in build. do not merge.
Tor Norbye [Mon, 28 Nov 2011 22:27:14 +0000 (14:27 -0800)]
am 3997910e: am 5dd51bde: Build fix - include sdk/lint in build. do not merge.

* commit '3997910eeaff5a605f2f2968dd0c617dcd10183d':
  Build fix - include sdk/lint in build. do not merge.

12 years agoam 5dd51bde: Build fix - include sdk/lint in build. do not merge.
Tor Norbye [Mon, 28 Nov 2011 21:37:17 +0000 (13:37 -0800)]
am 5dd51bde: Build fix - include sdk/lint in build. do not merge.

* commit '5dd51bde0b0b4a8ca6d1b6a8da1f6739197999a2':
  Build fix - include sdk/lint in build. do not merge.

12 years agoBuild fix - include sdk/lint in build. do not merge.
Tor Norbye [Fri, 21 Oct 2011 02:18:15 +0000 (19:18 -0700)]
Build fix - include sdk/lint in build. do not merge.

(cherry picked from commit 4377cc701a0bef32aaff34d0d119974544fd20d6)

Change-Id: I28dd89ad6471c82d344ecf88cecb2b96361b2050

12 years agoICL53C
The Android Automerger [Sat, 26 Nov 2011 20:29:48 +0000 (12:29 -0800)]
ICL53C

12 years agoGoogle Add-On API Documentation Fixes (5429077)
Marius Renn [Thu, 24 Nov 2011 02:02:46 +0000 (18:02 -0800)]
Google Add-On API Documentation Fixes (5429077)

We no longer want a reference directory, but rather
maps_api and effects_api directories.

Change-Id: I72b3a342d0871ec4cf7010be0d2b6486ca83571b

12 years agoam 070e712f: Reconcile with ics-mr0-release ics-factoryrom-2-release
The Android Open Source Project [Wed, 23 Nov 2011 17:24:46 +0000 (09:24 -0800)]
am 070e712f: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit '070e712fb3037b28e81340eb2e4fb53d1539130d':
  ITL41G
  ICL53B

12 years agoReconcile with ics-mr0-release ics-factoryrom-2-release
The Android Open Source Project [Wed, 23 Nov 2011 17:23:46 +0000 (09:23 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: Ie10ba0ee48e3f7230c8613b63a6d9b1856b260c6

12 years agoITL41G
The Android Automerger [Wed, 23 Nov 2011 05:50:14 +0000 (21:50 -0800)]
ITL41G

12 years agoICL53B
The Android Automerger [Wed, 23 Nov 2011 00:14:07 +0000 (16:14 -0800)]
ICL53B

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 23 Nov 2011 00:13:00 +0000 (16:13 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam 24215999: Reconcile with ics-mr0-release
The Android Open Source Project [Tue, 22 Nov 2011 23:26:13 +0000 (15:26 -0800)]
am 24215999: Reconcile with ics-mr0-release

* commit '24215999d0a9d603aeea3c88ceedfb8e36fcf947':
  ICL53

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Tue, 22 Nov 2011 23:23:59 +0000 (15:23 -0800)]
Reconcile with ics-mr0-release

Change-Id: I3797edc6648a93700423b6ad4fb50d2e36c62bfc

12 years agoICL53
The Android Automerger [Tue, 22 Nov 2011 22:29:10 +0000 (14:29 -0800)]
ICL53

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 22 Nov 2011 22:26:36 +0000 (14:26 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam 5cd44bd3: Reconcile with ics-mr0-release ics-factoryrom-2-release
The Android Open Source Project [Tue, 22 Nov 2011 21:22:34 +0000 (13:22 -0800)]
am 5cd44bd3: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit '5cd44bd38f4d2158758a97e8a871a3b9cd6b6b37':
  ITL41F
  ITL41E
  ICL52
  ICL49B

12 years agoReconcile with ics-mr0-release ics-factoryrom-2-release
The Android Open Source Project [Tue, 22 Nov 2011 21:19:59 +0000 (13:19 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: Ie25ab898e849e7d52c08796cd7f1bea6f12d6bd1

12 years agoITL41F
The Android Automerger [Tue, 22 Nov 2011 01:40:35 +0000 (17:40 -0800)]
ITL41F

12 years agoITL41E
The Android Automerger [Mon, 21 Nov 2011 21:41:52 +0000 (13:41 -0800)]
ITL41E

12 years agoICL52
The Android Automerger [Mon, 21 Nov 2011 21:08:17 +0000 (13:08 -0800)]
ICL52

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Mon, 21 Nov 2011 21:06:53 +0000 (13:06 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam bb0e59be: resolved conflicts for merge of aca203ff to ics-mr1
Bart Sears [Mon, 21 Nov 2011 16:31:50 +0000 (08:31 -0800)]
am bb0e59be: resolved conflicts for merge of aca203ff to ics-mr1

* commit 'bb0e59be7c01fd9eb85d81b92c0527bac5402d1d':
  ICS MR0.1 will be version 4.0.2 - do not merge

12 years agoresolved conflicts for merge of aca203ff to ics-mr1
Bart Sears [Mon, 21 Nov 2011 05:03:42 +0000 (21:03 -0800)]
resolved conflicts for merge of aca203ff to ics-mr1

Change-Id: Ib073a84132feb8eacaeb5af45ffa504102165149

12 years agoICS MR0.1 will be version 4.0.2 - do not merge
Bart Sears [Sat, 19 Nov 2011 00:39:59 +0000 (16:39 -0800)]
ICS MR0.1 will be version 4.0.2 - do not merge

Change-Id: I35db6befcdfc421da8eb959285e61856c7ed2826

12 years agoICL49B
The Android Automerger [Sat, 19 Nov 2011 06:02:22 +0000 (22:02 -0800)]
ICL49B

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 19 Nov 2011 06:00:45 +0000 (22:00 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam 1ca1730b: Reconcile with ics-mr0-release
The Android Open Source Project [Fri, 18 Nov 2011 23:51:12 +0000 (15:51 -0800)]
am 1ca1730b: Reconcile with ics-mr0-release

* commit '1ca1730b88e45d39c9211793d133cae148b134a1':
  ICL49

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Fri, 18 Nov 2011 23:49:35 +0000 (15:49 -0800)]
Reconcile with ics-mr0-release

Change-Id: I134c060024841405d83b92a700bfe05aeb5d86b5

12 years agoICL49
The Android Automerger [Fri, 18 Nov 2011 23:38:37 +0000 (15:38 -0800)]
ICL49

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Fri, 18 Nov 2011 23:36:30 +0000 (15:36 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam 409670e9: Reconcile with ics-mr0-release
The Android Open Source Project [Fri, 18 Nov 2011 21:14:14 +0000 (13:14 -0800)]
am 409670e9: Reconcile with ics-mr0-release

* commit '409670e9fa4131bed57a292b3a25180e4ac0709e':
  ICL48B

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Fri, 18 Nov 2011 21:12:21 +0000 (13:12 -0800)]
Reconcile with ics-mr0-release

Change-Id: I1a7eeaede99ffa7bb7f38ee419704ab9d1f2d834

12 years agoam 700b18cc: Merge "Add the support libraries to the platform documentation (build...
Svetoslav Ganov [Fri, 18 Nov 2011 18:13:49 +0000 (10:13 -0800)]
am 700b18cc: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1

* commit '700b18cc72e75737fa5cf79896c98f12003b7735':
  Add the support libraries to the platform documentation (build).

12 years agoMerge "Add the support libraries to the platform documentation (build)." into ics-mr1
Svetoslav Ganov [Fri, 18 Nov 2011 18:11:28 +0000 (10:11 -0800)]
Merge "Add the support libraries to the platform documentation (build)." into ics-mr1

12 years agoICL48B
The Android Automerger [Fri, 18 Nov 2011 01:50:39 +0000 (17:50 -0800)]
ICL48B

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Fri, 18 Nov 2011 01:47:41 +0000 (17:47 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoam 77b2771b: Reconcile with ics-mr0-release
The Android Open Source Project [Fri, 18 Nov 2011 00:03:53 +0000 (16:03 -0800)]
am 77b2771b: Reconcile with ics-mr0-release

* commit '77b2771bd2bc26aefdf9ff3a3d96b54799185917':
  ICL48

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Thu, 17 Nov 2011 23:36:45 +0000 (15:36 -0800)]
Reconcile with ics-mr0-release

Change-Id: I42fcd347d98058118f225dedd011cb2fac76bbb6

12 years agoAdd the support libraries to the platform documentation (build).
Svetoslav Ganov [Thu, 17 Nov 2011 23:13:49 +0000 (15:13 -0800)]
Add the support libraries to the platform documentation (build).

Added path to the support libraries.

bug: 5629339

Change-Id: Id414597046c528617313881ea857134512d1c2ba

12 years agoICL48
The Android Automerger [Thu, 17 Nov 2011 14:29:27 +0000 (06:29 -0800)]
ICL48

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Thu, 17 Nov 2011 14:27:12 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoRemove BUILT_TESTS_ZIP_PACKAGE's dependency on the image files
Ying Wang [Wed, 16 Nov 2011 19:56:30 +0000 (11:56 -0800)]
Remove BUILT_TESTS_ZIP_PACKAGE's dependency on the image files

Change-Id: I99baaeffe099e8fbb9789fb01b26a9a563e1e90d

12 years agoDon't build userdata.img for tests build.
Ying Wang [Wed, 16 Nov 2011 19:12:41 +0000 (11:12 -0800)]
Don't build userdata.img for tests build.

Change-Id: I2982223919267f7b98f47b002c435e443674729a

12 years agoam 44d7d24f: No-op merge from ics-mr0
The Android Open Source Project [Wed, 16 Nov 2011 17:13:36 +0000 (09:13 -0800)]
am 44d7d24f: No-op merge from ics-mr0

* commit '44d7d24f97f7de13a490ec3279f07e7af7bb98a5':

12 years agoNo-op merge from ics-mr0
The Android Open Source Project [Wed, 16 Nov 2011 17:10:21 +0000 (09:10 -0800)]
No-op merge from ics-mr0

Change-Id: Ibbdd04c5626976293b9e6170e9e1f844cb6582a5

12 years agoReconcile with ics-factoryrom-2-release
The Android Open Source Project [Wed, 16 Nov 2011 16:55:32 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release

Change-Id: I2059be2fb54d852023cb4e4b96493ff6a934ffe0

12 years agoam 88eff0cb: Reconcile with ics-mr0-release ics-factoryrom-2-release
The Android Open Source Project [Wed, 16 Nov 2011 15:38:39 +0000 (07:38 -0800)]
am 88eff0cb: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit '88eff0cb509bdd824c542b52880d9e93db4444a0':
  ICL47
  ICL46B
  ICL46
  ICL45B
  ICL45
  ICL44
  ITL41D
  ICL42C
  ICL42B
  ICL42
  ITL41C
  ITL41B
  ITL41
  ICL41

12 years agoReconcile with ics-mr0-release ics-factoryrom-2-release
The Android Open Source Project [Wed, 16 Nov 2011 15:33:52 +0000 (07:33 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: I76232373a2c25c0e18c27672ede2bb1b281e43f6

12 years agoICL47
The Android Automerger [Wed, 16 Nov 2011 14:28:22 +0000 (06:28 -0800)]
ICL47

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 16 Nov 2011 14:27:06 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoICL46B
The Android Automerger [Wed, 16 Nov 2011 03:09:18 +0000 (19:09 -0800)]
ICL46B

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 16 Nov 2011 03:07:30 +0000 (19:07 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoICL46
The Android Automerger [Tue, 15 Nov 2011 14:28:19 +0000 (06:28 -0800)]
ICL46

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 15 Nov 2011 14:27:08 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoICL45B
The Android Automerger [Tue, 15 Nov 2011 01:14:35 +0000 (17:14 -0800)]
ICL45B

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 15 Nov 2011 01:10:28 +0000 (17:10 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoICL45
The Android Automerger [Mon, 14 Nov 2011 14:28:30 +0000 (06:28 -0800)]
ICL45

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Mon, 14 Nov 2011 14:27:06 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0

12 years agoICL44
The Android Automerger [Sun, 13 Nov 2011 14:28:49 +0000 (06:28 -0800)]
ICL44

12 years agomerge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 13 Nov 2011 14:27:17 +0000 (06:27 -0800)]
merge in ics-mr0-release history after reset to ics-mr0