Commit graph

7766 commits

Author SHA1 Message Date
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
The Android Open Source Project
98edf69771 am c7185534: Reconcile with ics-mr1-release
* commit 'c7185534d323aa13af3bda77a2e0e232306be89a':
  IML74G
2011-12-14 19:58:49 -08:00
The Android Open Source Project
c7185534d3 Reconcile with ics-mr1-release
Change-Id: I13575fbc40df854f574e7eaf8cfee6153ab3a342
2011-12-14 19:57:24 -08:00
The Android Automerger
769631608c IML74G 2011-12-14 19:28:43 -08:00
The Android Open Source Project
fbcd24c559 am efe3034c: Reconcile with ics-mr1-release
* commit 'efe3034c7107f80e99016bf1808cdfe1afe03e31':
  IML74F
  IML74E
2011-12-14 16:06:54 -08:00
The Android Open Source Project
efe3034c71 Reconcile with ics-mr1-release
Change-Id: I93d6301506cdc1b3f549b7cf4dbc8a8b3adeca2b
2011-12-14 16:05:28 -08:00
Ying Wang
20e2083ea0 Support to build static Java library with Android resource
Bug: 5714516

The rationale behind this change:
- the library is compiled into a jar file, but its R class is generated
  making the constant not constant (static, not final static) (aapt
  option --non-constant-id). Also the jar file does not contain the R
  class.
- this allows the integer value to not be inlined in the compiled
  class files. Note that this prevents using switch statements.
- the main project use this jar file as a normal static library: it will
  add all the class files except the R.class.
- the main project uses the library res folder as a resource
  folder with lower priority than the main project (basically the
  main project is an overlay. This is accomplished using aapt's
  --auto-add-overlay to handle resources only in the main project
  (which the normal overlay mechanism doesn't allow).
- the main project creates R classes in the main project's
  package but also in the library's package. This is done with
  aapt's --extra-packages which accept as many packages as
  needed, separated by a :.
- manifest merging is not done yet, so
  activities/services/permissions/etc... have to be manually declared in
  the main app.

To use a static library with Android resource in your app,
1. Add the library's resource dir to your app as an overlay:
LOCAL_RESOURCE_DIR := <app_resource_dir> <static_library_resource_dirs>
2. Set the proper aapt flags:
LOCAL_AAPT_FLAGS := <apps_own_flags> --auto-add-overlay \
  --extra-packages <lib1_package_name>:<lib2_package_name>:...

Change-Id: Ifb4d2300b952ea4aaee74da1bb0c6c72ea0698a3
2011-12-14 16:04:59 -08:00
The Android Automerger
9b9360c421 IML74F 2011-12-14 15:56:03 -08:00
The Android Automerger
0fb6a79220 IML74E 2011-12-14 15:44:48 -08:00
Brian Muramatsu
393dde5525 resolved conflicts for merge of 80fa947b to master
Change-Id: I0febb15b690932ad342da4b10eb9c0f13d1d1517
2011-12-14 15:39:46 -08:00
Brian Muramatsu
80fa947b03 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:22 -08:00
Brian Muramatsu
fea66cee1c Merge "Build Support for CTS Native Tests" into ics-mr1 2011-12-14 15:31:35 -08:00
David 'Digit' Turner
6371da10f8 x86: Refine the way we configure the x86 build.
This is the result of a recent conversation around the x86 ABI
and its relationship with how we build platform images. Briefly:

- We want to use feature-based macros like ARCH_X86_HAVE_$FEATURE
  instead of relying on explicit compiler macros like -DUSE_$FEATURE

- We want to allow for other x86-based arch variants, e.g. if
  someone wants to build Android for a CPU that doesn't support
  the NDK x86 ABI. However, we need to ensure these are not
  tagged compatible by mistake (see check at the end of TARGET_linux-x86.mk)

- There are several flags which use is dubious now that we have
  a dedicated toolchain to build all the x86 stuff. Comment them
  as 'to be considered for removal'. We'll do the proper checks
  later.

Change-Id: I7768d7c34d73e274cbf4c09ae831b55280d6bb58
2011-12-14 18:08:47 +01:00
The Android Open Source Project
ec7a6448c6 am 4f732584: Reconcile with ics-mr1-release
* commit '4f7325849bad0c41f451ab177bac037c20f00de0':
  IML74D
2011-12-13 20:05:21 -08:00
The Android Open Source Project
4f7325849b Reconcile with ics-mr1-release
Change-Id: I4518215eb5788221551703ab02142d909644c1a7
2011-12-13 20:03:11 -08:00
The Android Automerger
2fc113de8a IML74D 2011-12-13 20:00:27 -08:00
The Android Open Source Project
2bc495a63f am 5b08f649: Reconcile with ics-mr1-release
* commit '5b08f6499a2bcd97ec88ae2719edb90d025cd298':
  IML74C
  IML74B
  IML74
2011-12-13 19:11:23 -08:00