Commit Graph

7632 Commits

Author SHA1 Message Date
The Android Open Source Project 0c357453ff am a4b72c9f: Reconcile with ics-mr1-release
* commit 'a4b72c9fe4ea6e984440d67538eee26fdb140d8d':
  IML81
2011-12-21 07:21:38 -08:00
The Android Open Source Project a4b72c9fe4 Reconcile with ics-mr1-release
Change-Id: Idb5f4da7a973995eafb7233d864c0cf379e35db7
2011-12-21 07:19:13 -08:00
Ying Wang a729528651 Merge "Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES" 2011-12-20 17:36:42 -08:00
Ying Wang 0d75a0a54c Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES
If there is shared library with the same name.

Change-Id: Iaa43219cab7737c02a79d168f13ad4c473421f24
2011-12-20 17:36:26 -08:00
The Android Automerger 457b7f38a5 IML81 2011-12-20 17:29:41 -08:00
The Android Automerger ce37741314 merge in ics-mr1-release history after reset to ics-mr1 2011-12-20 17:26:02 -08:00
The Android Open Source Project be47fc177d am b08c5647: Reconcile with ics-mr1-release
* commit 'b08c5647a42d07d905823ccf2a88a3a8051af006':
  IML77B
  IML77
2011-12-20 13:09:52 -08:00
The Android Open Source Project b08c5647a4 Reconcile with ics-mr1-release
Change-Id: I3624715f06ac682520676b2e6d45a29e1d20b1d9
2011-12-20 13:08:24 -08:00
Raphael 76bf62d75e Allow make 3.82 to be used under Cygwin 1.7
OTOH, should we just allow the expression to be >= 3.81
for all platforms? For cygwin it's a specific case since
we don't build the platform, only a handful set of tools
and it works just fine with a newer make 3.82.

Change-Id: Icff0d0e13bce79f7164007985f14db56e9049552
2011-12-19 13:39:51 -08:00
Raphael 0ae6d29568 Add 2 SDK directories that can build under Cygwin/Mingw
Change-Id: I020c2691d7d92a48bd406360e2752357ae79e3b0
2011-12-19 13:39:43 -08:00
Bruce Beare cf0b20413e am b056d71f: If setupwizard is disabled, don\'t force it to optional
* commit 'b056d71f79b717fb36d375e48c19509900f977d3':
  If setupwizard is disabled, don't force it to optional
2011-12-19 11:38:37 -08:00
Bruce Beare b056d71f79 If setupwizard is disabled, don't force it to optional
Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-19 09:51:40 -08:00
Glenn Kasten dd7fce30df Merge "Add libaudioutils" 2011-12-19 08:07:56 -08:00
The Android Automerger e521822eb2 IML77B 2011-12-17 17:30:21 -08:00
Ying Wang 4b9d4ea2e2 Merge "Collect the GPL source files." 2011-12-16 17:00:46 -08:00
Glenn Kasten d1ee208e4a Add libaudioutils
Change-Id: I8fe062e4a78d8db1ce0612bf7cb58dc021925810
2011-12-16 15:39:33 -08:00
Ying Wang 89686538d7 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: I80ff72606415cd74fe6f3bc93020a05d84e45b70
2011-12-16 13:54:10 -08:00
Ying Wang 1eed1cd429 Merge "Print out ignored PRODUCT_COPY_FILES" 2011-12-16 13:52:26 -08:00
Brian Muramatsu 5fc0057b7d Stop Building CTS VM Tests
Bug 5728172

The VM tests were used with the old test runner.

Change-Id: I7ba819a394bb9643f937240ebd315d7d7820a8bf
2011-12-16 13:07:15 -08:00
The Android Automerger cc8efd02cc IML77 2011-12-16 12:02:53 -08:00
The Android Automerger 16e1f203dd merge in ics-mr1-release history after reset to ics-mr1 2011-12-16 12:01:24 -08:00
Ying Wang 193010cc8f Print out ignored PRODUCT_COPY_FILES
So that people know their files are not really copied in accident.

