Commit graph

7013 commits

Author SHA1 Message Date
Vladimir Chtchetkine
6a9f87fefd am 2cbcd24b: Cherry-picked from e6b969f3b in master. Do not merge.
* commit '2cbcd24ba708be5e387b8bf54351f5c2df7abbec':
  Cherry-picked from e6b969f3b in master. Do not merge.
2012-01-10 16:42:45 -08:00
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
2185e61343 am 9a46327e: increment version to 4.0.4
* commit '9a46327e123360490801d0dde95fc94e437e1e73':
  increment version to 4.0.4
2012-01-04 16:37:44 -08:00
Ed Heyl
9a46327e12 increment version to 4.0.4
Change-Id: I156516aedb714f589bd0ae2d39bc9e273b775276
2012-01-04 16:34:18 -08:00
Nick Sanders
7d2ba7cff7 Add default kernel and base for factory ramdisk.
factory_ramdisk.img now is a real u-boot img containing
a kernel and memory offset metadata.

Change-Id: I9b4624eab8a6f769bb8bf0568484ee1865267c08
2012-01-03 13:30:30 -08:00
Ying Wang
a66c512208 Remove the restriction that PHONY_PACKAGE needs LOCAL_REQUIRED_MODULES
Change-Id: I19a285234f1ddcac5e59312b9164026547652053
2011-12-22 17:40:05 -08:00
Ying Wang
14eeea6708 We should include factory ramdisk if one shot makefile is NOT defined.
Change-Id: I92c7f26d13a05c4306c22b2e9e513cdd22e839ce
2011-12-21 18:54:36 -08:00
Ying Wang
9d5e83d331 Disable factory ramdisk if build with mm/mmm
Because factory ramdisk build depends on the global view of all modules.

Change-Id: I51de434e7800ac6e55b0eeca9394361e5e14cd55
2011-12-21 16:21:42 -08:00
Ying Wang
c16dbcd8c8 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
2011-12-21 11:30:59 -08:00
Ying Wang
fc444cf7df Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES
If there is shared library with the same name.

Change-Id: I6c18ffc2a6c1f6d5b6468677cc420be817ea950d
2011-12-20 17:25:31 -08:00
Ying Wang
0a099d904a 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
2011-12-16 11:33:01 -08:00
Scott Main
92c32ea079 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
2011-12-15 20:10:53 -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
02f547834a am 0af80fb4: am 0f429ebe: docs: fix bug in script for tab cookies
* commit '0af80fb409708d86b360e842bc834b3cbe4bc443':
  docs: fix bug in script for tab cookies
2011-12-15 19:16:20 -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
9dd47277a3 am 9839afdd: am 1d42360a: docs: style and script changes for android u classes
* commit '9839afddfcade4db1989718216b592aed76e73e7':
  docs: style and script changes for android u classes
2011-12-15 17:39:50 -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
f098c807d0 am fea66cee: Merge "Build Support for CTS Native Tests" into ics-mr1
* commit 'fea66cee1cd661b6bf8ead1988cf008fa61b01a7':
  Build Support for CTS Native Tests
2011-12-14 15:33:33 -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
2c58241143 am 615d2ffa: Enable the OpenGL View renderer on the emulator
* commit '615d2ffa926d03ba44fbc58b4593ce96ef831783':
  Enable the OpenGL View renderer on the emulator
2011-12-12 18:09:44 -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
d0d02f4f19 am 91789538: Reconcile with ics-mr0-release
* commit '917895384fb7c9fb9ca858fdf792ec165e151de9':
  ICL53F
2011-12-08 10:27:17 -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
ab7707b7ca 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.
2011-12-07 11:04:02 -08:00
The Android Open Source Project
631792909d am febd861a: Reconcile with ics-mr0-release
* commit 'febd861a073b0500b6e7f0ea117b71df3bc6822c':
  ICL53E
2011-12-07 11:03:46 -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
111748ab45 am aac7b445: Reconcile with ics-mr0-release
* commit 'aac7b4455a4dbfab5a136628864789eba8a31bb0':
  ICL53D
2011-12-07 09:27:44 -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
dfe9fa5090 am bd2dadc2: check entire recovery partition on startup
* commit 'bd2dadc21a5db967972a7b8f81aad716609edacb':
  check entire recovery partition on startup
2011-12-02 13:58:17 -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
148588b4de 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:43:02 -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
6c33b94c48 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:54:25 -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
e14698cd12 am c99c8c08: Reconcile with ics-mr0-release
* commit 'c99c8c081467085c548edf03cbc1500ba3852b44':
  ICL53C
2011-11-29 07:56:26 -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
5c0c741f2a 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.
2011-11-28 14:27:14 -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