Commit Graph

6812 Commits

Author SHA1 Message Date
Vladimir Chtchetkine 2cbcd24ba7 Cherry-picked from e6b969f3b in master. Do not merge.
Add boot property enabling ADBD over QEMU

Emulator and system image now support ADBD communication over QEMUD pipe rather
than over a TCP port forwarding. However, emulator has to know ahead of time
(before system starts booting) whether or not the system image supports ADBD
over pipe to properly setup the communication. For that, we introduce a boot
property "ro.adb.qemu" that is readable by the emulator early enough for the
proper ADB communication setup.

Change-Id: I978489c5acf46177b520e775d745bcc78f469837
2012-01-10 16:31:08 -08:00
Ed Heyl 9a46327e12 increment version to 4.0.4
Change-Id: I156516aedb714f589bd0ae2d39bc9e273b775276
2012-01-04 16:34:18 -08:00
Scott Main c4e8801c2d 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
2011-12-15 20:09:04 -08:00
Scott Main 50d6f97c46 docs: revise space wrapping to avoid "new" tags from breaking new lines alone
Temp fix

Change-Id: If99ce3442ec179a46fe3bbe0a06f690527d05eb5
2011-12-15 20:06:32 -08:00
Scott Main 0af80fb409 am 0f429ebe: docs: fix bug in script for tab cookies
* commit '0f429ebe63acbf8ccc1efe3c4185151eb15a4783':
  docs: fix bug in script for tab cookies
2011-12-15 19:14:31 -08:00
Scott Main 0f429ebe63 docs: fix bug in script for tab cookies
Change-Id: I09a49764f66673b3f55032158efd44c228832e8f
2011-12-15 19:12:17 -08:00
Scott Main 9839afddfc am 1d42360a: docs: style and script changes for android u classes
* commit '1d42360a028b2d55f6d4d29bd99e8ef3de6e8402':
  docs: style and script changes for android u classes
2011-12-15 17:37:35 -08:00
Scott Main 1d42360a02 docs: style and script changes for android u classes
Change-Id: I5866541bb9dd41329aa02328b805959c8f675f8c
2011-12-15 17:34:40 -08:00
Brian Muramatsu fea66cee1c Merge "Build Support for CTS Native Tests" into ics-mr1 2011-12-14 15:31:35 -08:00
Brian Muramatsu 237fa07339 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
2011-12-13 14:14:36 -08:00
Jesse Hall 615d2ffa92 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
2011-12-12 10:07:04 -08:00
The Android Open Source Project 917895384f Reconcile with ics-mr0-release
Change-Id: I7b413162b41b52be626b4ebc5c3f3ea37fdc6288
2011-12-08 10:25:56 -08:00
The Android Automerger 69dbcc9ad7 ICL53F 2011-12-07 16:42:26 -08:00
Dianne Hackborn e73b24ccbe Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246
2011-12-07 10:30:19 -08:00
The Android Open Source Project febd861a07 Reconcile with ics-mr0-release
Change-Id: Ifdc1b145e1f778260a1445c954ea2e7848e67c19
2011-12-07 07:24:51 -08:00
The Android Automerger 95cc5765a8 ICL53E 2011-12-06 14:23:43 -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
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
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
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
Marius Renn 72db32c744 Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1 2011-11-30 09:51:17 -08:00
The Android Open Source Project c99c8c0814 Reconcile with ics-mr0-release
Change-Id: I612e5d0bd573f86dd61cbe0b47d0b691973539a5
2011-11-29 07:54:00 -08:00
Tor Norbye 3997910eea am 5dd51bde: Build fix - include sdk/lint in build. do not merge.
* commit '5dd51bde0b0b4a8ca6d1b6a8da1f6739197999a2':
  Build fix - include sdk/lint in build. do not merge.
2011-11-28 13:37:17 -08:00
Tor Norbye 5dd51bde0b Build fix - include sdk/lint in build. do not merge.
(cherry picked from commit 4377cc701a)

Change-Id: I28dd89ad6471c82d344ecf88cecb2b96361b2050
2011-11-28 13:07:53 -08:00
The Android Automerger 9101da9742 ICL53C 2011-11-26 12:29:48 -08:00
Marius Renn b1df701ed8 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
2011-11-23 18:08:51 -08:00
The Android Open Source Project 070e712fb3 Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ie10ba0ee48e3f7230c8613b63a6d9b1856b260c6
2011-11-23 09:23:46 -08:00
The Android Automerger 4e776f342a ITL41G 2011-11-22 21:50:14 -08:00
The Android Automerger 13315dd2ca ICL53B 2011-11-22 16:14:07 -08:00
The Android Automerger 28693b2b04 merge in ics-mr0-release history after reset to ics-mr0 2011-11-22 16:13:00 -08:00
The Android Open Source Project 24215999d0 Reconcile with ics-mr0-release
Change-Id: I3797edc6648a93700423b6ad4fb50d2e36c62bfc
2011-11-22 15:23:59 -08:00
The Android Automerger 54aa08fdbb ICL53 2011-11-22 14:29:10 -08:00
The Android Automerger fee376bcd6 merge in ics-mr0-release history after reset to ics-mr0 2011-11-22 14:26:36 -08:00
The Android Open Source Project 5cd44bd38f Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: Ie25ab898e849e7d52c08796cd7f1bea6f12d6bd1
2011-11-22 13:19:59 -08:00
The Android Automerger 3538ad9af2 ITL41F 2011-11-21 17:40:35 -08:00
The Android Automerger eb3f2c1c08 ITL41E 2011-11-21 13:41:52 -08:00
The Android Automerger 0d2a077ab0 ICL52 2011-11-21 13:08:17 -08:00
The Android Automerger 104cca7377 merge in ics-mr0-release history after reset to ics-mr0 2011-11-21 13:06:53 -08:00
Bart Sears bb0e59be7c resolved conflicts for merge of aca203ff to ics-mr1
Change-Id: Ib073a84132feb8eacaeb5af45ffa504102165149
2011-11-20 21:11:32 -08:00
Bart Sears aca203ffb6 ICS MR0.1 will be version 4.0.2 - do not merge
Change-Id: I35db6befcdfc421da8eb959285e61856c7ed2826
2011-11-19 17:52:21 -08:00
The Android Automerger 886cfbff0e ICL49B 2011-11-18 22:02:22 -08:00
The Android Automerger ca93af6ab1 merge in ics-mr0-release history after reset to ics-mr0 2011-11-18 22:00:45 -08:00
The Android Open Source Project 1ca1730b88 Reconcile with ics-mr0-release
Change-Id: I134c060024841405d83b92a700bfe05aeb5d86b5
2011-11-18 15:49:35 -08:00
The Android Automerger 4c38d0cc8f ICL49 2011-11-18 15:38:37 -08:00
The Android Automerger 2cec7c9554 merge in ics-mr0-release history after reset to ics-mr0 2011-11-18 15:36:30 -08:00
The Android Open Source Project 409670e9fa Reconcile with ics-mr0-release
Change-Id: I1a7eeaede99ffa7bb7f38ee419704ab9d1f2d834
2011-11-18 13:12:21 -08:00
Svetoslav Ganov 700b18cc72 Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 2011-11-18 10:11:28 -08:00
The Android Automerger 03fa097654 ICL48B 2011-11-17 17:50:39 -08:00