Change-Id: I8fab920483230a9f349304dcbdb2fb9d60ee0215
2011-12-16 11:56:24 -08:00
Kenny Root 02687855ca Merge "Unset HAVE_TLS_REGISTER for ARMv5" 2011-12-16 09:27:17 -08:00
The Android Open Source Project b904ac2166 am 6c2c5d8e: Reconcile with ics-mr1-release
* commit '6c2c5d8eec5e140ebedee7330988015df6aeb8bc':
  IML74K
  IML74J
  IML74I
  IML74H
  IML75
2011-12-16 08:09:52 -08:00
The Android Open Source Project 6c2c5d8eec Reconcile with ics-mr1-release
Change-Id: I4efd2763f8ae4da60277edc110ff8649869a35e7
2011-12-16 08:07:59 -08:00
The Android Automerger a9819e2ff1 IML74K 2011-12-16 00:15:10 -08:00
The Android Automerger e9db408701 IML74J 2011-12-15 21:43:32 -08:00
The Android Automerger b7ae1edc6b IML74I 2011-12-15 20:50:23 -08:00
The Android Automerger d1e01804de merge in ics-mr1-release history after reset to ics-mr1 2011-12-15 20:49:52 -08:00
The Android Automerger 61a6402f08 IML74H 2011-12-15 20:18:19 -08:00
Scott Main c5360c4035 am 96f696d9: am c4e8801c: am 50d6f97c: docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
* commit '96f696d90176b53c6902455b270960dd88ca1c1a':
  docs: revise space wrapping to avoid "new" tags from breaking new lines alone Temp fix
2011-12-15 20:12:50 -08:00
Scott Main 96f696d901 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:46 -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 8543a9ef7e am a9255cfa: am 0af80fb4: am 0f429ebe: docs: fix bug in script for tab cookies
* commit 'a9255cfa7c4b352b730ade2ea5cf3096f9512845':
  docs: fix bug in script for tab cookies
2011-12-15 19:18:24 -08:00
Scott Main a9255cfa7c 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:13 -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 412c8d25e0 am b90afc2c: am 9839afdd: am 1d42360a: docs: style and script changes for android u classes
* commit 'b90afc2cf008fac3f63e721de7ef0a64f8e815b1':
  docs: style and script changes for android u classes
2011-12-15 17:41:49 -08:00
Scott Main b90afc2cf0 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:41 -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
Ying Wang 5758b8ed96 Remove the R/Manifest classes when building the static Java library
Bug: 5448433

Instead of deferring the removal to building the app.
In that case any R/Manifest classes in any static Java libraries will be
deleted, no matter if they are generated from Android resource, or just
source R.java/Manifest.java in the source tree by accident.

Change-Id: I656f45e3cbc3796c5d4832363231480b3f1dc5b8
2011-12-15 16:36:55 -08:00
Ying Wang bf6c611cae Don't remove R class to fix the build.
Unfortunately there is R.java checked in the source tree that gets built
into static library.
So we have to find a way to delete classes from R.java generated by the
build system on the fly.

Change-Id: I2d82d28234cecbf6dd5b02b2dd4f7dbd47e3b626
2011-12-15 15:10:04 -08:00
Ying Wang 205a20a42c Merge "Support to build static Java library with Android resource" 2011-12-15 14:34:32 -08:00
Conley Owens db898a14e0 Merge "Add several module owners to the whitelist" 2011-12-15 10:57:32 -08:00
Kenny Root a8c9594275 Unset HAVE_TLS_REGISTER for ARMv5
Bug: 5763261
Change-Id: I0394daa4cdbad598b91a99e54ca5f830e9ee940b
2011-12-15 10:32:11 -08:00
Conley Owens d497a1db71 Add several module owners to the whitelist
Change-Id: I9a215b74167efc2a6b3070dc8b616a289669d10f
2011-12-15 10:25:17 -08:00
The Android Automerger f4d94af870 IML75 2011-12-14 22:16:29 -08:00
The Android Automerger 8aa133d092 merge in ics-mr1-release history after reset to ics-mr1 2011-12-14 22:13:33 -08:00