History log of /build/core/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
3f0e0921daf2552d6977f87848a2ecdaad1d79df 10-Nov-2012 The Android Automerger <android-build@android.com> JOP40C
uild_id.mk
7f8d110a29a95b4ba5ef21978aa5aee46efd90e0 10-Nov-2012 The Android Automerger <android-build@android.com> JOP40B
uild_id.mk
0138951eaffaeaf32f8376959074aabf4ecfaff1 07-Nov-2012 Ying Wang <wangying@google.com> Collapse multiple --extra-packages into one.

Change-Id: Icbdd56fa104c03e0a6cc58e441e60286a7f25bb2
ase_rules.mk
18daa1750ba31b510d07d0f65e8e8007ed90b902 13-Oct-2012 Guang Zhu <guangzhu@google.com> Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
abc9d6f2beca88dbd0ec021d343c68f4b617216d 12-Oct-2012 Ying Wang <wangying@google.com> Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
c58b194e786372102512537dfe08ee2a907d9647 12-Oct-2012 Ying Wang <wangying@google.com> Delete the unused LOCAL_POST_PROCESS_COMMAND.

Change-Id: I77785dff6c7b2236880232522d6ed5bc01d5f0ce
ase_rules.mk
lear_vars.mk
ost_executable.mk
0a0cfe95ac50457fe5539f913b372880ef841880 12-Oct-2012 Stephen Hines <srhines@google.com> Merge "Add support for building Filterscript files." into jb-mr1-dev
0ab6e3e6e62bed00f300fd60110a00ed4ee397cb 12-Oct-2012 Stephen Hines <srhines@google.com> Add support for building Filterscript files.

This change piggybacks Filterscript rules onto the existing Renderscript
rules. There is no real difference other than the file extension (which
llvm-rs-cc uses to apply a more stringent set of warnings/errors).

Bug: 7166741
Change-Id: I27175ff1c16c27129cafa92b4e8caabf2e5f4150
efinitions.mk
ava.mk
7240549748fd4e4879009524a6d01a4c26294568 11-Oct-2012 Ying Wang <wangying@google.com> Convert to relative path for CleanSpec.mk

When using mm, which passes in absolute path, while in full build relative
paths are used to encode clean steps.

Change-Id: I3e39ce3125194589f9a464f27eef4a9c96fa06c1
leanspec.mk
57ddcb1bbce7a980e677dfd212ce76229fe33f55 26-Sep-2012 Ying Wang <wangying@google.com> Support to build executables against the NDK

Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Cherry-picked from master.

Bug: 7170098
Change-Id: Ib35a294bd6aa4e969d46ecd8ebab8ca5d843e24b
inary.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-mips.mk
ombo/TARGET_linux-x86.mk
efinitions.mk
xecutable.mk
9d37c68eadc2c3e1b9b01f2753a784998401e104 10-Oct-2012 Guang Zhu <guangzhu@google.com> DO NOT MERGE: better late than never: fix build id for JB MR1

Change-Id: Iaad3002693af683f719832d3c082e7e4dcbf8d29
uild_id.mk
f6e6bf7edf03b7f38f5452cc0749b705eb3a6ada 05-Oct-2012 Keun young Park <keunyoung@google.com> add mip32 stuffs to clang's unknown flag list

- mini_mips changed to mips32-fp to accomodate all mips variants

Bug: 7294949
Change-Id: Iae759e10e3f5d255e27b688042477263438bb7a7
lvm_config.mk
fb03fb3ec0db7e64469b805ee26dff1fd116e911 04-Oct-2012 Ying Wang <wangying@google.com> Store vendor module owner info on the build server.

Bug: 7048854
Change-Id: I5f0653c71a77774978655f8b5570e170b4a9c4ec
ase_rules.mk
asks/vendor_module_check.mk
76a6dc3a191e8800211eb49398d37deae731094e 02-Oct-2012 Ian Rogers <irogers@google.com> Fix common typo in comments, warning and error messages.

s/can not/cannot/g

Change-Id: I1bac31157732666deb46f6f20389ff539977ffb9
inary.mk
ombo/HOST_darwin-x86.mk
efinitions.mk
ost_shared_library.mk
ost_static_library.mk
roduct_config.mk
hared_library.mk
tatic_library.mk
asks/factory_ramdisk.mk
asks/vendor_module_check.mk
54fa8c3ff9b1f0f1b0b9c551be864f1b7378c7fc 27-Sep-2012 Ying Wang <wangying@google.com> Load only the current product config makefile.

To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.

Bug: 7186768,7169854
Change-Id: Ifd72ba1c6362a5e1125a23c505fd47947ab56675
ase_rules.mk
onfig.mk
efinitions.mk
roiddoc.mk
ode_fns.mk
roduct.mk
roduct_config.mk
f7592d987d38d434a4ad1f43607a2151dad2cd4f 28-Sep-2012 Ying Wang <wangying@google.com> Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev
9cb3731a773615a1809e85c9ad80494d10200338 27-Sep-2012 Ying Wang <wangying@google.com> Run clean steps in only given paths when using mm/mmm

To speed up mm/mmm start time.
At the same time, we should copy over the other clean steps.

Bug: 7186768
Change-Id: I250e64256343afe788d79817af36eafaadb47028
leanbuild.mk
leanspec.mk
0bc03946889f04b333ec46ee4695a987ad7b4c0f 28-Sep-2012 Dianne Hackborn <hackbod@google.com> Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!

Change-Id: I577aa38525b23f297e3e2c4a745819ac87b24f6d
ersion_defaults.mk
f8f2b022e9e6ea218d60eb692ede3e6e48c944af 23-Sep-2012 Ying Wang <wangying@google.com> Ignore support library Proguard warning

The support library contains references to newer platform versions.
Don't warn about those in case this app is linking against an older
platform version. We know about them, and they are safe.

Change-Id: Ia2a90398b1db1858d005ec09ded56751cc6ffb00
roguard.flags
20a7c2c10d892ebb8d128794e862ad17ef1056e2 21-Sep-2012 Ying Wang <wangying@google.com> Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev
d81b9d220e00a9ffecea3b9067c6416b2c1e6bbd 21-Sep-2012 Zhihai Xu <zhihaixu@google.com> Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev
4b0486b4a6108ea863da6232cc376cd1edc55640 21-Sep-2012 Ying Wang <wangying@google.com> Allow to tag owner to PRODUCT_COPY_FILES

PRODUCT_COPY_FILES now is a list of words like <source
path>:<destination path>[:<owner>].
The optional :<owner> is used to indicate the owner of a vendor file.

Bug: 7048854
Change-Id: I435d1e18b7a091fb62513062cfc2e420e51557ec
akefile
roduct.mk
roduct_config.mk
asks/vendor_module_check.mk
3849760809ac3bde46663ad163ea0a0d592450c1 19-Sep-2012 Zhihai Xu <zhihaixu@google.com> ISSUE 6849488 Bluedroid stack, remove system/bluetooth.

remove system/bluetooth stuff.

bug 6849488
Change-Id: I8eb85c6da0aa34aefda2916f2c74e5eae51da27e
egacy_prebuilts.mk
athmap.mk
5bdf305bbe529a85735200353478057b65bb462e 20-Sep-2012 Ying Wang <wangying@google.com> Move AndroidConfig.h from system/core to the build project.

So unbundled branches don't need to include the system/core project.

Change-Id: Ic4ef62ee6df069b9b2dd123aed95a3e7fcdfc146
ombo/HOST_darwin-x86.mk
ombo/HOST_linux-x86.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-mips.mk
ombo/include/arch/darwin-x86/AndroidConfig.h
ombo/include/arch/freebsd-x86/AndroidConfig.h
ombo/include/arch/linux-arm/AndroidConfig.h
ombo/include/arch/linux-mips/AndroidConfig.h
ombo/include/arch/linux-ppc/AndroidConfig.h
ombo/include/arch/linux-x86/AndroidConfig.h
ombo/include/arch/target_linux-x86/AndroidConfig.h
ombo/include/arch/windows/AndroidConfig.h
onfig.mk
5630521aba12a03637e7328686924df4d298ff4d 13-Sep-2012 Andrew Hsieh <andrewhsieh@google.com> resolved conflicts for merge of 3e91f5ad to jb-mr1-dev

Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db
0f47a94d2eb50f30b7f559c7c7fc2a8632412cc8 12-Sep-2012 Andrew Hsieh <andrewhsieh@google.com> am 7e300d60: Merge "Enable stack-protector for x86"

* commit '7e300d60bfc325e3cbf3e7656297c14109e513b8':
Enable stack-protector for x86
7e300d60bfc325e3cbf3e7656297c14109e513b8 12-Sep-2012 Andrew Hsieh <andrewhsieh@google.com> Merge "Enable stack-protector for x86"
bc2406e64c9bc046e1d7e971f41c5a350194eb42 01-Sep-2012 Benoit Goby <benoit@android.com> Add openssl to TINY_ANDROID build

adb depends on it

Change-Id: I79f23315142b45bc7f9a2685fa2b9865b22396ad
ain.mk
6a6723a0a9c2b3c1756ce8cdf1910ade264c26ef 11-Sep-2012 Ying Wang <wangying@google.com> am 4458452e: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES."

* commit '4458452ef64f271906914e79ffd9923630ae22f2':
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
6adcf0180a7e58bc353c56fb0e7f7abf944e8a4f 21-Aug-2012 Ying Wang <wangying@google.com> android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.

Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
asks/cts.mk
558610694400a8245dd2cfea5790af5e642d8465 10-Sep-2012 Ying Wang <wangying@google.com> am 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args"

* commit '4595d7d62c0d594aa3501e4f547563348a3a5eb0':
Add transform-d-to-p-args
410420ed667f869e15df0d3204834282984d4f6a 10-Sep-2012 Ying Wang <wangying@google.com> am 9efa5bae: Merge "Add transform-d-to-p-args"

* commit '9efa5bae8645988a0d24af14142df9572bf7bd57':
Add transform-d-to-p-args
c23f4efdbbb8ce76fd5027ef4e2b6ee316ffeb2b 08-Sep-2012 Ying Wang <wangying@google.com> Add transform-d-to-p-args

This new indirection allows us too to output .P files when we are
generating non-.o files, such as .s or .S files.
Bug: 7127743

Change-Id: I9e46c417031764fefc9909ba4a3eb63885f34f9e
efinitions.mk
7676611415eaf666b296f71cafec53578ebf0de0 06-Sep-2012 Ying Wang <wangying@google.com> am 19c06156: am 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"

* commit '19c06156b6615ba53d81d2ecdc341c3feea21662':
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
0ee362ea0485f6885c81fa1a6cb9868ae304f3e3 06-Sep-2012 Ying Wang <wangying@google.com> am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"

* commit '478d0fc6a311b236fddc9d18c9a1b922f8ecf1ea':
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
619fccf9f34bee6bebc2710dff798fde6ebca7e4 06-Sep-2012 Ying Wang <wangying@google.com> Remove duplicate src:dest pairs in PRODUCT_COPY_FILES

Before setting up the rules.

Change-Id: Ifedbc0e988895a899cae315dc730a152bae91ae2
akefile
1a09726f6860966a8c9a3f7aa66cff252d422e0e 04-Sep-2012 Doug Zongker <dougz@google.com> fix possible build break

If you try to build a recovery image without having built the main
system, creating the recovery resourc file can fail due to the
directory not existing.

Change-Id: I2daff847c0b58dfa519d0f742636f01dba28c689
akefile
3a6f7589e8fcc691ec768b1fdcbf0364ff4596f2 30-Aug-2012 Ying Wang <wangying@google.com> Add LOCAL_DONT_DELETE_JAR_META_INF

To support to not delete META_INF directory from the static Java
libraries.

Change-Id: I720bfa059c43dd457a74a0c60bb6797aa408ecaf
lear_vars.mk
efinitions.mk
ava.mk
c2fb2391f459ad4ea2ce939dac02b4f4e33b9739 29-Aug-2012 Andrew Hsieh <andrewhsieh@google.com> Enable stack-protector for x86

Change-Id: I7a169075ca49ab831c37625d416c1d4b026bfec3
ombo/TARGET_linux-x86.mk
d4ace13802810b58de8c744e810dc8e87776d3f0 28-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 4dc6ed96: am 9eb87b8d: Merge "Add pattern to check for GCC 4.6"

* commit '4dc6ed96a0612d4693cca5ed5674873754bcb37e':
Add pattern to check for GCC 4.6
d5096c6a5c59a0f78833ea86b620bfbedc863aba 28-Aug-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 5c903372 to jb-mr1-dev

Change-Id: I4994c77a6570ce654915bfb8c5f6ee4583db86b7
4dc6ed96a0612d4693cca5ed5674873754bcb37e 28-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 9eb87b8d: Merge "Add pattern to check for GCC 4.6"

* commit '9eb87b8d2011e65462ea42de6899158cd35a492a':
Add pattern to check for GCC 4.6
5c90337229ee75c8e4e99f59b42585a8fa5089db 28-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 9e2b4718: Merge "Use gold linker on x86"

* commit '9e2b4718a0e11a723904ba205a5156bae450be30':
Use gold linker on x86
9eb87b8d2011e65462ea42de6899158cd35a492a 28-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Add pattern to check for GCC 4.6"
6f4de4bd13f0acaaa8b7c59e141c28d64aba48f4 31-Jul-2012 Ying Wang <wangying@google.com> Allow Java resource in apk.

Bug: 6892294
Change-Id: Ib7664e3d9e396dc8ccccecbae9103884014f3ddd
ackage.mk
9e2b4718a0e11a723904ba205a5156bae450be30 28-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Use gold linker on x86"
b205b461537ab2f935bdf84a3083b26360026f44 27-Aug-2012 Pavel Chupin <pavel.v.chupin@intel.com> Use gold linker on x86

Patch removes fallback -fuse-ld=bfd for x86 target and
--copy-dt-needed-entries which is not supported by gold linker.

Change-Id: Ie5603f98e3f2f9d4f81678c718e39b130a75d057
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
ombo/TARGET_linux-x86.mk
26c78057816654eb7da7df343a934981b4327e19 28-Aug-2012 Andrew Hsieh <andrewhsieh@google.com> Add pattern to check for GCC 4.6

GCC 4.6 --version can return 4.6.x-google but also simply 4.6
as of https://android-review.googlesource.com/#/c/42028.
Add more pattern to detect it.

Change-Id: Ibf34fba9afdf01bd3eafc011cc4d059b59f25d3d
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-mips.mk
245592908c5be4c841ce7a93cf0c8e9e6a8e5965 28-Aug-2012 Ying Wang <wangying@google.com> Keep the emma classes if emma is enabled.

Change-Id: Ie551d48532c61bf610b12875dc33cfe476625c5e
ava.mk
roguard.emma.flags
3e500c63563c9a2ed1ed7b1ae8a094493dbc65d2 10-Aug-2012 Ying Wang <wangying@google.com> Automatically add Java resources carried by static Java libraries.

Bug: 6892294
Change-Id: I3ff71ee3d7b9ccdfde6a5284cc350864fbffa71f

Conflicts:

core/package.mk
efinitions.mk
ost_java_library.mk
ava_library.mk
ackage.mk
4df0782b3adfd03c167111790fdf5a9de676080c 27-Aug-2012 Ben Cheng <bccheng@google.com> Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev
cc4822682ef8493d9c9c87228edf977c1f918bd7 27-Aug-2012 Ben Cheng <bccheng@google.com> Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.

Bug 7050760

Change-Id: I05e69b741eaf628ab1d25dec12a953f9f2a3d9a2
ative_test.mk
414d7e859a93266c6069d33badd20b9061052806 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am dbf6ad06: am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs"

* commit 'dbf6ad0692f98cacf27dc023854b2c5a5575a841':
ARM: put crtbegin_so.o at the beginning where it belongs
dbf6ad0692f98cacf27dc023854b2c5a5575a841 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs"

* commit '713bac96d628d6ca040fb1fe5d7a8abdcb932553':
ARM: put crtbegin_so.o at the beginning where it belongs
713bac96d628d6ca040fb1fe5d7a8abdcb932553 24-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
489458fa3161ed0c299f737da68376862ce13f9f 24-Aug-2012 Ying Wang <wangying@google.com> Filter out the overridden packages before doing required module expansion.

Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
ain.mk
c3a4cfe9b5d241f605435b1b239d5d6b13226288 23-Aug-2012 Ying Wang <wangying@google.com> Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev
af4800c8a6a9266ceb7269bd2c6b0bb2f0965bea 22-Aug-2012 Ying Wang <wangying@google.com> Support EMMA_INSTRUMENT in both full and unbundled builds.

Bug: 6987838
- With this change, use "EMMA_INSTRUMENT=true" to enable emma in full or
unbundled build.
- You don't need to add "LOCAL_STATIC_JAVA_LIBRARIES += emma" any more for
unbundled apps.
- Now a single var LOCAL_EMMA_INSTRUMENT replaces the previous
LOCAL_NO_EMMA_INSTRUMENT and LOCAL_NO_EMMA_COMPILE.
- By default, if EMMA_INSTRUMENT is true, emma is enabled for only
non-test apps.
- A new global var EMMA_INSTRUMENT_STATIC. It enables EMMA_INSTRUMENT
and builds emma into apk/jar as static library, instead of using emma
as part of shared library core.jar.

Change-Id: I0aa219e83074879ececc159b5b07c39eb07ccc00
lear_vars.mk
onfig.mk
ava.mk
ava_library.mk
ain.mk
ackage.mk
cd9668edd4562d0078d178f014e2975766c60f49 22-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am e3479ea5: am 15012c11: Merge "Build on Mac OS X : add experimental SDK versions"

* commit 'e3479ea5033e2ede36f6f771dd3a6ea315505efd':
Build on Mac OS X : add experimental SDK versions
e3479ea5033e2ede36f6f771dd3a6ea315505efd 22-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 15012c11: Merge "Build on Mac OS X : add experimental SDK versions"

* commit '15012c115dca7bc0d2edd8dd2689117546b1360e':
Build on Mac OS X : add experimental SDK versions
15012c115dca7bc0d2edd8dd2689117546b1360e 22-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Build on Mac OS X : add experimental SDK versions"
b3f83098ef369e7c6d5a78bf74bef315ebd149c5 21-Aug-2012 Ying Wang <wangying@google.com> Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." into jb-mr1-dev
cd3050c541f665ee4b8462d1ccdabfe1ed2dbf4a 21-Aug-2012 Andrew Hsieh <andrewhsieh@google.com> am 4d69e06b: Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"

* commit '4d69e06b764d030dcc3ce9bc8b103a75eff3175a':
Added BUILD_HOST_static to build statically linked executable/shared-lib
02d75da4472bc684dec97506a94f77c6c4ed8513 21-Aug-2012 Ying Wang <wangying@google.com> android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.

Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
asks/cts.mk
691e0243ca880722f5dd86a1052fc7ffbc55f8c4 30-Jul-2012 SangWook Han <sangwook.han@gmail.com> Build on Mac OS X : add experimental SDK versions

Change-Id: Ifc67d1745e72fc048cd6e8c8ef0521ab92468086
ombo/HOST_darwin-x86.mk
02a2f848b6ed76b2e81bc703d630118be264f7b0 21-Aug-2012 Keun young Park <keunyoung@google.com> change target to androideabi

- it should be androideabi instead of android
external/llvm/lib/Support/Triple.cpp

Change-Id: Ied50f2dba930b402d000b5eb3b3ce5ef20731b8b
lvm_config.mk
6c1f9ccfb1dbc04a32275bfb6133c1b122400f04 21-Aug-2012 Ard Biesheuvel <ard.biesheuvel@gmail.com> ARM: put crtbegin_so.o at the beginning where it belongs

Change-Id: I9466fe9277c58a7b8f8a9964b2d578a65e579995
ombo/TARGET_linux-arm.mk
31ef1037bf7b66e949ecf52a1a29672d43ebfef8 21-Aug-2012 Andrew Hsieh <andrewhsieh@google.com> Added BUILD_HOST_static to build statically linked executable/shared-lib

Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.

In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread

Change-Id: I615f574e918c83ed1ab82db2453b69d0420cb59c
ombo/HOST_darwin-x86.mk
ombo/HOST_linux-x86.mk
ombo/HOST_windows-x86.mk
85e86626e952bca488b2bacc57743e59132794bc 21-Aug-2012 Doug Zongker <dougz@google.com> Merge "include recovery-resource.dat in /system/etc" into jb-mr1-dev
565888726b50cbe128e0b03c31dfaa2bd66a7849 21-Aug-2012 Doug Zongker <dougz@google.com> include recovery-resource.dat in /system/etc

Put the recovery UI images into a file in /system/etc where we can use
them for constructing the recovery image, so they don't need to be
included in OTA packages.

Change-Id: Iab2144865298c8967eb31660abd3bb11e6ec26fa
akefile
397d2edbb98525c895fa375404dbd6478754befd 20-Aug-2012 Keun young Park <keunyoung@google.com> Merge "add CLANG configurations for MIPS" into jb-mr1-dev
5ad1d7ec00c17a442e29d82dc23a557def4abd31 17-Aug-2012 Joe Onorato <joeo@google.com> am 726d921a: am 45cd00cd: Merge "Install all host modules. Don\'t filter out ones tagged "optional""

* commit '726d921a47cb1003bcf7ff84ae1d332dec86d674':
Install all host modules. Don't filter out ones tagged "optional"
726d921a47cb1003bcf7ff84ae1d332dec86d674 17-Aug-2012 Joe Onorato <joeo@google.com> am 45cd00cd: Merge "Install all host modules. Don\'t filter out ones tagged "optional""

* commit '45cd00cd9e2feec187a6253b95e866cd10dfa20a':
Install all host modules. Don't filter out ones tagged "optional"
45cd00cd9e2feec187a6253b95e866cd10dfa20a 17-Aug-2012 Joe Onorato <joeo@google.com> Merge "Install all host modules. Don't filter out ones tagged "optional""
68559da02facee0691a4417d31b42491bf174f15 17-Aug-2012 Joe Onorato <joeo@google.com> Install all host modules. Don't filter out ones tagged "optional"

Change-Id: I9b3a27a4c84ee748314e98603670eb939ae949e2
ase_rules.mk
b68c3f9ca56f1110711a92f9f5deb922acced261 17-Aug-2012 Joe Onorato <joeo@google.com> am 763c0801: am 687bde38: Merge "Add all the host tools to the list of prerequisites for the SDK."

* commit '763c080198655782cc5700d6f53cce330ab7e008':
Add all the host tools to the list of prerequisites for the SDK.
763c080198655782cc5700d6f53cce330ab7e008 17-Aug-2012 Joe Onorato <joeo@google.com> am 687bde38: Merge "Add all the host tools to the list of prerequisites for the SDK."

* commit '687bde38891b6aa3796f52721d7498436ab45330':
Add all the host tools to the list of prerequisites for the SDK.
63d56dad65941172131c7818808fd0bd50450537 17-Aug-2012 Joe Onorato <joeo@google.com> Add all the host tools to the list of prerequisites for the SDK.

Change-Id: I3a3e4be8796f761119e29f3be64ad534e48c95ee
akefile
c5fbef5413fea32b0084fd197bd27f9effcb2760 17-Aug-2012 Joe Onorato <joeo@google.com> resolved conflicts for merge of fab83a3d to jb-mr1-dev

Change-Id: I97aff2be317fd10b68d933e65259ec48bd5ff6a1
fab83a3d62b8652ccdb5ddadc8a6a3f3bf0edf20 17-Aug-2012 Joe Onorato <joeo@google.com> am 3b4b11a4: Merge "Another error to warning"

* commit '3b4b11a4701b64df5248e7d86c0c357954a2ca10':
Another error to warning
0ee86a7429772df5ef075ad8dc59f0974791c94c 17-Aug-2012 Joe Onorato <joeo@google.com> Another error to warning

Change-Id: Ifbad63e3eb37d087d88a39e102b4239f305d0ee3
ain.mk
5956db9394a3d82bfe1b54bd0264624bd00095ee 17-Aug-2012 Joe Onorato <joeo@google.com> am 6b340ad0: am 7c945d24: Merge "Make error a warning for now"

* commit '6b340ad06c90ad80894bce720075e05f31b8f4cb':
Make error a warning for now
6b340ad06c90ad80894bce720075e05f31b8f4cb 17-Aug-2012 Joe Onorato <joeo@google.com> am 7c945d24: Merge "Make error a warning for now"

* commit '7c945d249956ed3943585b8d417a51a598b175b3':
Make error a warning for now
aa816333aee7026157af738bed5162700ff74615 17-Aug-2012 Joe Onorato <joeo@google.com> Make error a warning for now

Change-Id: Idf18957fff2bb4ff31ca6d7d8d1c8d95847b4e00
ase_rules.mk
cea08a5220bb0b1169e227dd4a08dd94fef0720b 17-Aug-2012 Joe Onorato <joeo@google.com> resolved conflicts for merge of 5836d3b3 to jb-mr1-dev

Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
5836d3b3d99e99d3f18d5416a7e7c514bd1b97b6 17-Aug-2012 Joe Onorato <joeo@google.com> am f72e34eb: Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87

* commit 'f72e34ebf49ed2a06fe9e37d134f2088e2c0c0e4':
Move the old user tagged modules over to base.mk so mini and core both share them.
More product debugging.
build system changes for jb-aah-dev merge
Fail when a non-vendor product references a vendor module.
Remove support for user tags in the build system.
List the user modules explicitly, and we can get rid of the support for the user tag!
Dump the user tagged modules.
host modules don't need LOCAL_MODULE_TAGS
Don't give the user tag to host modules automatically.
Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
Add tool to parse make dependency info from new --deps flag.
Use a more modern -j flag.
make product-graph now filtered
f3319452ad378c7818ff0eec1a57dfe0173304d9 23-Jul-2012 Joe Onorato <joeo@google.com> More product debugging.

Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
asks/product-graph.mk
26ead966d72a436beddf02ef17268071cb982ce0 12-Jul-2012 Joe Onorato <joeo@google.com> build system changes for jb-aah-dev merge

Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
ain.mk
75493610b33323ccc958e2ff45e9eafb9750fa5d 23-May-2012 Joe Onorato <joeo@google.com> Fail when a non-vendor product references a vendor module.

Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
ase_rules.mk
ain.mk
529302d912e9ad6d62b56f98ffb718e5a4b23b18 22-May-2012 Joe Onorato <joeo@google.com> Remove support for user tags in the build system.

It is not forbidden to say LOCAL_MODULE_TAGS := user,
and if you don't say LOCAL_MODULE_TAGS, it now defaults
to optional.

Change-Id: I0a0b200bb6f1c7bf1fe3a89cdc8f69678617526c
ase_rules.mk
efinitions.mk
nvsetup.mk
ain.mk
ser_tags.mk
d23c3235fa183b8c4c78551c5947158d2db8d01f 21-May-2012 Joe Onorato <joeo@google.com> Dump the user tagged modules.

Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
ain.mk
roduct_config.mk
f85cb7c936db4b7a6b39b1163591a61e166d9e11 19-May-2012 Joe Onorato <joeo@google.com> Don't give the user tag to host modules automatically.

Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
ase_rules.mk
efinitions.mk
ain.mk
d6b1d628be13202550cd7381fccc4e641190c0b8 19-May-2012 Joe Onorato <joeo@google.com> Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.

Change-Id: Idac551e5c796321e993b94761f5cbf5b55c1a994
ain.mk
f5debbfee630f0d49b9dcb8a4eb0bfa83822ecc6 08-May-2012 Joe Onorato <joeo@google.com> make product-graph now filtered

Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
asks/product-graph.mk
732b2ba79a17ed5c0e4d9d7abb6ec3dfe50d45e8 17-Aug-2012 Ying Wang <wangying@google.com> Merge "Don't include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev
da4bf4251451d2da8883d636849b65fcc368a575 17-Aug-2012 Ying Wang <wangying@google.com> Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.

Bug: 6994483
Change-Id: I76c4d96264cf94a79d59fdeb52bb37c07a9458dd
inary.mk
ombo/HOST_darwin-x86.mk
ombo/HOST_linux-x86.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-mips.mk
ombo/TARGET_linux-x86.mk
6e86a57b0f1331a2143346becc96be68cc8c3302 16-Aug-2012 Keun young Park <keunyoung@google.com> add CLANG configurations for MIPS

Change-Id: I36ed8089c447c20c229c348a096b49ff126552de
lvm_config.mk
2f32c04d8c454616bab383e01a4f56a9445cb1c4 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am d77d8906: am 6020d698: Merge "select.mk: Tune ccache options"

* commit 'd77d8906b8fc4a6e2ecaf9bc5f5b84ddec6dbe7e':
select.mk: Tune ccache options
d77d8906b8fc4a6e2ecaf9bc5f5b84ddec6dbe7e 17-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 6020d698: Merge "select.mk: Tune ccache options"

* commit '6020d698f51132cab374e6c96f7da4902f3aa84f':
select.mk: Tune ccache options
6020d698f51132cab374e6c96f7da4902f3aa84f 16-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "select.mk: Tune ccache options"
1f93043c86901cdd3e0852102aa5b74e93178e47 13-Aug-2012 Andrew Boie <andrew.p.boie@intel.com> select.mk: Tune ccache options

With these adjustments, cached object files can now be shared across
multiple Android trees on a single workstation:

* Compiler binary modification time no longer causes cache misses,
as a hash of the compiler binary is taken rather than looking
at the mtime and size
* Header file modification time no longer causes cache misses,
the headers are now always hashed
* Macros such as __DATE__ and __TIME__ no longer cause cache misses
* All paths in preprocessed source (due to use of -g) are now relative

These options require ccache 3.1 or later to be used; ccache 2.4 will
ignore these.

Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
ombo/select.mk
bc415dd5eb2a135cbc24c21760338e6294c7a0d3 15-Aug-2012 Ying Wang <wangying@google.com> Support to build emmap_mata.zip in unbundled builds.

Bug: 6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
akefile
ain.mk
a8352cac8dae324b9d30751a2e05628db5147f45 16-Aug-2012 Elliott Hughes <enh@google.com> am 0fc8d635: am f2a618e1: Merge "The zoneinfo stuff is no longer legacy."

* commit '0fc8d635a7f3712cc24f7a29d97755bc15972a0a':
The zoneinfo stuff is no longer legacy.
0fc8d635a7f3712cc24f7a29d97755bc15972a0a 16-Aug-2012 Elliott Hughes <enh@google.com> am f2a618e1: Merge "The zoneinfo stuff is no longer legacy."

* commit 'f2a618e1df126c6c48622cce948825e923b52dcb':
The zoneinfo stuff is no longer legacy.
f2a618e1df126c6c48622cce948825e923b52dcb 16-Aug-2012 Elliott Hughes <enh@google.com> Merge "The zoneinfo stuff is no longer legacy."
e1654eaccbebb0cbf76987c7943534ae03a7280b 16-Aug-2012 Elliott Hughes <enh@google.com> The zoneinfo stuff is no longer legacy.

Change-Id: I7f76dfc15c0b2febbcdb13f12ff9390dca124585
egacy_prebuilts.mk
a8811fda4fd96d3697869a654e1172a353874bac 15-Aug-2012 Keun young Park <keunyoung@google.com> fix MIPS build

- crtxx.o built under TARGET_OUT_INTERMEDIATE_LIBRARIES,
not under TARGET_OUT_STATIC_LIBRARIES

Change-Id: Ife05206bd66f691853100bbf17e08a13c287d073
ombo/TARGET_linux-mips.mk
0016a9ba8dfcc91571820087e96cb87b9b9215c4 15-Aug-2012 Iliyan Malchev <malchev@google.com> Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-dev
0854694c515eea74b1f38d46bd00497a9891946b 15-Aug-2012 Iliyan Malchev <malchev@google.com> build: register BOARD_HAVE_BLUETOOTH_QCOM

Change-Id: I594abd6d3b152a4e5bc48b6ac447e155c85b2fe0
Signed-off-by: Iliyan Malchev <malchev@google.com>
roduct.mk
27d51bf6d3cd4189085238503d46a5a570173e1b 14-Aug-2012 Ying Wang <wangying@google.com> Force out LOCAL_NDK_VERSION.

Change-Id: I0a9f1a630ef2019bed38d420525eac9510b09798
inary.mk
54fdb473b656544c75ad06497ecf20a1e8d6b539 14-Aug-2012 Ying Wang <wangying@google.com> Retire LOCAL_NDK_VERSION.

We are now unifying the NDK versions of unbundled native code to always
use the latest NDK.
We don't need the variable LOCAL_NDK_VERSION now.
To build native code with NDK, you need set just LOCAL_SDK_VERSION.

Bug: 6932421
Change-Id: I86f05a264249cda6bae97b4b1616f03700cd9dfa
inary.mk
lear_vars.mk
onfig.mk
ackage.mk
hared_library.mk
d4f0ffcb6b30c96160667d1757edb9d3692caba8 14-Aug-2012 Ying Wang <wangying@google.com> Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev
7f8d0ba6bd4b23295bbddda47e85a69b15922dd1 10-Aug-2012 Ying Wang <wangying@google.com> Adopt the new prebuilts/ndk/<number> paths.

Bug: 6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
inary.mk
onfig.mk
ackage.mk
1196c82491e29eed257a44aa7384d8b836657b82 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 7159a992: am 4eddad55: Merge "Set the AOSP master to be API level 16"

* commit '7159a992ddcda51c91843a29cd1aa30815bc8370':
Set the AOSP master to be API level 16
7159a992ddcda51c91843a29cd1aa30815bc8370 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 4eddad55: Merge "Set the AOSP master to be API level 16"

* commit '4eddad550ee81edba01734bf378612ed18841751':
Set the AOSP master to be API level 16
e46e8603b2026a35b0bee8ca57a3a2737bd18c1f 14-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Set the AOSP master to be API level 16

Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66
ersion_defaults.mk
f59a64b7cba7330701b8791698e67abff8afde65 14-Aug-2012 Ying Wang <wangying@google.com> am d3d0beca: am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"

* commit 'd3d0becac9a13836b7c20acba3b21b0625d92324':
Move the selinux modules to core PRODUCT_PACKAGES
d3d0becac9a13836b7c20acba3b21b0625d92324 14-Aug-2012 Ying Wang <wangying@google.com> am 392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"

* commit '392bdc1f08eb03ad04eba24a76cc0aea7e1b46d6':
Move the selinux modules to core PRODUCT_PACKAGES
4150db6905a1a72ed7f400556e89c39054700518 14-Aug-2012 Ying Wang <wangying@android.com> am d7547163: am 679b7498: Merge "Add mac_permissions.xml dependency."

* commit 'd7547163d5b0bf9e2cde626c0b7c6a58d48eb89e':
Add mac_permissions.xml dependency.
82ccebaa598d3e3a80f72f63a72aa34caaac477b 14-Aug-2012 Ying Wang <wangying@google.com> Move the selinux modules to core PRODUCT_PACKAGES

The module names are phony targets and we should avoid having file targets
depend on phony targets.
Instead the build system makes sure to use the file dependency with
PRODUCT_PACKAGES.

Change-Id: I8dc59d8f9ed92c146b8827d71278e27214e60f3a
akefile
d7547163d5b0bf9e2cde626c0b7c6a58d48eb89e 14-Aug-2012 Ying Wang <wangying@android.com> am 679b7498: Merge "Add mac_permissions.xml dependency."

* commit '679b7498af86ee084791e86d06eaad87fe2f27f0':
Add mac_permissions.xml dependency.
679b7498af86ee084791e86d06eaad87fe2f27f0 13-Aug-2012 Ying Wang <wangying@android.com> Merge "Add mac_permissions.xml dependency."
880d3f39f711f9ca6d2ba5c9cf127265fa39efad 11-Aug-2012 Elliott Hughes <enh@google.com> resolved conflicts for merge of 0ac38a4e to jb-mr1-dev

Change-Id: I0978f511f807797f89be4002bca654492231761c
0ac38a4e5ee55f55ab3e8a895be53bd0d04dcf47 11-Aug-2012 Elliott Hughes <enh@google.com> am 20e713d1: Merge "Remove TARGET_linux-sh.mk."

* commit '20e713d151dde66058453ec822b6bca8793008a4':
Remove TARGET_linux-sh.mk.
62f034792d560055c80834981ebffeb3bfa9db39 11-Aug-2012 Guang Zhu <guangzhu@google.com> Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev
5f6c7fd8849a939184ef16beab4c468f5c4d7e66 11-Aug-2012 Elliott Hughes <enh@google.com> Remove TARGET_linux-sh.mk.

SH support is long gone from bionic and dalvik.

Change-Id: I613df5f0062d743686847610737af9a321eec1da
ombo/TARGET_linux-sh.mk
62481e30f331c09aed4270cbd6ee87b7a6baeb6e 10-Aug-2012 Nick Kralevich <nnk@google.com> Merge "arm: add --warn-shared-textrel" into jb-mr1-dev
b238210c0172e771b1302364273016ad1fabafb8 10-Aug-2012 Nick Kralevich <nnk@google.com> arm: add --warn-shared-textrel

Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.

This warning will turn into an error in a future change
(via --fatal-warnings)

References: http://www.akkadia.org/drepper/textrelocs.html

Change-Id: I3bc818e3ecdb8a4338668a9e816b6dc1081b7557
ombo/TARGET_linux-arm.mk
049d97d7789a9fa29845effb3323203be36e3f97 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 2387857d: am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"

* commit '2387857dad06b3437ffcf0c14e2bc9f5956a5888':
MIPS support to *.mk files and envsetup.sh
c244634e8f9b89a652dc82df1e8f803d01b61509 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 64b8c6e9: am 6e6d92c4: Merge "Support for MIPS Build targets."

* commit '64b8c6e936ae713a61c53a85a0badbd7d480e414':
Support for MIPS Build targets.
2387857dad06b3437ffcf0c14e2bc9f5956a5888 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"

* commit '968f20a4c2ffca9a0cf8870bd96c77e65ca61243':
MIPS support to *.mk files and envsetup.sh
64b8c6e936ae713a61c53a85a0badbd7d480e414 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 6e6d92c4: Merge "Support for MIPS Build targets."

* commit '6e6d92c47acbb976ce47ae4d90406fa56ea68a3a':
Support for MIPS Build targets.
8da4310646da498255173b475915aa066de4200a 26-Jul-2012 Raghu Gandham <raghu@mips.com> MIPS support to *.mk files and envsetup.sh

Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
onfig.mk
umpvar.mk
nvsetup.mk
ser_tags.mk
6e6d92c47acbb976ce47ae4d90406fa56ea68a3a 10-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Support for MIPS Build targets."
72f0b67673adecd824bf177b680b20b93e3bc6ed 09-Aug-2012 Doug Zongker <dougz@google.com> tidy up building of recovery ramdisk image

Copy init.recovery.*.rc files (if any) from the main system ramdisk,
and hide all the commands.

Change-Id: I4d4fcf25b66ddea70e43282d466983e9643c9bea
akefile
e98b836f261aa822204f5fdbae7cfde6c77dbfba 09-Aug-2012 Colin Cross <ccross@android.com> Merge "recovery: don't delete hardware specific init*.rc files" into jb-mr1-dev
79f68bc925b495020cb69a5d61589eaab604b5c0 07-Aug-2012 Guang Zhu <guangzhu@google.com> Use new flag for emma instrumented build and limit to apps only

Based on existing setup, when EMMA_INSTRUMENT is used on a full
build, all Java modules will be processed with emma instrument
unless otherwise marked in their own Makefiles.

For the purpose of collecting code coverage, emma-instrument
all Java modules aren't that useful, instead, instrumenting all
the app packages is more useful. This change adds a new flag
EMMA_FULL_APP_INSTRUMENT, which can be used with a full build
to instrument all app packages.

Change-Id: Ie143fed49c23402b21f6cccac2ef25741726be45
ava.mk
9c649a7542ee3fda57a1836ad0ddcd8d19921f5b 09-Aug-2012 Ying Wang <wangying@google.com> Don't install overridden packages in pdk fusion files.

Bug: 6942063
Change-Id: I14fc25b22b13bceeea8fa48491465233b19ab106
akefile
b0cc9aae50089f0b77d6adc74f4d6027f0316b52 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 35b24a82: am 8776f34a: Merge "x86: cleanups for toolchain"

* commit '35b24a8234baa93d23a9ea029b8e8e675b134f7d':
x86: cleanups for toolchain
35b24a8234baa93d23a9ea029b8e8e675b134f7d 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 8776f34a: Merge "x86: cleanups for toolchain"

* commit '8776f34aaad8394caf58b864a41765b7ced52a65':
x86: cleanups for toolchain
8776f34aaad8394caf58b864a41765b7ced52a65 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "x86: cleanups for toolchain"
1870b7f4f26f5c1d32e767dad7a05c69e1679a3d 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"

* commit 'a4814370724634c0ee0bf35bc68f382f0df93668':
definitions.mk: Don't use GCC '@' parameter
a4814370724634c0ee0bf35bc68f382f0df93668 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"

* commit '4733cfd2de0bed2dfdf4c32517b0c59762c85b2e':
definitions.mk: Don't use GCC '@' parameter
4733cfd2de0bed2dfdf4c32517b0c59762c85b2e 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "definitions.mk: Don't use GCC '@' parameter"
7de61d1471cd8938ade62ae439cad11ea141cf40 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"

* commit '04363aa5bd7ae0f2b5a8d09c25a83371933d0d12':
core/Makefile: also look for device/*/build/tasks
04363aa5bd7ae0f2b5a8d09c25a83371933d0d12 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"

* commit 'af541a64abd16f6a33146a833dce71e739b722c8':
core/Makefile: also look for device/*/build/tasks
629c87b832ce0fa536a3fb6bd4a5095655fddd29 08-Aug-2012 Colin Cross <ccross@android.com> recovery: don't delete hardware specific init*.rc files

init used to automatically execute hardware specific init.rc files from
init.<hardware>.rc. If the hardware specific init.rc file was installed
in recovery.img, various unwanted services would try to start, so init*.rc
was deleted when creating the recovery root directory.

init was recently modified to explicitly import init.${ro.hardware}.rc
from the default init.rc, rather than always trying to load it. Since
recovery replaces the default init.rc with a custom one, it will never
try to load hardware specific init files.

In addition, there are cases where we need to start hardware specific
services, for example watchdogd, so we need
init.recovery.${ro.hardware}.rc to be installed.

Modify the build rule to delete the default init.rc from the recovery
root directory so it can be replaced with the custom recovery init.rc,
but leave all the hardware specific init files in place.

Bug: 6953625
Change-Id: I5d9555e3d54d2f1d9f49fb981bd412c53741337e
akefile
af541a64abd16f6a33146a833dce71e739b722c8 08-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "core/Makefile: also look for device/*/build/tasks"
7f9db64d0eaf69b362dd7bcdf9a0ce30562efe29 04-Aug-2012 Ying Wang <wangying@google.com> Merge "Add libstagefright and libstagefright_chromium_http to core.mk." into jb-mr1-dev
c10da6c540c149b3e0152d2455c07cd4006704c7 04-Aug-2012 Ying Wang <wangying@google.com> Add libstagefright and libstagefright_chromium_http to core.mk.

Bug: 6933259
Change-Id: Ibe83a95bed7679d6260ef7500c459dcd7ae71812
ser_tags.mk
c814bcefd7ff65cbc91b66fb67a038fbd6ec9944 03-Aug-2012 Shih-wei Liao <sliao@google.com> Fix build: After merging in Clang, -Wno-psabi is no longer supported.

-Wno-unused-but-set-variable is not supported either.

Change-Id: Ic416048a0b078efa50515539f6cac9db472ad086
lvm_config.mk
1e845d33af68673f0a6712c9c22dc2c37eebbc9d 03-Aug-2012 Doug Zongker <dougz@google.com> Merge "add extra args to mkbootimg" into jb-mr1-dev
d513160b76a189899ba01f87a3987b4c6f428cae 02-Aug-2012 Doug Zongker <dougz@google.com> add extra args to mkbootimg

Arrange to take $(BOARD_MKBOOTIMG_ARGS) and pass it to all invocations
of mkbootimg from within make, and to store it in the target_files so
it can be used by future invocations of img_from_target_files and
ota_from_target_files.

Bug: 6918260
Change-Id: I7130ac52e96bd51d4d8b80ca036635e1626f01f1
akefile
asks/factory_ramdisk.mk
4da8e127c736a2e97d35f8767b8a409d2bc84cc0 02-Aug-2012 Keun young Park <keunyoung@google.com> keep PLATFORM_ZIP specified explicitly

- the old behaviour was to override with default one, which makes
trying different sets of platform.zip difficult if default one exists

Change-Id: I4c8ac2e44d9e7b48f77d628cce3edb20fbdf27e4
dk_config.mk
722266918f5b1152bab0a9c05790420d09229b29 01-Aug-2012 Keun young Park <keunyoung@google.com> add symbol files to PDK release for debugging

- app_process is not in PDK, and this makes native debugging difficult
So provide symbol file instead of source

Bug: 6774048

Change-Id: I1a3a86cf64d8f1d22cdb3a22714f508de963099b
akefile
dk_config.mk
06afc1c5ab9e07094832e790249586a7619d9539 26-Jul-2012 Raghu Gandham <raghu@mips.com> Support for MIPS Build targets.

Change-Id: I14c27305298ce36d5c100abf25489275c2269c5f
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
ombo/TARGET_linux-mips.mk
ombo/arch/mips/mips32-fp.mk
ombo/arch/mips/mips32.mk
ombo/arch/mips/mips32r2-fp.mk
ombo/arch/mips/mips32r2.mk
ombo/arch/mips/mips32r2dsp-fp.mk
ombo/arch/mips/mips32r2dsp.mk
ombo/arch/mips/mips32r2dspr2-fp.mk
ombo/arch/mips/mips32r2dspr2.mk
75f4c7232026335722ba90d486e2d27044a7a4e7 31-Jul-2012 Dianne Hackborn <hackbod@google.com> This branch is now JB MR1 development.

Change-Id: Id0463a82826c0fe4c518559fe40e4d6e088aaad9
ersion_defaults.mk
228e8cf6603bb637c09256496f0f281efe8c2ea4 15-Jun-2012 Jean-Baptiste Queru <jbq@google.com> Add new vendors

Change-Id: Id0d3599257ae39077063bb5903c912526e02cb0e
asks/vendor_module_check.mk
ab81700ce9db23b338a9d75884425b047875b031 27-Jul-2012 Jean-Baptiste Queru <jbq@google.com> am 47e63bb4: Merge "Fix build."

* commit '47e63bb4e471a2b6ed0a3c20f386668809452840':
Fix build.
7023f6179d09663b794cd113c5c57426a977a248 26-Jul-2012 Ying Wang <wangying@google.com> Fix build.

Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.

Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
akefile
ain.mk
7d8c535c1f63a97a9b77fa0b5d530778640a241c 26-Jul-2012 Ying Wang <wangying@google.com> Fix build.

Set BUILD_EMULATOR to true when HOST_OS is linux.
Disable the emulator package target if BUILD_EMULATOR is not true.

Change-Id: I8987c0a091622baa0e861b451e635c4ddb148b29
akefile
ain.mk
85f3b219719657150c5bb63663983ea5a18be662 11-Jul-2012 Andrew Boie <andrew.p.boie@intel.com> definitions.mk: Don't use GCC '@' parameter

This parameter (which causes GCC to pull additional command line
parameters out of a file) is incompatible with ccache.

- With ccache 2.x, ccache will ignore this parameters, and potentially
compute invalid command line hashes since it is not reading the
parameter file

- With ccache 3.x, ccache will refuse to cache the files and error
with 'Unsupported compiler option'.

We still use the parameter file, but Make expands it instead.

Change-Id: I070c3877cbe2d058e1cf4754bac535e7f3498861
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
efinitions.mk
f8a30598925855cb387511d32a5b3388ebc908c8 26-Jul-2012 Ed Heyl <ed@google.com> resolved conflict in mergre to goog/master

Change-Id: I6ee3a8802595786a91a1bd77188648fda9dc3447
4c9c895ab8acf846226eeacb82109026eab20586 26-Jul-2012 Nick Kralevich <nnk@google.com> am 07a06f6e: am f0daadf6: am 297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."

* commit '07a06f6e4487f2ad7d667d134fe19a089bee8412':
Add property_contexts to SELINUX_DEPENDS.
2dd9902cf965f7662eff9e84c5c8d47c3f7536af 26-Jul-2012 Joe Onorato <joeo@google.com> am 4ae631f4: am c11b5efa: Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"

* commit '4ae631f4560d383c28767641bb7e9e47ab175c7f':
Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb
42f0127a068ecb540dc98dea23932e074d127b20 26-Jul-2012 Joe Onorato <joeo@google.com> am e3adc7fd: am c22da7d7: Merge "Don\'t try to build the emulator on Mac OS if the right tools aren\'t installed."

* commit 'e3adc7fdcc04b7382d6818c5157c0a06eaf8c48f':
Don't try to build the emulator on Mac OS if the right tools aren't installed.
4ae631f4560d383c28767641bb7e9e47ab175c7f 26-Jul-2012 Joe Onorato <joeo@google.com> am c11b5efa: Merge "Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb"

* commit 'c11b5efa3a20e2364dfffbfa205306b9bd2e538a':
Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb
e3adc7fdcc04b7382d6818c5157c0a06eaf8c48f 26-Jul-2012 Joe Onorato <joeo@google.com> am c22da7d7: Merge "Don\'t try to build the emulator on Mac OS if the right tools aren\'t installed."

* commit 'c22da7d7e2de0b4cbeefb533990d81581d19432a':
Don't try to build the emulator on Mac OS if the right tools aren't installed.
e35a445f2f7b32e39d88e0ba58b120aae6807baf 26-Jul-2012 Joe Onorato <joeo@google.com> Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb

Change-Id: Ia0d06a89d0efd36c877e51b0adb45ae7bb3e5480
ain.mk
4b0c5ee8e05241aae22b900479e2fc92cd4866bf 26-Jul-2012 Andrew Hsieh <andrewhsieh@google.com> am c759e468: am b7391efb: Merge "Add -fuse-ld=bfd to x86 target"

* commit 'c759e468995417a0c8c0ca7ca38e4c937a176ab8':
Add -fuse-ld=bfd to x86 target
07a06f6e4487f2ad7d667d134fe19a089bee8412 26-Jul-2012 Nick Kralevich <nnk@google.com> am f0daadf6: am 297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."

* commit 'f0daadf6988c823355e9b59996e3dc798b7b7619':
Add property_contexts to SELINUX_DEPENDS.
74e883d1415f68dc52a7e679cd1ea1f486b8d8bb 25-Jul-2012 Joe Onorato <joeo@google.com> Don't try to build the emulator on Mac OS if the right tools aren't installed.

Change-Id: I3cd2f82f9ee64174bddbb12a18ca8fcf23bdcebd
ain.mk
c759e468995417a0c8c0ca7ca38e4c937a176ab8 25-Jul-2012 Andrew Hsieh <andrewhsieh@google.com> am b7391efb: Merge "Add -fuse-ld=bfd to x86 target"

* commit 'b7391efbf03d47876fd0747a5cf2199f6b4a503a':
Add -fuse-ld=bfd to x86 target
f0daadf6988c823355e9b59996e3dc798b7b7619 25-Jul-2012 Nick Kralevich <nnk@google.com> am 297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."

* commit '297d6c02bc1e1c63404d8d81df28f3f13046fe85':
Add property_contexts to SELINUX_DEPENDS.
f116e9bc84411c4923ef42c3cdd4378de0610d1d 25-Jul-2012 Andrew Hsieh <andrewhsieh@google.com> Add -fuse-ld=bfd to x86 target

Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".

Change-Id: I4e78967a076b3d093dd55366f7a54f0c9f9a45d1
ombo/TARGET_linux-x86.mk
bae121afcda8ffdca9cc03030f790121af251cea 25-Jul-2012 Andrew Hsieh <andrewhsieh@google.com> Add -fuse-ld=bfd to x86 target

Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".

Change-Id: Ie6fa0a2ddfc57b650552c8cf0891f738a5be0dda
ombo/TARGET_linux-x86.mk
9f42af5bbcd91792e603729baa0d81f9a883d460 24-Jul-2012 Ying Wang <wangying@google.com> resolved conflicts for merge of a8df6091 to master

Change-Id: I2d088c09738b34f72c2efa030304fca28ad0e791
a8df6091fe31dca3830fffe89a3578133584bc48 23-Jul-2012 Ying Wang <wangying@google.com> am 28437aac: Add LOCAL_SOURCE_FILES_ALL_GENERATED support

* commit '28437aac999eb04d1698d9a6de87a25b5b772da6':
Add LOCAL_SOURCE_FILES_ALL_GENERATED support
20b1d095936b4b4195e21fd0f7362d19f4050313 10-Jul-2012 rpcraig <rpcraig@tycho.ncsc.mil> Add mac_permissions.xml dependency.

Include the MMAC install perms policy configuration
file to the list of SELINUX dependencies.
This changes depends on the project:

git.selinuxproject.org/~seandroid/selinux/mac-policy

Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

Change-Id: Ief91d6a717741c91c5ba8745452bb247dc8048ec
akefile
28437aac999eb04d1698d9a6de87a25b5b772da6 19-Jul-2012 Ying Wang <wangying@google.com> Add LOCAL_SOURCE_FILES_ALL_GENERATED support

Set "LOCAL_SOURCE_FILES_ALL_GENERATED := true" if you want to build a
Java library from only generated source files, without any static
source files. Previously this is not allowed.
This is needed by building api stub libraries, which have only source
files of generated stub files.

Bug: 6814443
Change-Id: Idb2ae9c71a473b796154a03ef07a3403461c4f3c
lear_vars.mk
ava.mk
6fe6c3c22e5e333456606fd28f1c5a2e34119d0f 19-Jul-2012 Colin Cross <ccross@android.com> pdk: add telephony-common and mms-common

Factory test apps may need to compile against telephony-common and
mms-common, include the jars in the pdk platform.zip.

Change-Id: Ic3533ec42115150b94298f15acd877ef61c6660c
dk_config.mk
297d6c02bc1e1c63404d8d81df28f3f13046fe85 18-Jul-2012 Nick Kralevich <nnk@google.com> Merge "Add property_contexts to SELINUX_DEPENDS."
42ced6d5e2380a965fd2257770cfe11381f8f381 18-Jul-2012 Bruce Beare <bruce.j.beare@intel.com> x86: cleanups for toolchain

The 4.4.3 TC was still being specified in one spot.
Also, no need to cross-set x86/ARM variables when buliding
for ARM/x86.

Change-Id: Icbb0f772a983a24dc10ccab0800d4b7bbd60a099
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
umpvar.mk
c4e790dc6474566799012728f9e67f5d794975b4 01-Jul-2012 Wink Saville <wink@google.com> Create telephony-common and mms-common - DO NOT MERGE

These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms

telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony

Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
ex_preopt.mk
f34a9bac0e6a3bcb8eb8820fc0f50c84728d1054 16-Apr-2012 Andrew Boie <andrew.p.boie@intel.com> core/Makefile: also look for device/*/build/tasks

This eases cross-repo dependencies between device/ and
vendor/.

Change-Id: I72e283d22f16e50555ec7ba7bcf9c61ea07f083c
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
akefile
2f16ba59974adadc0e18dddb56d461c336b09bbc 13-Jul-2012 Justin Ho <justinho@google.com> Android 4.1.2 version bump

Change-Id: Ie135022b4ddcac457071aec7b217d41ebdcde188
ersion_defaults.mk
a44a92914b827a4a144d32537950398657b6dd9d 12-Jul-2012 Wink Saville <wink@google.com> Merge commit 'c16c9454' into mit

* commit 'c16c9454':
Create telephony-common and mms-common
c16c945497852629294f9207d317886f8af3a375 01-Jul-2012 Wink Saville <wink@google.com> Create telephony-common and mms-common

These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
frameworks/base/core/java/com/google/android/mms
to:
frameworks/opt/mms

telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony

Change-Id: I5613c1447dbe655c55f9ba499e453bb59a06c4c0
ex_preopt.mk
9e43f348402adc8b079ad707540c7cecc02e23a8 05-Jul-2012 rpcraig <rpcraig@tycho.ncsc.mil> Add property_contexts to SELINUX_DEPENDS.

This ensures there is a dependency between the root image
and changes to property_contexts file.
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>

Change-Id: I9bd2c3fc44015d6013e6a1f200f8abded271654f
akefile
952f55e7ae329021c9bf25ab021065f9326beec7 03-Jul-2012 Ed Heyl <ed@google.com> 4.1.1

Change-Id: Ide0b70ce6322dad26461a9fb87e1b629aaedf1e5
ersion_defaults.mk
594165c17b1a60bac3e428fdff882ea61d12db14 03-Jul-2012 Ying Wang <wangying@android.com> am 9ffe27e0: am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."

* commit '9ffe27e013c84e036d5e38b02edf3ca12f7405a8':
This property is set when HAVE_SELINUX:=true during build.
9ffe27e013c84e036d5e38b02edf3ca12f7405a8 03-Jul-2012 Ying Wang <wangying@android.com> am 9e38d6bf: Merge "This property is set when HAVE_SELINUX:=true during build."

* commit '9e38d6bf1bf78a00d8f4288e6444be358a70a692':
This property is set when HAVE_SELINUX:=true during build.
9d8a51f537cc1191655e0d8edc7eaffde2503ac7 03-Jul-2012 William Roberts <bill.c.roberts@gmail.com> This property is set when HAVE_SELINUX:=true during build.

This will provide a convenient method for determing build
configuration when in the Java layer. For instance, this will
be used in change id I69529fb7a3adfe31eccb16d79740fc4952ff5e68
to determine if the Settings app should display the SE Linux
status.

Change-Id: Idc8dff020aaac41649eac64f5fa8e311dabbc51f
ain.mk
dfb581802726a6eecd151730e379aeebf4defc33 30-Jun-2012 Ying Wang <wangying@google.com> am d512fda4: am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"

* commit 'd512fda4ae7cc56cc9b83fcb6e7a9e0d0f02c259':
Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
d512fda4ae7cc56cc9b83fcb6e7a9e0d0f02c259 30-Jun-2012 Ying Wang <wangying@google.com> am e42ed0ba: Merge "Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk"

* commit 'e42ed0ba1571f20866609710ba7c73fd138c0405':
Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk
478ba5e3f00bb1321cd022d744020231f2449287 29-Jun-2012 Ying Wang <wangying@google.com> Move the llvm-gcc warning from HOST_darwin-x86.mk to main.mk

Bug: 6754632
So the warning won't show up when you run lunch.
Now the warning only shows when you do a clean build.

Change-Id: I7876da783f059d390f0072df37d3ab0291589eb7
ombo/HOST_darwin-x86.mk
ain.mk
d6e105bad170d104397b7a8dccaeeea9a010e507 27-Jun-2012 Steve Block <steveblock@google.com> Merge "Don't fail if a target of type NONE has a NOTICE file present"
f55aeb0668076ada7378d76bc5a0ac1d29ed8089 27-Jun-2012 Steve Block <steveblock@google.com> Don't fail if a target of type NONE has a NOTICE file present

Targets of type NONE are used extensively in Android makefiles which have been
auto-generated from gyp build files. The gyp generator uses such targets to
represent gyp targets which don't produce an output file. Typically, many such
targets exist in a single Android makefile.

We use a generated Android makefile for Chromium. This project has a NOTICE
file, intended to be installed with a SHARED_LIBRARY target. However, the build
fails when processing the targets of type NONE, as it does not know where
to install the NOTICE file.

This change causes the NOTICE to be ignored in this case, rather than failing
the build.

Change-Id: I70cf9a406e4a1c932f8a734f53491f7c5281ee17
otice_files.mk
bec4a4b980261e35155cb53981ad39ef5423109a 27-Jun-2012 Stephen Hines <srhines@google.com> Disable libcompiler-rt-extras for BUILD_TINY_ANDROID.

Change-Id: I05aa9e43f987ef422d98f43b3734dfbc261feb4b
inary.mk
471d6d8b11e63af883bb3e11524f81d3dbd90029 22-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 4a65f812: am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI"

* commit '4a65f812373e1ecfa6e7058d635e998429a4cf17':
Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
4a65f812373e1ecfa6e7058d635e998429a4cf17 22-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI"

* commit '6e587f53152127370c6b45204f6529dd7b0ce32a':
Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
1cc65fd6eff62bbe0bf99c006398416a142bdbbf 19-Jun-2012 Ying Wang <wangying@google.com> resolved conflicts for merge of 9b76c054 to master

Change-Id: I4190ef6895b7ddb27d9a293cbacecdef1f4f20b8
9b76c054c6039088d310a82fc0ed33298756c58b 19-Jun-2012 Ying Wang <wangying@google.com> am 0872a010: Merge "More flexibility to keep/remove R.class in static Java library" into jb-dev

* commit '0872a010659d20633f07f4ef54cf61f8e4b6e030':
More flexibility to keep/remove R.class in static Java library
ae25ec1bcdeb028a2db3103abdf1f22768928f0a 19-Jun-2012 Ying Wang <wangying@google.com> More flexibility to keep/remove R.class in static Java library

- Usually you don't need to set LOCAL_JAR_EXCLUDE_FILES in your
Android.mk, if your static library is directly used by an app.
- If your library will be included by another library that need
reference the R/Manifest class, you can set
LOCAL_JAR_EXCLUDE_FILES := none
to keep the generated classes.
- If your library includes another static library that has Android
resource and you want to remove the generated classes carried by
the static library, set:
LOCAL_JAR_EXCLUDE_FILES := $(ANDROID_RESOURCE_GENERATED_CLASSES)

With the LOCAL_JAR_EXCLUDE_FILES value "none", deprecate the old
long variable LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY.

Change-Id: I3b9ad5d66f0262f784feb09bc1537c5b01256258
lear_vars.mk
efinitions.mk
tatic_java_library.mk
3caa951610c8d34f418d740c92efe56df1caceba 19-Jun-2012 Ying Wang <wangying@google.com> Merge "lint support."
0d570a71630d70a80e838f068d413f1c1a5f55af 19-Jun-2012 Ying Wang <wangying@google.com> lint support.

Bug: 6167394
$make lint-<app-name> # to lint on a single module
$make lintall # to lint on all packages in the source
tree.

Change-Id: I4decc76fb75793ce44809232b0ec72b766fbb434
lear_vars.mk
onfig.mk
ain.mk
ackage.mk
f02b41d42b01d5698b215611791e893685025b85 19-Jun-2012 Ying Wang <wangying@google.com> Merge "Revert "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build""
692a3d598d74da146f13139ce65e2868911a45b2 19-Jun-2012 Ying Wang <wangying@google.com> Revert "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build"

This reverts commit 81f0fd6cdbf42d1034bf9e9f36991a131eca3f4f

The change broke the CTS build:
CTS does need the jni library embedded in the apk.
ackage.mk
f4d1438d859bbbc289b55ba28c62de73f8c83fd5 18-Jun-2012 Keun young Park <keunyoung@google.com> clean up pdk_config.mk

- define ...JAVA_ZIP_... variables only when necessary
- fix missed case for TARGET_BUILD_JAVA_SUPPORT_LEVEL definition

Change-Id: I4f491ff212fd1e973a77499bbf3fd8d1940bb1f8
dk_config.mk
0caa16b0d9a93a1cacbb1478d42880647a8451b6 18-Jun-2012 Ying Wang <wangying@google.com> am 51125621: am 43ca4a45: Remove the user tag and legacy prebuilts for the srec modules.

* commit '51125621080c64b106abaeb414676cf51c0fd9c3':
Remove the user tag and legacy prebuilts for the srec modules.
51125621080c64b106abaeb414676cf51c0fd9c3 18-Jun-2012 Ying Wang <wangying@google.com> am 43ca4a45: Remove the user tag and legacy prebuilts for the srec modules.

* commit '43ca4a45a43e2084b5a40af90ff523b0417d31c0':
Remove the user tag and legacy prebuilts for the srec modules.
596549c4d3c3bfb35c6764d1efd58c1d9f8f197b 18-Jun-2012 Torne (Richard Coles) <torne@google.com> Merge "Make building an empty static library work."
43ca4a45a43e2084b5a40af90ff523b0417d31c0 15-Jun-2012 Ying Wang <wangying@google.com> Remove the user tag and legacy prebuilts for the srec modules.

Change-Id: I20d8ec8986e2da76fbab67d1f86f5d385bd87c47
egacy_prebuilts.mk
ser_tags.mk
e4ff0b0042446baeb8a9dcbee3e031b3ae26cfca 16-Jun-2012 Ying Wang <wangying@google.com> Merge "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build"
bffaef246a5b838eb40a642463b1186935424fae 15-Jun-2012 Torne (Richard Coles) <torne@google.com> Make building an empty static library work.

Handle the case where a static library is not built because it has no
input files (e.g. because they are conditionally included and it happens
that the computed list is empty). Previously, ar never ran because of
split-long-arguments, and anything that depended on the static library
would fail to link. Make sure that ar runs at least once.

Change-Id: If0071d7ae50c4e45fff1772dca43187af155db1f
efinitions.mk
70dc3e1d3d58647a7c9e4173d7a7fefd28ad81e3 15-Jun-2012 Kito Cheng <kito@0xlab.org> Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI

Change-Id: Ia95dc7318e17c0804867b22e239edccc5cbec0af
inary.mk
lear_vars.mk
xecutable.mk
hared_library.mk
tatic_library.mk
81f0fd6cdbf42d1034bf9e9f36991a131eca3f4f 15-Jun-2012 Ying Wang <wangying@google.com> Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build

To save space.

Change-Id: I7c88c13e4225bed89106917de57cbae74fc79ab8
ackage.mk
a9e85effdd50db0dbd04c7b6bb38f8b3f4e88bf8 14-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am ffbef646: am 74aba614: Allow additional vendors

* commit 'ffbef646d2bec4f84874bdc5940c3b060904cb3d':
Allow additional vendors
ffbef646d2bec4f84874bdc5940c3b060904cb3d 14-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 74aba614: Allow additional vendors

* commit '74aba61404f0c1ea8693d2959d81d8b5b1bdf5d4':
Allow additional vendors
74aba61404f0c1ea8693d2959d81d8b5b1bdf5d4 14-Jun-2012 Jean-Baptiste Queru <jbq@google.com> Allow additional vendors

Bug: 6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
asks/vendor_module_check.mk
022a7b32efb9ff9ad36dca70696c428b1059ade4 13-Jun-2012 Ying Wang <wangying@google.com> Fix arm mode for the generated protobuf code.

Change-Id: Ic644ab9e1b83d9616dd9ca93362805cdd17f36a7
inary.mk
41a3fb37079e09365a91aa00557914b323c87e54 13-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 6e207824: resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp

* commit '6e207824af267eea8777949ccf6d0584accd55a0':
x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3
6e207824af267eea8777949ccf6d0584accd55a0 13-Jun-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp

Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb
3f8ff030e0c693ca0b1758612ecb571711ec2667 13-Jun-2012 Jean-Baptiste Queru <jbq@google.com> Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3"
2f65e81974f733648b5eff4983d34a09d51f66c8 13-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 06b1a47f: am d3d78a30: am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"

* commit '06b1a47fe19699e8cb94fd6a007f82f3b41119fe':
gcc 4.6 requires --copy-dt-needed-entries
8e53708ab11fe736dc2a9bda2e923599ba8c503b 13-Jun-2012 Ying Wang <wangying@google.com> Don't add COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES if we build against NDK.

Change-Id: I732be02bb4b9ee7a2d11ed89f409487f0bc37d0f
inary.mk
06b1a47fe19699e8cb94fd6a007f82f3b41119fe 13-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am d3d78a30: am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"

* commit 'd3d78a30a4f8dd40fa055577ea2708ab34606cec':
gcc 4.6 requires --copy-dt-needed-entries
2897f052d446faf264f9a01d14ae493f8cfd06ad 13-Jun-2012 Stephen Hines <srhines@google.com> Merge "EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds."
a11ad6c2b3cdf13581c4329679cd3d2952323f6d 13-Jun-2012 Jean-Baptiste Queru <jbq@google.com> Merge "gcc 4.6 requires --copy-dt-needed-entries"
c72f39664d6e6a9d15b912cd72e7bcef121fcc11 11-Jun-2012 Stephen Hines <srhines@google.com> EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds.

Change-Id: I463217aef573a28069469514ad94cd85a7f38bea
inary.mk
lvm_config.mk
64661472209199f16d0da4503f9919bf66e71463 12-Jun-2012 Ying Wang <wangying@google.com> Don't build userdata.img in tests build.

Bug: 6035501

Change-Id: Ie1a0804f7fcc54383f2d8b97ac4583000e67cec5
akefile
e556005331b004498b4972f55f04a0e2a905d11c 08-Jun-2012 Ying Wang <wangying@google.com> resolved conflicts for merge of 5c0ee702 to master

Change-Id: I6bdcc87482c45988d410a4c4d0abc43a1416277e
5c0ee702d61b030552c9907f6ddb3eb0470a009a 08-Jun-2012 Ying Wang <wangying@android.com> am 79d39a30: am 874563f9: Merge "Fix generic build on Max OS X 10.7 Lion"

* commit '79d39a303e036dc70eccf2e2e7489fa0bbfd3a4b':
Fix generic build on Max OS X 10.7 Lion
02eb37c267adff3528c9e88cdfdd59035ce934b8 08-Jun-2012 SangWook Han <swhan@nemustech.com> Fix generic build on Max OS X 10.7 Lion

Recover variable build_mac_version which is removed on
commit 644dc16 and added on commit 9ce06f1.

Without this, ranlib libSDL.a is executed on Lion which
causes build fail of emulator-arm.

Change-Id: I06144a288921f8f968ef457999398c1b9152d4aa
ombo/HOST_darwin-x86.mk
10f775379d4e9a9f4a5af79484c9f1e337dfab4b 07-Jun-2012 Ying Wang <wangying@google.com> Tweak cflags for building with SDK 10.6.

Change-Id: I4db9949577591ef6756812769f04cfaddd876faf
ombo/HOST_darwin-x86.mk
1a2c28368c47e8e38a85c04756de850a24736355 08-Jun-2012 Keun young Park <keunyoung@google.com> am fe8cddea: am efe02ce9: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK

* commit 'fe8cddea28bc5a5266ede2bd10b482dbe840c0bf':
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
fe8cddea28bc5a5266ede2bd10b482dbe840c0bf 08-Jun-2012 Keun young Park <keunyoung@google.com> am efe02ce9: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK

* commit 'efe02ce9e00b9aebde7e9b32e81780d8de8f0dbd':
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
efe02ce9e00b9aebde7e9b32e81780d8de8f0dbd 07-Jun-2012 Keun young Park <keunyoung@google.com> add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK

- three levels: not defined, sdk, platform
- TARGET_BUILD_PDK_JAVA_PLATFORM gives the original meaning of java platform API
supported for java.mk
- remove libexif from user tag
- libexif_jni is pulled from f/b/media

Bug: 6623618

Change-Id: I5fa085bd10f43963350c57b7f885c700de8963e5
ava.mk
ain.mk
dk_config.mk
ser_tags.mk
ebde54b265a4701d843060e62384fd089893f8fa 07-Jun-2012 Raphael Moll <ralf@android.com> am 748f9e38: am b53a073d: am e375c940: Merge "SDK: Use "strip -x" for atree."

* commit '748f9e3804834610a59081db4c2952dcb7ee00d4':
SDK: Use "strip -x" for atree.
748f9e3804834610a59081db4c2952dcb7ee00d4 07-Jun-2012 Raphael Moll <ralf@android.com> am b53a073d: am e375c940: Merge "SDK: Use "strip -x" for atree."

* commit 'b53a073ddb3a5036f41ea2956792991b7a46da02':
SDK: Use "strip -x" for atree.
e375c940b9210ea514227b0ee8cfb896d7f11d93 07-Jun-2012 Raphael Moll <ralf@android.com> Merge "SDK: Use "strip -x" for atree."
fcc2a604af482dfc1d6f905b0f5ddaf856536389 07-Jun-2012 Ying Wang <wangying@android.com> am f1e424a6: am 3da13457: am 4b030617: Merge "XCode 4.3+ compatibility check-in"

* commit 'f1e424a63658eb15ba61ca2eb8f0df38733188fe':
XCode 4.3+ compatibility check-in
f1e424a63658eb15ba61ca2eb8f0df38733188fe 07-Jun-2012 Ying Wang <wangying@android.com> am 3da13457: am 4b030617: Merge "XCode 4.3+ compatibility check-in"

* commit '3da13457cfa46cf7d46b57c00f387c7c310b2dba':
XCode 4.3+ compatibility check-in
51f9bb02dab7d7207b6c1976160dfeb951d13be1 07-Jun-2012 Al Sutton <al@funkyandroid.com> XCode 4.3+ compatibility check-in

XCode 4.3 and later use a different location for SDKs. This check in
ensures the build checks for the new location as well as the old one.

Change-Id: I97884e5009f229f8b42e57a8feeb702b3a40a241
Signed-off-by: Al Sutton <al@funkyandroid.com>
ombo/HOST_darwin-x86.mk
a46c480e43cc61d0190569684f0a1e53a5da75b6 05-Jun-2012 Nick Kralevich <nnk@google.com> arm: add -D_FORTIFY_SOURCE=1 to the default cflags

Add additional compile and runtime buffer overflow detection to
Android. As of today, Android supports additional buffer overflow
detection for the following libc functions:

* memcpy
* memmove
* strcpy
* strcat
* strncpy
* strncat

Support for additional functions will be added to bionic libc in
future code changes.

Please see
* http://gcc.gnu.org/onlinedocs/gcc/Object-Size-Checking.html
* http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html

for information on these features.

Change-Id: I1a281a4bac20009f4730dd8d8b798fa107576230
ombo/TARGET_linux-arm.mk
ec5fe91ead27bf4bfb4e728222ac6d475f04a18b 07-Jun-2012 Raphael Moll <ralf@android.com> SDK: Use "strip -x" for atree.

Also fixes atree to accept an alternate command via the env var ATREE_STRIP
and correctly splits it for execvp if it contains arguments.

Change-Id: I8691bdc569bea3dddfde6249217dc305b6ef19f7
akefile
d5ba4064c3cccdd453cd10bbef2d25ec5c286a62 06-Jun-2012 Ying Wang <wangying@google.com> am f521a8e8: am 6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev

* commit 'f521a8e888a425dcd5fff70d18d14c9324e2d3aa':
Clean common intermediate files if overlay changed
f521a8e888a425dcd5fff70d18d14c9324e2d3aa 06-Jun-2012 Ying Wang <wangying@google.com> am 6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev

* commit '6afbda9f07821deed6eb110247ab56fb47dfc775':
Clean common intermediate files if overlay changed
6afbda9f07821deed6eb110247ab56fb47dfc775 06-Jun-2012 Ying Wang <wangying@google.com> Merge "Clean common intermediate files if overlay changed" into jb-dev
049f4055a8bb497a2d9b72361658e5aa331eecd9 06-Jun-2012 Joe Onorato <joeo@google.com> am d7d0afca: Add the ability in a product spec file to have modules installed for specific variants.

* commit 'd7d0afcaea24b0fb0cb37dca921a5ff52fd2485b':
Add the ability in a product spec file to have modules installed for specific variants.
d7d0afcaea24b0fb0cb37dca921a5ff52fd2485b 06-Jun-2012 Joe Onorato <joeo@google.com> Add the ability in a product spec file to have modules installed for specific variants.

Change-Id: Ifa5eb2e15b3d3e5007378ec00efc4aec3e9a3b99
ain.mk
roduct.mk
130ae6adcb418d461b78d6667527137854f54592 06-Jun-2012 Ying Wang <wangying@google.com> resolved conflicts for merge of 9f4d00b9 to master

Change-Id: I1818896ae714aa54ad980bfbf7648652369497e5
9f4d00b94bb282bdcb1fdbc95dc006c5c52ca8db 06-Jun-2012 Ying Wang <wangying@google.com> am e534e2eb: am 47450542: Merge "Use Mac OS X SDK 10.6."

* commit 'e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7':
Use Mac OS X SDK 10.6.
644dc164cc932322499d940609f0d8548067ffba 26-May-2012 Ying Wang <wangying@google.com> Use Mac OS X SDK 10.6.

Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
ombo/HOST_darwin-x86.mk
a23b91dacfe51e0d0a37a976b7e8192215e73bf8 05-Jun-2012 Ying Wang <wangying@google.com> Merge "Use Mac OS X SDK 10.6."
359264ae030e799ce5d9ab4a0281e8f7da0ffd50 05-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am c9f8b8d1: am 90beb4f1: Add some known binary owners

* commit 'c9f8b8d17ea17f722157aa58014dc1f1168996c1':
Add some known binary owners
c9f8b8d17ea17f722157aa58014dc1f1168996c1 05-Jun-2012 Jean-Baptiste Queru <jbq@google.com> am 90beb4f1: Add some known binary owners

* commit '90beb4f155f9e0a7508854ded5b2c3dd87d702f5':
Add some known binary owners
90beb4f155f9e0a7508854ded5b2c3dd87d702f5 05-Jun-2012 Jean-Baptiste Queru <jbq@google.com> Add some known binary owners

Bug: 6611375
Change-Id: I082128ad15b277ced82c8530c17186842839a557
asks/vendor_module_check.mk
71004f81351511b4873cdb09d52b7624158a4840 25-May-2012 Ying Wang <wangying@google.com> Clean common intermediate files if overlay changed

This change cleans the packages' intermediate files if their overlays
changed between incremental builds.
If two builds have different overlay, they will have different R
classes, and so the jar files in the common intermediate dirs can
not be shared. Therefore incremental build can't be applied.

This change detects the overlay changes on package's base.
If a package's overlay is different from the previous build, its common
intermediate dir is nuked.
This makes broader incremental builds possible.

Change-Id: I368610ebbbbc85a80f9aecd714ab22cd78da7f12
ain.mk
ackage.mk
ost_clean.mk
94539b152e700da1a4c56a47ed8082a51a2855a7 02-Jun-2012 Ying Wang <wangying@google.com> am 0fb728b6: am 28a18175: Don\'t use .. to reference the target file.

* commit '0fb728b65ab2199e0273af1217711aa46d6504c6':
Don't use .. to reference the target file.
0fb728b65ab2199e0273af1217711aa46d6504c6 02-Jun-2012 Ying Wang <wangying@google.com> am 28a18175: Don\'t use .. to reference the target file.

* commit '28a181759079c34f8776f98f553e56554b527069':
Don't use .. to reference the target file.
28a181759079c34f8776f98f553e56554b527069 02-Jun-2012 Ying Wang <wangying@google.com> Don't use .. to reference the target file.

Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
akefile
93aec1fa33e6c0d2c337ddd63d7b045e1e25bc48 31-May-2012 Wink Saville <wink@google.com> am 84690f96: am f97105ea: Merge "Fix rild running in Nakasi." into jb-dev

* commit '84690f969e993ca712d028b9acfb0a7c17c08c44':
Fix rild running in Nakasi.
84690f969e993ca712d028b9acfb0a7c17c08c44 31-May-2012 Wink Saville <wink@google.com> am f97105ea: Merge "Fix rild running in Nakasi." into jb-dev

* commit 'f97105ea898fd4ad83ca55e391c0d512e3497b9b':
Fix rild running in Nakasi.
f97105ea898fd4ad83ca55e391c0d512e3497b9b 31-May-2012 Wink Saville <wink@google.com> Merge "Fix rild running in Nakasi." into jb-dev
689f117b6325cfb58cbb07560f503b7f7c688707 31-May-2012 Wink Saville <wink@google.com> Fix rild running in Nakasi.

The module rild is telephony specific, since Nakasi has no radio
it shouldn't run rild. Changing the build system so rild is optional
for products that don't have telephony support.

Since rild is now optional, it is necessary to add it explicitly to
the sdk build as the sdk build is special.

Bug: 6463864
Change-Id: If944e051023b567807585fb91163a1e3f79c1024
ser_tags.mk
abf72cf3f4cc189ec0129f855028c6a7be0c07bf 26-May-2012 Ying Wang <wangying@google.com> Use Mac OS X SDK 10.6.

Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
ombo/HOST_darwin-x86.mk
ca7d27212e89ee6d890e3e6017679468fd82b3b5 31-May-2012 Keun young Park <keunyoung@google.com> am dd8fe390: am 36e4e050: Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev

* commit 'dd8fe390ae9244398b41d23adfb42dbaa9804599':
add add-to-product-copy-files-if-exists for pdk
dd8fe390ae9244398b41d23adfb42dbaa9804599 31-May-2012 Keun young Park <keunyoung@google.com> am 36e4e050: Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev

* commit '36e4e050ff52956fc4afe60c156e81c2016304c4':
add add-to-product-copy-files-if-exists for pdk
36e4e050ff52956fc4afe60c156e81c2016304c4 31-May-2012 Keun young Park <keunyoung@google.com> Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
c41c5f4e46ff8da87de593e581ac9ed27b42504b 30-May-2012 Keun young Park <keunyoung@google.com> add add-to-product-copy-files-if-exists for pdk

Change-Id: Ib35006824de81be31652bfff220bbe4e814869ce
roduct.mk
645020913cbe3edc6fa10a4c54ecef0ec1d56251 31-May-2012 Jeff Brown <jeffbrown@google.com> am 0e18fc47: am 01efddb0: Make make make faster.

* commit '0e18fc47b6181df7d354860095453475c7ecfca0':
Make make make faster.
0e18fc47b6181df7d354860095453475c7ecfca0 31-May-2012 Jeff Brown <jeffbrown@google.com> am 01efddb0: Make make make faster.

* commit '01efddb0b8c641a9ebfd955173dd58e015fbe903':
Make make make faster.
01efddb0b8c641a9ebfd955173dd58e015fbe903 30-May-2012 Jeff Brown <jeffbrown@google.com> Make make make faster.

Optimize common case of uniq-words where the word is not
actually duplicated. Reduces make startup overhead.

Change-Id: I1bee13bbd08a7b01248f4452283a64a724663d02
ode_fns.mk
979bf128160959a67fd3c4e91ed1f02d07061c8c 30-May-2012 Keun young Park <keunyoung@google.com> am 2e64f64c: am 3e93aeae: add platform.zip from platform-java to dist

* commit '2e64f64c9bc1cc8cbf0f59723b78a278dec66b3b':
add platform.zip from platform-java to dist
2e64f64c9bc1cc8cbf0f59723b78a278dec66b3b 30-May-2012 Keun young Park <keunyoung@google.com> am 3e93aeae: add platform.zip from platform-java to dist

* commit '3e93aeae10aa70ab64e78fbab0bb8741d0b04d99':
add platform.zip from platform-java to dist
3e93aeae10aa70ab64e78fbab0bb8741d0b04d99 30-May-2012 Keun young Park <keunyoung@google.com> add platform.zip from platform-java to dist

Change-Id: I08e110edf70ef5ec313ee02e03803fa152f0aa6a
akefile
1dfdbc95d1d1c32f3077a9647eb363001d2309e0 29-May-2012 Ying Wang <wangying@google.com> am a9b484ad: am 82eb7082: Fix typo.

* commit 'a9b484ad0ee562225282098b701fe3696ad04bec':
Fix typo.
a9b484ad0ee562225282098b701fe3696ad04bec 29-May-2012 Ying Wang <wangying@google.com> am 82eb7082: Fix typo.

* commit '82eb7082aa9b7239770f1631211a3c18b6daacfe':
Fix typo.
82eb7082aa9b7239770f1631211a3c18b6daacfe 29-May-2012 Ying Wang <wangying@google.com> Fix typo.

Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503
akefile
9d50defb8b13324d2b81f76dace70e2baeaa7cf1 26-May-2012 Ying Wang <wangying@google.com> Revert "Use Mac OS X SDK 10.6."

This reverts commit 4c1b310b9bdbebef83d298d305beb0122a7204f6
ombo/HOST_darwin-x86.mk
4c1b310b9bdbebef83d298d305beb0122a7204f6 26-May-2012 Ying Wang <wangying@google.com> Use Mac OS X SDK 10.6.

Change-Id: Ie36914ab1763c5606111f7501c97ed97517e7187
ombo/HOST_darwin-x86.mk
ebfe97a558710850d5d2484b4893c94e11101fa9 25-May-2012 Keun young Park <keunyoung@google.com> am f89cd668: am d8de82fb: ignore touch error happening from broken symbolic link

* commit 'f89cd6689c6d39303e61dca88d0f84f8c8fea662':
ignore touch error happening from broken symbolic link
f89cd6689c6d39303e61dca88d0f84f8c8fea662 25-May-2012 Keun young Park <keunyoung@google.com> am d8de82fb: ignore touch error happening from broken symbolic link

* commit 'd8de82fbca4371ccefb41e02ac737e3a153901b3':
ignore touch error happening from broken symbolic link
d8de82fbca4371ccefb41e02ac737e3a153901b3 25-May-2012 Keun young Park <keunyoung@google.com> ignore touch error happening from broken symbolic link

- maguro platform.zip contains hdcp.keys symbolic link which is broken except env with the key
- this causes error in the touch

Bug: 6555557
Change-Id: I5f9ff5d57c87c0d3038545eeba3b553445a8493c
dk_config.mk
c3192b316474df4f01b635a50b8696f7821b781b 16-Feb-2012 Bruce Beare <bruce.j.beare@intel.com> x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3

Change-Id: I0576514621affefea86a14d419f428761a60e067
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ombo/TARGET_linux-x86.mk
52b63178d9e7da82301ecbc7d673154242b1c9a6 07-Feb-2012 Bruce Beare <bruce.j.beare@intel.com> gcc 4.6 requires --copy-dt-needed-entries

Change-Id: Icc62106e0f2e96f4cd871bb4b3c46c7ca83cabec
Author: Bruce Beare <bruce.j.beare@intel.com>
Reviewed-by: Lu, Hongjiu <hongjiu.lu@intel.com>
ombo/TARGET_linux-x86.mk
f440828fa0b7e7931ccc39d3251db00a0d73cb19 25-May-2012 Elliott Hughes <enh@google.com> Merge "Compile Mac OS binaries with unwind tables for libcorkscrew."
97e6da867718533475694d8931cac79579d112ec 24-May-2012 Keun young Park <keunyoung@google.com> am 2b9a7982: am ac440901: Merge "enable PDK to use platform JAVA API" into jb-dev

* commit '2b9a7982e1af5be28126d0ed95fa75ff195dc87f':
enable PDK to use platform JAVA API
2b9a7982e1af5be28126d0ed95fa75ff195dc87f 24-May-2012 Keun young Park <keunyoung@google.com> am ac440901: Merge "enable PDK to use platform JAVA API" into jb-dev

* commit 'ac44090133e4e3a674be831d28d6d8cc661d2472':
enable PDK to use platform JAVA API
ac44090133e4e3a674be831d28d6d8cc661d2472 24-May-2012 Keun young Park <keunyoung@google.com> Merge "enable PDK to use platform JAVA API" into jb-dev
816b9fd4e22843c836543522464782bece1305b8 16-May-2012 Keun young Park <keunyoung@google.com> enable PDK to use platform JAVA API

- make platform-java will add necessary Java stuffs from out/target/common/
to platform.zip
- make platform works as before: no Java libraries
- normal fusion build will pick up the file, and define TARGET_BUILD_PDK_JAVA
besides TARGET_BUILD_PDK if Java stuffs are included
- For TARGET_BUILD_PDK_JAVA, java.mk does not touch LOCAL_SDK_VERSION, which will lead into
pulling non-SDK Java APIs

Bug: 6482799

Change-Id: I90b1a0b06dc774150711680a6612f2b97b9eab3f
akefile
ava.mk
dk_config.mk
468d6a584f45227a13f15c8ebb17002f80f79d93 24-May-2012 Elliott Hughes <enh@google.com> Compile Mac OS binaries with unwind tables for libcorkscrew.

Change-Id: I9755d8d39913830180da2ce32bcdd357309ff792
ombo/HOST_darwin-x86.mk
13054c365361669cf754c13bc9806f924245746f 23-May-2012 Ying Wang <wangying@google.com> am ce21b820: am 9ccacd7a: Set PWD to the absolute path of the top tree.

* commit 'ce21b8204d5713fd0d511cc3635719dd4ca0bf75':
Set PWD to the absolute path of the top tree.
ce21b8204d5713fd0d511cc3635719dd4ca0bf75 23-May-2012 Ying Wang <wangying@google.com> am 9ccacd7a: Set PWD to the absolute path of the top tree.

* commit '9ccacd7a6f27dbb38c8365b85fb07197d1fdbb29':
Set PWD to the absolute path of the top tree.
9ccacd7a6f27dbb38c8365b85fb07197d1fdbb29 23-May-2012 Ying Wang <wangying@google.com> Set PWD to the absolute path of the top tree.

Previously PWD is passed in as a shell environmental variable,
which does not point to top of the source tree if you run mm/mmm.
That in turn breaks mm/mmm if OUT_DIR_COMMON_BASE is set to an absolute
path.

Change-Id: Iac99d5668aee1bbd3cb9897750afc2149bd9f973
ain.mk
0fc900754dc1c5e3b87c15c6903ed967795126e3 22-May-2012 Andrew Hsieh <andrewhsieh@google.com> am 6dfe3e11: Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86" into jb-dev-plus-aosp

* commit '6dfe3e11a56707ce288a4dec8d3022ff61ef023f':
Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86
6dfe3e11a56707ce288a4dec8d3022ff61ef023f 22-May-2012 Andrew Hsieh <andrewhsieh@google.com> Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86" into jb-dev-plus-aosp
fed04c4c72455f7a539c8d07fd2e94e68a0a55c1 21-May-2012 Jean-Baptiste Queru <jbq@google.com> am 99e1613f: am 72b329e5: am 3c5191c6: Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"

* commit '99e1613fd5d3773387b52910d7daa86535f42e25':
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
8e376fb633f1877112d5ee3084aff4fc5e151292 21-May-2012 Andrew Hsieh <andrewhsieh@google.com> am 112a6747: Add -mno-movbe to disable "movbe" instruction from code-gen

* commit '112a674798c58052ddce94418e34f3e5a084ed1a':
Add -mno-movbe to disable "movbe" instruction from code-gen
99e1613fd5d3773387b52910d7daa86535f42e25 21-May-2012 Jean-Baptiste Queru <jbq@google.com> am 72b329e5: am 3c5191c6: Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"

* commit '72b329e5042b8fc15cbcbea3d382a072f79eb961':
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
3c5191c61ac25a8dcdfdac61d591d66e3d20e380 21-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"
b968c85edf69025e7efc5886229f16982a9165f1 21-May-2012 Andrew Hsieh <andrewhsieh@google.com> Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86

Change TARGET_ARCH_VARIANT from x86-atom to x86, for the reason
that atom-specific instruciton like "movbe" isn't "generic" to
x86 Android devices and x86 host running emulator-x86, which may
crash non-atom host in VT because "movbe" isn't supported natively.

Also revert previous fix in TARGET_linux-x86.mk which conservatively
disable "movbe" across the board

Change-Id: Ief93a3585566ffae558fcdc29741e6213a048d7d
ombo/TARGET_linux-x86.mk
112a674798c58052ddce94418e34f3e5a084ed1a 18-May-2012 Andrew Hsieh <andrewhsieh@google.com> Add -mno-movbe to disable "movbe" instruction from code-gen

Intruction "movbe" (move data after swapping bytes) is only available in
Intel atom. Disable it for more general x86 devices and x86 hosts which
run emulator-x86. Although emulator-x86 can support "movbe", most of
the time we want to run emulator-x86 with VT support for speed (with KVM
in Linux, or HAXM in Windows/MacOSX). The presence of "movbe" can crash
emulator-x86 in VT because non-atom host doesn't have it natively.

Change-Id: I86e037900ddcb8d544f92b8d8464c8627347e560
ombo/TARGET_linux-x86.mk
8b1b764812aaf0bfca087893bc34b66715cd5033 18-May-2012 Nick Sanders <nsanders@google.com> am 3ccf7686: Move build.prop in factory bundle

* commit '3ccf7686757824e5e01944a369fc54baf76f95a4':
Move build.prop in factory bundle
3ccf7686757824e5e01944a369fc54baf76f95a4 18-May-2012 Nick Sanders <nsanders@google.com> Move build.prop in factory bundle

Move build.prop to the root dir of the factory bundle for clearer location access.

Change-Id: Ib9a49fd46eb943a1dc5e8e112462f9d601332ca3
Signed-off-by: Nick Sanders <nsanders@google.com>
asks/factory_bundle.mk
b30517897fc1208e93b6a3140dc7dba68c105a51 18-May-2012 Joe Onorato <joeo@google.com> Merge commit '54973dbc' into work

Conflicts:
core/product.mk

Change-Id: Ib5eb6be09b34bdc04602e2a35a4bf7df0ba82aad
9136290afa88b3ced8ec4799587811ade0391ba5 18-May-2012 Joe Onorato <joeo@google.com> Merge commit 'bf2e8a66' into work

Change-Id: I5cd704eb59218b56b48d689afdff84638deeacf1
e1d191ee956674147ac1b34129d1f2df322fc3ae 17-May-2012 Joe Onorato <joeo@google.com> Add rules to build the factory bundle.

Change-Id: I66bda914a5bd41bda7c8a4314f658924087e2bfb
ain.mk
roduct.mk
asks/factory_bundle.mk
e44705a86f80fe356ba83b3030864f5fcff3d394 18-May-2012 Joe Onorato <joeo@google.com> Add copy-many-files macro.

Change-Id: I327fc19bdf9c1ada18b3ba695fe4104e2a241156
efinitions.mk
dacf9bfe1686eecbac3d52b687b8054e140695d6 18-May-2012 Jean-Baptiste Queru <jbq@google.com> am feec98b1: resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp

* commit 'feec98b139d2ca0b0164a5e178e75ce88b8f492f':
Use i686-linux-android-4.6 for x86 build
feec98b139d2ca0b0164a5e178e75ce88b8f492f 16-May-2012 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp

Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07
3f7246a0815cfee5179054687674c34930a9da9f 16-May-2012 Ying Wang <wangying@google.com> Delete unused variable.

Change-Id: I17f0e2c0b911e505c7ddd3c9c9c56e8a38239e17
nvsetup.mk
2436ea8a8c84d58befb4bf27d137d94c45b8cc8d 16-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Use i686-linux-android-4.6 for x86 build"
b1a4e4e89e9989b292938c800d234ab1007b848c 16-May-2012 Ying Wang <wangying@google.com> Delete the misleading var TARGET_OUT_STATIC_LIBRARIES.

Which can be replaced by TARGET_OUT_INTERMEDIATE_LIBRARIES.

Change-Id: I965ff1ebe70fc3113c19e4896277c876dcedb6a5
ase_rules.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
nvsetup.mk
rebuilt.mk
03b96f54a71a17945230c97c51f7359b086bf1ee 16-May-2012 Ying Wang <wangying@google.com> am 182a7e17: am f446039e: Merge "Don\'t set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev

* commit '182a7e170be196c600e968690bff675ff7ad7069':
Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
182a7e170be196c600e968690bff675ff7ad7069 16-May-2012 Ying Wang <wangying@google.com> am f446039e: Merge "Don\'t set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev

* commit 'f446039efb2e4d8a520c8f83dabc375c6d1370dd':
Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
6e371e426fdcd9cf87f3847dca38cf93f0b05a0c 15-May-2012 Ying Wang <wangying@google.com> Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.

Change-Id: I98ab2f6c0d49a87aaeeba29fdf676277e4e65592
ase_rules.mk
ee08fe31964ce65f97bc9f9341eee915cb0ea6aa 01-Nov-2011 Nick Kralevich <nnk@google.com> stop using a custom linker script for static executables.

This is causing problems with making the linker relocatable.

Change-Id: I53e37fba52eabd3145130712d6e9bff074aed493
ombo/TARGET_linux-arm.mk
5983d9df11acf0a8d06f7eaf3a7b7b21b5417eeb 15-May-2012 Ying Wang <wangying@google.com> am 6b524cf5: am 3ceecfa3: Check the well-formedness of an xml file before copying.

* commit '6b524cf591f83d2f733c2ecafb9b987e8872a97e':
Check the well-formedness of an xml file before copying.
6b524cf591f83d2f733c2ecafb9b987e8872a97e 15-May-2012 Ying Wang <wangying@google.com> am 3ceecfa3: Check the well-formedness of an xml file before copying.

* commit '3ceecfa3daeb187c0631a84e6ee6b4dd89f111f8':
Check the well-formedness of an xml file before copying.
3ceecfa3daeb187c0631a84e6ee6b4dd89f111f8 14-May-2012 Ying Wang <wangying@google.com> Check the well-formedness of an xml file before copying.

Bug: 6491991
Change-Id: I3dbf9a7e1fefd9fea2636c78a85bae63ea8391b8
akefile
efinitions.mk
402d7f3654cc3ad58b1df5d2ba12e908b57f861b 29-Apr-2012 H.J. Lu <hongjiu.lu@intel.com> Use i686-linux-android-4.6 for x86 build

Change-Id: Ibbb0a899f147013503d6830bb93050c5ae588539
Author: "H.J. Lu" <hongjiu.lu@intel.com>
ombo/TARGET_linux-x86.mk
5c3873c0758e31f1bb83fe85ff265ac04e1d5c56 11-May-2012 Dianne Hackborn <hackbod@google.com> Merge commit '3742983d' into manualmerge
3742983d3becfa141557d9f5b461c8d39e9d31c0 10-May-2012 Dianne Hackborn <hackbod@google.com> JellyBean is now 4.1.

Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
ersion_defaults.mk
ef86ec540bf110800e2cd6a1d8d9e7bdc912049e 11-May-2012 Ying Wang <wangying@google.com> am ffb36ede: am a1ff6290: Now current is also a valid prebuilt SDK.

* commit 'ffb36ede8f3c785173bfcea912b4c385fce40b20':
Now current is also a valid prebuilt SDK.
ffb36ede8f3c785173bfcea912b4c385fce40b20 11-May-2012 Ying Wang <wangying@google.com> am a1ff6290: Now current is also a valid prebuilt SDK.

* commit 'a1ff6290e1e14d48dc42d1eacf804172c5913916':
Now current is also a valid prebuilt SDK.
a1ff6290e1e14d48dc42d1eacf804172c5913916 11-May-2012 Ying Wang <wangying@google.com> Now current is also a valid prebuilt SDK.

Change-Id: Id05d20f17a4b46e19df88516f50e58f6cdb62c1c
onfig.mk
f8d557fa77f9702dd153218598183b5dfed474ea 11-May-2012 Ying Wang <wangying@google.com> am ba10a379: am 0ec188f1: Support to build against prebuilt current SDK in unbundled branch

* commit 'ba10a3795d813fc61a6b40e111543434a0b5cf5f':
Support to build against prebuilt current SDK in unbundled branch
ba10a3795d813fc61a6b40e111543434a0b5cf5f 11-May-2012 Ying Wang <wangying@google.com> am 0ec188f1: Support to build against prebuilt current SDK in unbundled branch

* commit '0ec188f1c197709cf61d0de647b5220539b97322':
Support to build against prebuilt current SDK in unbundled branch
0ec188f1c197709cf61d0de647b5220539b97322 11-May-2012 Ying Wang <wangying@google.com> Support to build against prebuilt current SDK in unbundled branch

Bug: 6465084
With this change and prebuilt current SDK checked in, you can build
unbundled apps with LOCAL_SDK_VERSION current in an unbundled branch.

Change-Id: I4efcee611d08a3a903bd6bf5a80de11500564206
ase_rules.mk
roiddoc.mk
ava.mk
ackage.mk
tatic_java_library.mk
0dc038075ca2e5f0b30082e4a78f900febdf5f82 10-May-2012 Nick Kralevich <nnk@google.com> am 9d602a70: am ecb1a565: x86: compile everything with relro / bind_now

* commit '9d602a7005683965814823feda5aabcce5a92201':
x86: compile everything with relro / bind_now
9d602a7005683965814823feda5aabcce5a92201 10-May-2012 Nick Kralevich <nnk@google.com> am ecb1a565: x86: compile everything with relro / bind_now

* commit 'ecb1a565849b40ab7aa45b7fe71e24e29a059376':
x86: compile everything with relro / bind_now
ecb1a565849b40ab7aa45b7fe71e24e29a059376 09-May-2012 Nick Kralevich <nnk@google.com> x86: compile everything with relro / bind_now

Enable relro / bind_now when compiling Android applications.
This marks certain regions of memory as read-only after linking,
making memory corruption security vulnerabilities are harder
to exploit.

See:
* http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
* http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html

relro support has been enabled for ARM since 233d460f21d372f964f8078b8b0d5fd17af7c6b6.
This change enables it for x86.

Change-Id: Ib90704f2fecffcfdc3587607112804faa0e16385
ombo/TARGET_linux-x86.mk
61c37e7a4f929a79efb8abf4489bac0c1ffec8ff 20-Jan-2012 Kito Cheng <kito@0xlab.org> Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES

Change-Id: I9ff53f51dcb57511a24765bdf6a61c000a7ce977

Signed-off-by: Kito Cheng <kito@0xlab.org>
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
192ed892d57760e94b4f2a6fb4a36cde6b0e6ebe 09-May-2012 Stephen Hines <srhines@google.com> am 25ceb29e: am b6956bdd: Merge "Add LLVM_AS to tools." into jb-dev

* commit '25ceb29e001e61189590e97442f3f149b5ee3731':
Add LLVM_AS to tools.
b696e0b86a099312095c4c0b65539b979635d06c 09-May-2012 Elliott Hughes <enh@google.com> am b788e87d: am 9264e4a5: The \'localize\' tool is dead.

* commit 'b788e87dab46387953baa046f32b1ae1802261f0':
The 'localize' tool is dead.
25ceb29e001e61189590e97442f3f149b5ee3731 09-May-2012 Stephen Hines <srhines@google.com> am b6956bdd: Merge "Add LLVM_AS to tools." into jb-dev

* commit 'b6956bdd19242cde11b2e9c1f3941585706f3cd3':
Add LLVM_AS to tools.
b788e87dab46387953baa046f32b1ae1802261f0 09-May-2012 Elliott Hughes <enh@google.com> am 9264e4a5: The \'localize\' tool is dead.

* commit '9264e4a5f63352cd6abc3d81b18be779a33c7b10':
The 'localize' tool is dead.
b6956bdd19242cde11b2e9c1f3941585706f3cd3 09-May-2012 Stephen Hines <srhines@google.com> Merge "Add LLVM_AS to tools." into jb-dev
7e48e404b1a39c052ab47ea82678073d386fd333 09-May-2012 Stephen Hines <srhines@google.com> Add LLVM_AS to tools.

Change-Id: If9b4900e743b9efbf4b12eee4ed5e713ce82db9b
lvm_config.mk
92fadc6fbf77d0d3c4ef6922e302b090e51884cb 08-May-2012 Jean-Baptiste Queru <jbq@google.com> am 269a40d1: am b031afab: am bf3d3287: Merge "Use the same compilation flags on OS X 10.8 as 10.7"

* commit '269a40d140753aee1e579f8179b132ffe3415150':
Use the same compilation flags on OS X 10.8 as 10.7
23e7e5ab0fbbcdc63dafaa2b3d23043661f98cd2 08-May-2012 Nick Kralevich <nnk@google.com> armelf.xsc: delete unused file.

As of a2758f19cee0a8daf3194d8c88eeb4d078000a08 in bionic/libc,
this file is no longer needed.

Deleted.

Change-Id: Ia01868522560f022d52f5509b386eccb9bf9e4f1
rmelf.xsc
9264e4a5f63352cd6abc3d81b18be779a33c7b10 08-May-2012 Elliott Hughes <enh@google.com> The 'localize' tool is dead.

Change-Id: I75c43ce064664412e45c304c15f363015c0a4697
onfig.mk
269a40d140753aee1e579f8179b132ffe3415150 07-May-2012 Jean-Baptiste Queru <jbq@google.com> am b031afab: am bf3d3287: Merge "Use the same compilation flags on OS X 10.8 as 10.7"

* commit 'b031afab543d8bf9bb236ff4c297f5ced70f8943':
Use the same compilation flags on OS X 10.8 as 10.7
35bb6422bc4dddaf7871793d213c0f7144c02f0c 07-May-2012 Al Sutton <al@funkyandroid.com> Use the same compilation flags on OS X 10.8 as 10.7

Added Mountain Lion to the list of versions which don't need ranlib
and don't need the pre-Lion linker flags

Change-Id: I0c785f0c66e324af9a209520c5a5b3c9bf7df0d5
Signed-off-by: Al Sutton <al@funkyandroid.com>
ombo/HOST_darwin-x86.mk
ceda927dff8fa387cef032fd2acd665c045dbb1c 05-May-2012 Elliott Hughes <enh@google.com> am 559ffeb2: am 8e67348b: Merge "Track libnativehelper move for PDK." into jb-dev

* commit '559ffeb2efd1a3713b715fe0590827054a3b1656':
Track libnativehelper move for PDK.
559ffeb2efd1a3713b715fe0590827054a3b1656 05-May-2012 Elliott Hughes <enh@google.com> am 8e67348b: Merge "Track libnativehelper move for PDK." into jb-dev

* commit '8e67348b515636ec8314da44b3f583c5d053e81a':
Track libnativehelper move for PDK.
89898dff4ef83b952d303afbcc621ea230f9289f 04-May-2012 Elliott Hughes <enh@google.com> Track libnativehelper move for PDK.

Bug: 6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
onfig.mk
athmap.mk
eaa0f8229531f337b4191d2aa70700f4218e797f 04-May-2012 Shih-wei Liao <sliao@google.com> Merge "Members in LOCAL_WHOLE_STATIC_LIBRARIES should be force_loaded."
b2680757a07bfd16efae3c8710c69b14807f425f 02-May-2012 Shih-wei Liao <sliao@google.com> Members in LOCAL_WHOLE_STATIC_LIBRARIES should be force_loaded.

For Mac build, force_load the LOCAL_WHOLE_STATIC_LIBRARIES.

Mac has its custom linker. However, its linking rule for generating
shared libraries doesn’t take the LOCAL_WHOLE_STATIC_LIBRARIES
into consideration.

Change-Id: Ia6858bf6e2ebb334db8f3d0bdc71d7ecc0ef11c1
ombo/HOST_darwin-x86.mk
e11abdbe57c66d44a5cc4565e89894c312f5daae 03-May-2012 Jean-Baptiste Queru <jbq@google.com> am 76cc34ca: am 6dfbf024: am 9e4e3b37: Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"

* commit '76cc34ca0adefac91f90fae478f2c6140e41e088':
TARGET_linux-arm.mk: use single slash version of -print-whatever
76cc34ca0adefac91f90fae478f2c6140e41e088 03-May-2012 Jean-Baptiste Queru <jbq@google.com> am 6dfbf024: am 9e4e3b37: Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"

* commit '6dfbf0240b77acaf7d6b650b4c206deb29337e7b':
TARGET_linux-arm.mk: use single slash version of -print-whatever
cd742a991e36877f9e20b83c558ed678cb879160 02-May-2012 Jean-Baptiste Queru <jbq@google.com> am 9bdc2907: am 8571ee47: am f562adc8: Merge "Force use of compatibility compilers on Apple\'s command line tools"

* commit '9bdc290792f8c5c4e4beb40e6b7f335759b6d6d5':
Force use of compatibility compilers on Apple's command line tools
9bdc290792f8c5c4e4beb40e6b7f335759b6d6d5 02-May-2012 Jean-Baptiste Queru <jbq@google.com> am 8571ee47: am f562adc8: Merge "Force use of compatibility compilers on Apple\'s command line tools"

* commit '8571ee478ee352827ec37460d23e6e0dbb1e96db':
Force use of compatibility compilers on Apple's command line tools
9e4e3b378fd9a62651e216f18dc26cf2b877412a 02-May-2012 Jean-Baptiste Queru <jbq@google.com> Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
0d07c732c79ec5d624dea2fa0198ffc2dfeafe2b 23-Feb-2012 Al Sutton <al@funkyandroid.com> Force use of compatibility compilers on Apple's command line tools

The cc and c++ compilers included in Apple's command line tools show some
unusual behaviour which causes the build to fail in several projects under
Xcode 4.3

This patch uses the gnu compatibility gcc and g++ compilers on OS X instead
to reduce problems, and generates an error when an llvm based compiler is
detected because they currently do not generate usable emulator executables
due to them not honouring global register variables.

Change-Id: I506c22dad3dcbd41df3c7672802a675d3655e262
Signed-off-by: Al Sutton <al@funkyandroid.com>
ombo/HOST_darwin-x86.mk
48cf73bd13e3693e6e4f92dce98f3b94a4c9760d 01-May-2012 Jean-Baptiste Queru <jbq@google.com> Restore AOSP-style version numbers - do not merge

Change-Id: I70e3568a78feed4ff69bcdbf4fe2bd13f5211b4c
uild_id.mk
ersion_defaults.mk
3072491bb3aa5c5a3abd24a16f4fba4638242d6a 01-May-2012 Ying Wang <wangying@google.com> am 000e89a5: Strengthen dependencies on LOCAL_REQUIRED_MODULES

* commit '000e89a5b95a1d3071277ff279263204f49cbd78':
Strengthen dependencies on LOCAL_REQUIRED_MODULES
65a086bbe267827071b273f7d25a095e0b419605 01-May-2012 Ying Wang <wangying@google.com> Merge "Strengthen dependencies on LOCAL_REQUIRED_MODULES"
000e89a5b95a1d3071277ff279263204f49cbd78 01-May-2012 Ying Wang <wangying@google.com> Strengthen dependencies on LOCAL_REQUIRED_MODULES

Bug: 6418863
This change expands the PRODUCT_PACKAGES with the required modules.
Before this change, since the required modules are not in the
PRODUCT_PACKAGES, they are not directly depended on by the image files.
If the dependent is not to be included in the image but the required
modules are to be included, the dependency of the image on the required
modules gets lost!
That would lead to build race condition.

Change-Id: I0b656db1538ca43d3785dbf17364ffa88b80ac41
efinitions.mk
ain.mk
asks/vendor_module_check.mk
3024d2394f1d1f51abeb45467094ec0bf82aeb0b 01-May-2012 Ying Wang <wangying@google.com> Strengthen dependencies on LOCAL_REQUIRED_MODULES

Bug: 6418863
This change expands the PRODUCT_PACKAGES with the required modules.
Before this change, since the required modules are not in the
PRODUCT_PACKAGES, they are not directly depended on by the image files.
If the dependent is not to be included in the image but the required
modules are to be included, the dependency of the image on the required
modules gets lost!
That would lead to build race condition.

Change-Id: Idbd504fd415b488c397e67ab487a22bff4fa188e
efinitions.mk
ain.mk
asks/vendor_module_check.mk
e893fc100dd08e8cfc2384bc5ba3e3e9c923605a 30-Apr-2012 Jean-Baptiste Queru <jbq@google.com> am 30f6db7e: Move stuff from prebuilt/ to prebuilts/misc

* commit '30f6db7e31263bff6925a50343483ed86b7da352':
Move stuff from prebuilt/ to prebuilts/misc
30f6db7e31263bff6925a50343483ed86b7da352 29-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Move stuff from prebuilt/ to prebuilts/misc

Change-Id: Ia13f5d09b24e3540042b6924ead6c96e94983ff4
onfig.mk
f9613a4f730b8a385971f95150582b9a543302ae 27-Apr-2012 Andrew Hsieh <andrewhsieh@google.com> Added BUILD_HOST_static to build statically linked executable/shared-lib

Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.

In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread

Change-Id: I8fa91a937b728ccdf942c4ba199efb1e2e49da3d
ombo/HOST_darwin-x86.mk
ombo/HOST_linux-x86.mk
ombo/HOST_windows-x86.mk
f8dc89b49ac64331f23c97d6aad3866dd3fb7344 27-Apr-2012 Colin Cross <ccross@android.com> Use split-long-arguments to touch pdk platform.zip files

touch $(_pdk_fusion_files) is too long for some systems, use
split-long-arguments to execute touch multiple times with a
subset of the list of files.

Change-Id: I8e8c6770936337b93e0fdf381eca8c79fd722523
dk_config.mk
83dbd2f158169c41c0ec9809ae5c3a9b87ec15cb 26-Apr-2012 Ying Wang <wangying@google.com> Option to keep the generated R class in static Java libarry

Bug: 6404748
Set LOCAL_KEEP_R_CLASS_IN_STATIC_JAVA_LIBRARY to true to do that.

Change-Id: Ieee3cae431e3b1484ec598312729f2c871db2315
lear_vars.mk
tatic_java_library.mk
233d460f21d372f964f8078b8b0d5fd17af7c6b6 26-Apr-2012 Nick Kralevich <nnk@google.com> ARM: compile everything with relro / bind_now.

Enable relro / bind_now when compiling Android applications.
This marks certain regions of memory as read-only after linking,
making memory corruption security vulnerabilities are harder
to exploit.

See:
* http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
* http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html

Stop using the custom linker script, which inhibits
relro / bind_now support.

Change-Id: Ie97ccdd2845886bbc2ba2fdd47eed0ff4b29b60b
rmelf.x
rmelflib.x
ombo/TARGET_linux-arm.mk
e5c3a091021f485dc8902fbbacf6a2054c91dfe3 24-Apr-2012 Ying Wang <wangying@google.com> Merge "Make export_includes depend on the module's definition makefile."
7e52424e4fa039fb260e0e0b07d67673c0efa526 24-Apr-2012 Colin Cross <ccross@android.com> Merge "Set timestamps of files from platform.zip to current time"
2bea2e65658c686afc11eb753f647c5257685966 24-Apr-2012 Colin Cross <ccross@android.com> Set timestamps of files from platform.zip to current time

Touch files unzipped from platform.zip to update their timestamp.
Prevents make dependency confusion from files with old times.

Also add a dependency for the implicit copy rule on the
pdk_fusion.stamp file to force make to use the updated
files.

Change-Id: Ia54454518d229ce3670023819836f586fef65d3f
dk_config.mk
fcfb41379ca362a838a5d5bb9b91f73be6267c17 24-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Merge "On linux, always use the prebuilt host toolchain"
68f1c77a8db3ee6f92194cbaeeb1bf559bb79afd 24-Apr-2012 Ying Wang <wangying@google.com> Make export_includes depend on the module's definition makefile.

Bug: 6383397

Note that LOCAL_MODULE_MAKEFILE is calculated in the macro my-dir,
which must be called at the beginning of your Android.mk to calculate
LOCAL_PATH.

Change-Id: I7aa079e37253fbda25ffb85c2e5bbf0663340e27
inary.mk
efinitions.mk
e1a42cc8bff355f1013345dcf08a2604d565bc6e 24-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Whitelist audience

Change-Id: I3a39f4bdc5c52e01b7d5d187e35b6fbf770756e2
asks/vendor_module_check.mk
4e82d1fa7f3fb1ecfa6cbd8b8ddcb6c0c0e17d1d 21-Apr-2012 Jean-Baptiste Queru <jbq@google.com> On linux, always use the prebuilt host toolchain

Change-Id: I8077c4780e1e3540e5e2133cf0ffa61d474d3acc
ombo/HOST_linux-x86.mk
ebb351e1b38422345e060ba3a986f470e461c95c 20-Apr-2012 Keun young Park <keunyoung@google.com> enable Java build for PDK build
- Highest LOCAL_SDK_VERSION forced for package build / java library build

Bug: 6352960
Change-Id: I4a26bf26a51b95fb97c8b2adc9d32a543832c708
ava.mk
dk_config.mk
e661e358291accfe8448bdf60975ff8cdf8059d6 21-Apr-2012 Keun young Park <keunyoung@google.com> Merge "Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK""
b9566c02210f6d5a91594c05b7ea28f048afab87 21-Apr-2012 Keun young Park <keunyoung@google.com> Revert "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"

This reverts commit 9283168e61a4991d39a6c599627eefc45d41c099
ava.mk
dk_config.mk
a50ef1c12441d9eccfa75409c1392befaf2abed5 21-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Switch to new locations of toolchains

Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-x86.mk
umpvar.mk
d71a7f7bc8c309452b5de95a1d887b67b7d3781c 21-Apr-2012 Colin Cross <ccross@android.com> Merge "Move pdk fusion platform.zip file under vendor/pdk"
27f8946d2db5c5025496bb0471ba351cc1d758fa 20-Apr-2012 Keun young Park <keunyoung@google.com> Merge "enable Java build for PDK build - Highest LOCAL_SDK_VERSION forced for package build / java library build - uses prebuilt tools for PDK"
9283168e61a4991d39a6c599627eefc45d41c099 20-Apr-2012 Keun young Park <keunyoung@google.com> enable Java build for PDK build
- Highest LOCAL_SDK_VERSION forced for package build / java library build
- uses prebuilt tools for PDK

Bug: 6352960
Change-Id: Ibb5162a16aa8151a1675baac14adb0cdfc13592d
ava.mk
dk_config.mk
c856e31523b2a01efc39a97207d3ce11f1db1ca5 18-Nov-2011 Jing Yu <jingyu@google.com> Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.

http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html

-fstrict-volatile-bitfields is set on by default on gcc-4.6
for ARM target. This causes an inline asm() error. While
upstream gcc community is working on the patch, we shut
off this option temporarily.

This patch does not affect gcc-4.4.3 build.

Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
ombo/TARGET_linux-arm.mk
422a3650d37730a5c793e52e3e6c815278753d22 13-Oct-2011 Doug Kwan <dougkwan@google.com> Fix build problems with gcc-4.6.x.

Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
ombo/TARGET_linux-arm.mk
b01807b36d5bfd00eeb01eac3094f30b9ffa0104 20-Apr-2012 Colin Cross <ccross@android.com> Merge changes I9a390206,If3e9e846

* changes:
build: separate dist tools and ota tools
build: remove unused ota tools
700741cf452287f3bb4a8b3f7594b145eece732d 20-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Use an https URL"
5d4bcb490e4261ab56d188cc5ac490af9cc4c826 19-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Use an https URL

Change-Id: I9842d009b852df1882eaddb1bd53b216da0f4650
ain.mk
c312f3187175d870a3d20b26b0404a59cdb2da42 19-Apr-2012 Colin Cross <ccross@android.com> build: separate dist tools and ota tools

aapt is not needed for a dist build and not available in a pdk dist
build. Create a new list DISTTOOLS that dist builds depends on,
and change OTATOOLS to be DISTTOOLS plus aapt, which is build by
make otatools.

Change-Id: I9a39020640b0e2cade8073aa14ee2ada9a20d78b
akefile
4049130cbafad03124fca8bcc05d156e4351ed02 19-Apr-2012 Colin Cross <ccross@android.com> build: remove unused ota tools

genext2fs, tune2fs, and e2fsck are no longer used by mkuserimg.sh.

Change-Id: If3e9e846e021de0973bde2702e60acdc9f4c57c7
akefile
0da5e0ba36733be1e0a8852bfb04b3361297ab7e 19-Apr-2012 Keun young Park <keunyoung@google.com> Merge "enable recovery img build for PDK"
782610165fc0a23dee93d6a297746e284edbb7ea 19-Apr-2012 Keun young Park <keunyoung@google.com> enable recovery img build for PDK

Bug: 6363041
Change-Id: I25dff887dd0946c9506926e66e0514390c20692e
akefile
21adee01841c3254506d729bc6d99df8d4c48d92 19-Apr-2012 Colin Cross <ccross@android.com> Move pdk fusion platform.zip file under vendor/pdk

Look for the platform.zip file in:
vendor/pdk/DEVICE/PRODUCT-BUILD_VARIANT/platform/platform.zip

Change-Id: I275029842fdf13867d5141549ca8c39abb23600b
dk_config.mk
616e596385d01bc2de0c4717ba53cb1c9601539d 19-Apr-2012 Ying Wang <wangying@google.com> Write out export_includes whenever the module is built.

Bug: 6362268
Change-Id: If872cf8fe597a02e6ca740a181cea85f486df98e
inary.mk
rebuilt.mk
c32af65886776a99f17406e83a40e9476452033f 19-Apr-2012 Ying Wang <wangying@google.com> Revert "Write out export_includes whenever the module is built."

This reverts commit 40c34f3778e778762c7a7dcaf8697b2c90a717de
inary.mk
rebuilt.mk
40c34f3778e778762c7a7dcaf8697b2c90a717de 19-Apr-2012 Ying Wang <wangying@google.com> Write out export_includes whenever the module is built.

Bug: 6362268
Change-Id: Ic5d028c108423c694736a06c05ec13093d42f1b8
inary.mk
rebuilt.mk
dbff3f5b77fa898175d823736188deb6bf72f419 13-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Whitelist widevine

Change-Id: I4863b335ebc02d642874a4dd3dd9a8af93455d7b
asks/vendor_module_check.mk
db8698be856215e080ad10101a652d6b388ce671 13-Apr-2012 Kevin Hester <khester@google.com> am 6c703628: Allow packages to place manifest files in any directory

* commit '6c703628c54275797caf2b524686d3dd2e34385c':
Allow packages to place manifest files in any directory
6c703628c54275797caf2b524686d3dd2e34385c 12-Apr-2012 Kevin Hester <khester@google.com> Allow packages to place manifest files in any directory

via a new definition LOCAL_ABS_MANIFEST_FILE. The existing
LOCAL_MANIFEST_FILE variable will also be supported.

(Necessary if manifests are being programmatically generated in the
intermediates directory)

Change-Id: I77a8eb1b8040b966b944464281d00c161ff34d3c
lear_vars.mk
ackage.mk
dc8f8e4a75031f2b9649363f2b5238bf03e8c51e 12-Apr-2012 Colin Cross <ccross@android.com> Merge event-log-tags from platform.zip with local *.logtags

PDK fusion builds will include system/etc/event-log-tags from a full
build from platform.zip, which needs to be merged into the event-log-tags
built locally based on *.logtags from projects that have source.

Bug: 6297675
Change-Id: I91409f37c6dc88d6942eade2946155c2a6640b6f
akefile
162a817521820dcac32ec17d43bfc3d5c6d783e9 12-Apr-2012 Stephen Hines <srhines@google.com> Merge "More Clang tweaks to the build system."
19b2be5f8d895c23ae27834e6f20e3e7470a9da8 10-Apr-2012 Andreas Huber <andih@google.com> Merge "Revert "ARM: compile everything with relro / bind_now.""
b3789be76609f78a991fc89c287379155818391b 10-Apr-2012 Nick Kralevich <nnk@google.com> Revert "ARM: compile everything with relro / bind_now."

This reverts commit 020e4919e89a824783dbe8716bc56785267323f7.
rmelf.x
rmelf.xsc
rmelflib.x
ombo/TARGET_linux-arm.mk
b3700ab773f4ba396a92cde194bbd7a7a13ac7aa 02-Mar-2012 Raphael Moll <raphael@google.com> Merge "SDK: Also read sdk/build/tools.OS.atree"

This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.

(cherry picked from commit 3ab307a68cbc30ab37d15f62e88dd19b51ac9632)

Change-Id: I05140bb02ecd41152e47ecdf404b1b8fb34fdf24
akefile
4534d8135a7596b74c9f47b040088f15a0b57553 10-Apr-2012 Ying Wang <wangying@google.com> Merge the NOTICE files when doing pdk fusion build.

Bug: 6297249
Change-Id: I693ab15e5a2eacda3c8b9d2ce36469ea177ae178
akefile
64cd96ce7f1922b20b622dc0ac7971344f9a0751 10-Apr-2012 Jean-Baptiste Queru <jbq@google.com> Bump DX Java heap to 2GB.

Change-Id: I240a24f9bb8511fea8f420f76b4541018ae79a0c
efinitions.mk
f50f4c529919ac4acefd2fb05fb5d47743f6e2c3 05-Apr-2012 Evgeniy Stepanov <eugenis@google.com> More Clang tweaks to the build system.

Adds arm_neon.h to the include path when building with Clang.
Filters out 3 additional compiler flags when building with Clang.
Filters out unsupported flags from TARGET_(arm|thumb)_CFLAGS, as well.

Change-Id: I5e23a95356e0b10c31c9aa3cb4905f6a674709e4
inary.mk
lvm_config.mk
883a122808e3f3f67d0023df44295ca9dedb9fd2 10-Apr-2012 Kenny Root <kroot@google.com> Merge "resolved conflicts for merge of a86fcc29 to master"
f32dc71e49656e16fc8e178f7436706a47e8af52 08-Apr-2012 Kenny Root <kroot@google.com> resolved conflicts for merge of a86fcc29 to master

Change-Id: I3868c19bfd309b5b43b5642152a120931fe37315
4394aaef7eb02116bca4ef8781201d4559ee99db 09-Apr-2012 Ying Wang <wangying@google.com> Merge "Build system support to export include paths"
1747c60790b3e40b0322a80cbd7de30bb9e28ecd 09-Apr-2012 Nick Kralevich <nnk@google.com> Merge "ARM: compile everything with relro / bind_now."
c4625abc5da15cf44306b0a2f6cb13e5fb4eae66 09-Apr-2012 Ying Wang <wangying@google.com> Fix deps for notice generation.

With "foo bar : req", the build command will be run separately for foo
and bar.
Instead with "foo : bar" and "bar : req", the build command will be run
only once to produce both targets.
Also running the same build command concurrently may lead to build race
condition.

Change-Id: I8af2817546a7e2697a553c9320bd10f6bd4f20a2
akefile
020e4919e89a824783dbe8716bc56785267323f7 20-Mar-2012 Nick Kralevich <nnk@google.com> ARM: compile everything with relro / bind_now.

Enable relro / bind_now when compiling Android applications.
This marks certain regions of memory as read-only after linking,
making memory corruption security vulnerabilities are harder
to exploit.

See:
* http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
* http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html

Stop using the custom linker script, which inhibits
relro / bind_now support.

Change-Id: Iaebfbbb492299004f9da92b649985b6cd67d8c97
rmelf.x
rmelf.xsc
rmelflib.x
ombo/TARGET_linux-arm.mk
135c3af45af3d18ebda5aa9f66562191f3da55a1 06-Apr-2012 Nick Sanders <nsanders@google.com> am df49771a: Allow factory specific kernel commandline

* commit 'df49771a4a82a147e287190f872ab9d0e237a69f':
Allow factory specific kernel commandline
56882bf9b41dc7f8b98f1dea82633144546450b2 09-Feb-2012 Stephen Smalley <sds@tycho.nsa.gov> Support the setting of file security contexts in OTA and update packages.

Pass the file_contexts configuration to the releasetools scripts
so that the security contexts of files can be properly set for OTA
and update packages.

Requires Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24

Change-Id: I5a63fd61a7e74d386d0803946d06bcf2fa8a857e
akefile
5042392262e891221164ce4afbb1127f26b7d629 13-Jan-2012 Stephen Smalley <sds@tycho.nsa.gov> Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.

This configuration is used to determine the file security contexts
to set on the files in the yaffs2 or ext4 image that is generated.
This is similar to the android_filesystem_config.h tables for determining
the UID/GID/mode, but as a configuration rather than code.

Change-Id: I7c6f59fe7cb8bc4c86c8790f991b12dd93a61f68
akefile
df49771a4a82a147e287190f872ab9d0e237a69f 06-Apr-2012 Nick Sanders <nsanders@google.com> Allow factory specific kernel commandline

* BOARD_KERNEL_CMDLINE_FACTORY_BOOT can be set to
add kernel commandline items to the factory ramdisk,
such as fiq_debugger.console_enable=Y

Change-Id: Iee4060b96eaeecc517975c56342fd5445b1feabf
Signed-off-by: Nick Sanders <nsanders@google.com>
asks/factory_ramdisk.mk
11d3c4421ff71a4262e2b2d871606b805bfbed1f 06-Apr-2012 Eino-Ville Talvala <etalvala@google.com> Add new camera system include path to pathmap.

Change-Id: Ia4200dbffa90397a8a48d00139647c45646af734
athmap.mk
eebcef64ec7b42b47f99c974545e53c6b1d662a9 04-Apr-2012 Stephen Hines <srhines@google.com> Merge "Add support for building with AddressSanitizer."
7b29683411f122cc9208f078947e66ced2bae1cf 04-Apr-2012 Stephen Hines <srhines@google.com> Merge "Include Clang headers from ".../include" directory."
5957e3383561338833980bb5b3140e72b5419631 03-Apr-2012 Tor Norbye <tnorbye@google.com> Merge "Revert "Update versions of the Eclipse prebuilt libraries""
8245810475876ac957cac35e1d6931e3a15c6659 03-Apr-2012 Tor Norbye <tnorbye@google.com> Revert "Update versions of the Eclipse prebuilt libraries"

This reverts commit 94c85043c18a62dd3fc53a4f15faa9b08aeccc52.
ser_tags.mk
8c8a60e98a93966f4f63570f823aa0a008b4bf9d 03-Apr-2012 Ying Wang <wangying@google.com> Merge "Support to run DroidDoc in unbundled builds."
bcfa78b60afe180545f4041815b05b7c784cc34d 03-Apr-2012 Tor Norbye <tnorbye@google.com> Merge "Update versions of the Eclipse prebuilt libraries"
6cc9c06854f0e847bdf93d65947c306a83900851 29-Mar-2012 Evgeniy Stepanov <eugenis@google.com> Add support for building with AddressSanitizer.

Change-Id: I559d21bbeb9f869f51e48ce18247ceaf766768b4
inary.mk
lear_vars.mk
lvm_config.mk
a7095e919224888172ba59dd4663d4d47d68c4bb 29-Mar-2012 Evgeniy Stepanov <eugenis@google.com> Include Clang headers from ".../include" directory.

Do it with -isystem instead of -I.

Change-Id: I70fd55772e59a35f0b5a56816d61120f4921f4a4
inary.mk
lvm_config.mk
3f45b3c35c41d71288dc4939cb48456dda26f8c0 03-Apr-2012 Ying Wang <wangying@google.com> Support to run DroidDoc in unbundled builds.

Change-Id: Ia5ace10ed75c451e346e289f0c534ad619abdb65
akefile
roiddoc.mk
ava.mk
2109487a2905971adb06ea725090eab993c81b95 02-Apr-2012 Narayan Kamath <narayan@google.com> Changes to C++ protocol buffer compilation.

Generate C++ code for all .proto files before attempting
to compile them. This takes care of the case where generated
.pb.cc files include other header / c++ files due to proto
imports in the original .proto files.

Change-Id: I26513842618fd31f0b33a3f10df2a5e556094515
inary.mk
406f69c8d62934fb763e691f8baae777f13cb030 02-Apr-2012 Ying Wang <wangying@google.com> Merge "Support to build pdk and pdk fusion."
d222192fb0ee238cc7ff779ae6b607ea46a81755 02-Apr-2012 Ying Wang <wangying@google.com> Merge "Generate platfrom.zip for build goal "platform"."
0cae3313e2f358f022bb051e6eb32fd0fc5530be 02-Apr-2012 Colin Cross <ccross@android.com> Merge "Remove base_intermediates from LOCAL_C_INCLUDES"
9ad36ef9297a13097e62e3285bdc168060dae442 31-Mar-2012 Colin Cross <ccross@android.com> Remove base_intermediates from LOCAL_C_INCLUDES

base_intermediates is not used anywhere in the main build system,
and should not be part of LOCAL_C_INCLUDES. It is used by
external/webkit/Android.mk as a local variable, which causes
the libwebcore_intermediates directory to be added to the include
path for every module.

Change-Id: Iddeee880add4b6f694a15d1900c588e1c547b9df
inary.mk
82b836fda6894ebfccccfbddc2ce3ee2718d862e 31-Mar-2012 Ying Wang <wangying@google.com> Support to build pdk and pdk fusion.

Bug: 6241618
Change-Id: I08f74019631e9e132c15cdb2916bbafb052f9aa6
akefile
ain.mk
dk_config.mk
ee406f1cbe1c0588f573b99320bac5290a8ebc23 31-Mar-2012 Daniel Berlin <dannyb@google.com> Merge "Moving notice file generation to a python script (it was getting fairly complicated in bash), update HTML output to have a table of contents, and fix typos/bugs in notice file CSS"
4c289e5041270f4d697fa5f5b4c027ad07cfba0e 30-Mar-2012 Ying Wang <wangying@google.com> Generate platfrom.zip for build goal "platform".

Bug: 6241618
If platform appears on the build command line, build platform.zip,
which essentially is the zip package of the system directory.
Put the platform.zip to the dist dir if "dist" is specified too,
so the platform.zip can be downloaded from the build page.

Change-Id: I988dd5c753a4ee744b4e3dccf261d8df904d9847
akefile
f5a97d7fbbda5ec8ad4ea73a8035d7fa88bbe1da 29-Mar-2012 Daniel Berlin <dannyb@google.com> Moving notice file generation to a python script
(it was getting fairly complicated in bash),
update HTML output to have a table of contents,
and fix typos/bugs in notice file CSS

Change-Id: I51131f594e3bbe63f03165fa42f5ceeaec518543
akefile
06e758a9664deed8cc865a58441a9a6279cc66de 30-Mar-2012 Dima Zavin <dima@android.com> config: add documentation for managing kernel-headers

Change-Id: I6dc6ede4703cbe88c356656a1a6b86a4ffaafa3b
Signed-off-by: Dima Zavin <dima@android.com>
onfig.mk
8e4042cc79584eee1f6b32b8935e16871330e3d3 30-Mar-2012 Dima Zavin <dima@android.com> Revert "core: the device/board/product kernel headers will be auto-generated"

This reverts commit 992a52990cf545c926541815d03ad98b3458b23d.

Change-Id: I9919f13705509a793f856da8ef7207b3feb47092
Signed-off-by: Dima Zavin <dima@android.com>
onfig.mk
nvsetup.mk
f5172c7564e0d84bf02b9add47809ce10a9cff4f 30-Mar-2012 Jing Yu <jingyu@google.com> Switch default gcc toolchain from 4.4.3 to 4.6.

Switch both arm-linux-androideabi toolchainand arm-eabi toolchain.

Change-Id: I7b2771fe684853ab37e3b5b7cfe4146f9f901e02
ombo/TARGET_linux-arm.mk
umpvar.mk
971c246cb543b0021f78d52333bcbbe00ca106d8 29-Mar-2012 Colin Cross <ccross@android.com> Remove some dist targets from PDK builds

Remove apps.zip and package_stats.txt from the PDK build, they
fail because no apps or jar files are built.

Remove emulator.zip, the emulator is not built.

Also, put recovery.img back into the PDK build, it is needed by
the img.zip target, and will be necessary for fusion builds.

Change-Id: Ie314e0432881d3ee4f1ef3eec5a98be6b8581572
ain.mk
ed6d9db2cdfab660f698ecd366b438298198962d 29-Mar-2012 Alex Sakhartchouk <alexst@google.com> Merge "Moving libRS"
0b7d3d69bc2bd7afe7cff7b770a6da53da40e34d 28-Mar-2012 Alex Sakhartchouk <alexst@google.com> Moving libRS

Change-Id: I45058b3e1cc213db6e322090f86dd19a6747fc4c
ava.mk
bbd499821623c412c5ccb26da3df441b46082823 28-Mar-2012 Colin Cross <ccross@android.com> Add samsung_arm as an owner

Add samsung_arm as an owner to be used on files that depend
on licenses from both Samsung and ARM.

Change-Id: I03a5ba739b940915519f75477adea7c2a9b0a563
asks/vendor_module_check.mk
b683895db83a16e29e073fa609aa9f5ddc176191 28-Mar-2012 Colin Cross <ccross@google.com> Merge "telephony: remove default apns_conf.xml"
89912bec232e5121b56231dc6a5ed173f54ed902 28-Mar-2012 Kenny Root <kroot@google.com> Merge "Move keystore from user_tags to core req"
b6addfb250606175ca679c8fb6e549cd98eee5b0 28-Mar-2012 Raphael Moll <ralf@android.com> am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"

* commit 'a8dd58a8a604ed90c5fd5fb632eb2bb8b1ff8fa0':
Allow make 3.82 to be used under Cygwin 1.7
2696eb6d11759e8a0cd839e9f10c90e38efea21a 28-Mar-2012 Raphael Moll <ralf@android.com> am 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."

* commit '3b1ebe7dc291175886f21ffbbccdb98b560efabf':
SDK atree: support HOST_OUT location.
8f4c3116b2480b89c37e7a0ca6d87681a09fd340 27-Mar-2012 Dima Zavin <dima@android.com> telephony: remove default apns_conf.xml

Remove the hack from main.mk to filter through installed files
to look for an apns file.

Change-Id: I31ba69bfc8323fea0a38154922df6b57a0f227c8
Signed-off-by: Dima Zavin <dima@android.com>
ain.mk
e455a972be5e50c585e9065e1cd246864fcde1aa 28-Mar-2012 Marius Renn <renn@google.com> Merge "Multi-Project Commit: Move of filterfw out of system/media (3 of 7)"
4c456990150dca67ce39b398445d7cfec1f10f3d 27-Mar-2012 Raphael Moll <ralf@android.com> Allow make 3.82 to be used under Cygwin 1.7

(Manual merge of 76bf62d75e7d4680dac1522534c56f4b511e5cd1)

Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
ain.mk
3b1ebe7dc291175886f21ffbbccdb98b560efabf 27-Mar-2012 Raphael Moll <ralf@android.com> Merge "SDK atree: support HOST_OUT location."
fe97fe9e9f57224ea29e67ad9e367241ac8f10b8 27-Mar-2012 Marius Renn <renn@google.com> Multi-Project Commit: Move of filterfw out of system/media (3 of 7)

This is part of the multi-project commit to move the filter-framework
from system/media/mca to frameworks/base/media/mca.

Note that the filter-framework will soon be replaced with a refactored
version currently under API review (also to go under frameworks/base).
This move is done now to unblock the PDK efforts.

Change-Id: I3d12882239e0bb66e11d3fb5ec952cc474be4f0a
ex_preopt.mk
ava.mk
athmap.mk
d17c89776e71f61852ac6ec3a75859a832cf1ba6 27-Mar-2012 Jean-Baptiste Queru <jbq@google.com> am 0b6a436f: Merge "Fix build"

* commit '0b6a436f09f10e358c64ee977c8322b3a76fd977':
Fix build
f396f56817474c682a6b01c0078332ab1d5ac027 27-Mar-2012 Glenn Kasten <gkasten@android.com> Fix build

Change-Id: I740b211588122b1198d7925c78e9a4a7aaf08784
athmap.mk
bf6b3be4ea632f3e326eff98b81d97303b648ca6 27-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "mv wilhelm"
d905491b094aaa538ffe7adee39b75b3b830404e 27-Mar-2012 Glenn Kasten <gkasten@google.com> mv wilhelm

Change-Id: I3c1573a3dcb0567cf330fe06b3ae70b3b8f66978
athmap.mk
55daae9688de0a064c9b37723ce7451c2dc0d6cb 26-Mar-2012 Evgeniy Stepanov <eugenis@google.com> Skip host system directories in Clang include path.

This change removes /usr/include and /usr/local/include from Clang header
search path.

Change-Id: I84450f4f4aef829c5aef9221bf300e69819bac48
lvm_config.mk
98f7c376015aaad46db051ca388812154f985487 26-Mar-2012 James Dong <jdong@google.com> Merge "Added /frameworks/av/include to the default include search path"
c49ee7139f4aa4f183ba8534cafbf8a64ce99de2 24-Mar-2012 James Dong <jdong@google.com> Added /frameworks/av/include to the default include search path

o related-to-bug: 6214141

Change-Id: I90de0563298fd9146ac823926426d1cffd815c2d
onfig.mk
ee7cd7ea25ea56b505ffb05482027379654bd1a4 24-Mar-2012 Brian Swetland <swetland@google.com> Merge "Introduce TARGET_BUILD_PDK for selecting build tweaks for the PDK"
7a5960555b229cca5a7d074ea9e139ebd5a6600f 24-Mar-2012 Brian Swetland <swetland@google.com> Introduce TARGET_BUILD_PDK for selecting build tweaks for the PDK

BUILD_PDK and some of the other infrastructure will go away once
we're done with the new new PDK work, but for now don't disturb
that stuff.

Change-Id: Ia39bf759ec03f203858ddcc4880af72bd132cb5a
akefile
ain.mk
asks/apicheck.mk
ee6bddc3088c7305fb2ef0e2f29414b66bd48b6f 23-Mar-2012 Mathias Agopian <mathias@google.com> move ndk headers to frameworks/native

Change-Id: Ie92ca68bb9f99b2d5a1dbdfc9e57f3f986265386
onfig.mk
8f8f0d494e6cd856c6c858d289e4ea2052271e65 31-Jan-2012 Nick Sanders <nsanders@google.com> Add build.prop to factory ramdisk

We'll need a special case to set device properties on the factory ramdisk

Change-Id: I146d5c503e8c97005caa1ab1dbaca7ee9ab30faf
Signed-off-by: Nick Sanders <nsanders@google.com>
asks/factory_ramdisk.mk
62304f1ec3557be82f3ec1be51e2a870d59022dc 23-Mar-2012 Stephen Hines <srhines@google.com> Make sure compiler flags also pick up correct toolchain.

Change-Id: Id6ff8c3ee7cfa5dee46ef000cbceb7666b934240
lvm_config.mk
dfbe79b803dbbf0fd4c863200e10bedd69510aa3 22-Mar-2012 Ying Wang <wangying@google.com> Don't expose the compiler dependency.

Change-Id: Ia472eaab3e8e883a32e8b441a2480562db278e45
inary.mk
lear_vars.mk
5d9aedef3067d458e356a6c13a26ad71041ff04b 22-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> am 2245d17d: Point to new linux prebuilt toolchain for SDK build

* commit '2245d17dc847ecb5371807466788552ca0198152':
Point to new linux prebuilt toolchain for SDK build
2245d17dc847ecb5371807466788552ca0198152 13-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> Point to new linux prebuilt toolchain for SDK build

Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
ombo/HOST_linux-x86.mk
b71e2df30a2a24d5566734b3c41716bee9351fd1 20-Mar-2012 Evgeniy Stepanov <eugenis@google.com> Add LOCAL_CLANG variable to switch C/C++ build environment to Clang.

Change-Id: I8ca1c24f51aa5546ac9618d31566a52e4fdb1436

Conflicts:

core/clear_vars.mk
inary.mk
lear_vars.mk
lvm_config.mk
0e4c317c926a6540d53356dc75e51ca5dd004f0d 22-Mar-2012 Stephen Hines <srhines@google.com> Merge "Define a basic llvm-link + clang environment"
74160ed4c4a2de9702738dbc5aaa17be91151ee1 22-Mar-2012 Raphael Moll <ralf@android.com> SDK atree: support HOST_OUT location.

Change-Id: Ib369280971b37a3eb35ac94991cdbc49dead903e
akefile
1c06bc778c69ecefac24188b49580c66a488dbb8 22-Mar-2012 Mike Lockwood <lockwood@google.com> Merge commit '7d2ba7c'
e8eb8df9896e7d3a78047f0922a90b0cd3c2aedc 22-Mar-2012 Mike Lockwood <lockwood@google.com> Merge commit 'c6e952f'

Don't build userdata.img for tests build.

Change-Id: I492cca5e5989cabdeb6f75c3b8a8c9ac3b9ca8c8
34268ebd6977a9936221e8cd6d0fbb36a3e14c3c 21-Mar-2012 Steve Block <steveblock@google.com> Merge "Add a comment about publishing licenses for third-party code"
d14d3b4e64e627172670631f637d70cf0e9a297d 01-Mar-2012 Steve Block <steveblock@google.com> Add a comment about publishing licenses for third-party code

Change-Id: I21bee0bb78ab42b4f7b6a938f94653c7e21e8503
akefile
inary.mk
2c4dc957674e56f2973049ebe61a3c1a4a2613dc 21-Mar-2012 Doug Zongker <dougz@android.com> Merge "optional cross-check between OTA radio images and board-info.txt"
9296f092771a0261404f51bcbc1b62ba20654947 21-Mar-2012 Doug Zongker <dougz@android.com> optional cross-check between OTA radio images and board-info.txt

Adds a python script which checks the version of each radio image
added with the new add-radio-file-checked macro against a file
containing sha-1 -> version string mappings and the contents of
board-info.txt, so that the build can fail if board-info.txt and the
OTA images are out of sync.

Change-Id: Icb61dc2adefc240ced9059941582c23b629089c0
efinitions.mk
d4a41953febfd9ffc29749eb2a7ba59416fa4a99 21-Mar-2012 Ying Wang <wangying@android.com> am 0187511e: am 4243532d: am 301843ae: am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"

* commit '0187511e70960618ac5c84f1446ec955ba6c8955':
Fix for "dexopt: No such file or directory" error
301843ae3e5a5d121ecc01b58ea3f15ae07c860f 20-Mar-2012 Ying Wang <wangying@android.com> am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"

* commit '29e44b7a8300644516b021e9e324ffe426098b3f':
Fix for "dexopt: No such file or directory" error
94c85043c18a62dd3fc53a4f15faa9b08aeccc52 20-Mar-2012 Tor Norbye <tnorbye@google.com> Update versions of the Eclipse prebuilt libraries

Change-Id: I0bfaf13147e135f29f8a1b7862429320d0e6a2c7
ser_tags.mk
29e44b7a8300644516b021e9e324ffe426098b3f 20-Mar-2012 Ying Wang <wangying@android.com> Merge "Fix for "dexopt: No such file or directory" error"
1319005a2a47c671d3fa940eb61d2ad34301026f 12-Jan-2012 yroussel <yroussel@google.com> Define a basic llvm-link + clang environment

Move it from dalvik/vm/translator/runtime/ to build/
Add handling of -march=armv5te and -march=armv5e
onfig.mk
lvm_config.mk
992a52990cf545c926541815d03ad98b3458b23d 17-Mar-2012 Dima Zavin <dima@android.com> core: the device/board/product kernel headers will be auto-generated

So, just add the output include directory to the include path

Change-Id: Ia370454237913a748288124f65a6b731b17d6e1a
Signed-off-by: Dima Zavin <dima@android.com>
onfig.mk
nvsetup.mk
f926990ba3f04c03037b838cd5fe8f33c21e8013 16-Mar-2012 Dima Zavin <dima@android.com> core: allow product to provide kernel headers as well

This is useful when a device inherits from an architecture
product, such as omap4.mk. The architecture specific product
can provide kernel headers to all the devices that use
that architecture.

Change-Id: I0c9d3120a6089fb535a3fa8eccf10775a271cd21
Signed-off-by: Dima Zavin <dima@android.com>
onfig.mk
roduct.mk
roduct_config.mk
59c2136e1be13d73746da906cbb7f8f1c046e879 16-Mar-2012 Keun young Park <keunyoung@google.com> Merge "rename pdk builds: pdk1 to pdk_eng, pdk2 to pdk_rel"
4e16f96dbd80d299bac5c34161f8c83206aa4b57 15-Mar-2012 Dima Zavin <dima@android.com> core: allow devices to provide their own device specific kernel headers

Currently, we need to pollute the common bionic/libc/kernel/...
directory with device specific kernel headers. This has created a giant
dumping ground of headers from all the projects we have ever done.

Allow each device to provide their own headers and thus eventually allow
bionic/libc/kernel to become *just* the common linux kernel headers.

This change will automatically add device/oem/name/kernel-headers to
the include list and also allow the BoardConfig.mk to specify
additional directories with TARGET_BOARD_KERNEL_HEADERS variable.
The requirement is that the final dir name must be kernel-headers to
mark explicitly where kernel headers are kept.

Change-Id: I7d32a979eef1f464db06c1bc448a04ddc3575efd
Signed-off-by: Dima Zavin <dima@android.com>
onfig.mk
9ec15ec89c725d51ee1fb08d4aa7e358617c8e44 15-Mar-2012 Keun young Park <keunyoung@google.com> rename pdk builds: pdk1 to pdk_eng, pdk2 to pdk_rel

Change-Id: Iadf0493b1f6700638010ceb50ced2fe7bc8bb603
ain.mk
9ea6952e8af7099477ed1feaedd41c04f4998748 08-Mar-2012 Kenny Root <kroot@google.com> Move keystore from user_tags to core req

Move the keystore from the grandfathered list to the new core required
packages.

Change-Id: I61343129c3111cab2d6a1d536775ed9764085281
ser_tags.mk
a00ba58646271248f074567349f834f0466cd0ed 15-Mar-2012 Glenn Kasten <gkasten@google.com> Merge "Use pathmap.mk for system/media includes"
fefc17ff59a27a2957d2e8eec987656523907dbb 13-Mar-2012 Glenn Kasten <gkasten@google.com> Use pathmap.mk for system/media includes

Currently these point to the old location.
Another CL will move them to the new location.

Change-Id: I61dd732981a9a7a3f4a2c1cc01dc072f4fb6a2b8
onfig.mk
athmap.mk
bf69aa32c9bbbd36ab6b5d8f7d407d324db9d309 14-Mar-2012 Ying Wang <wangying@google.com> Fix tests build.

Use the conditional only after the tests build variant is phased out.

Change-Id: Ide691700dda4bbf56c6f81f923d1b8c5eb196b85
akefile
30e8093f5fcf57bf807e7ec1007a164cf48987a6 14-Mar-2012 Ying Wang <wangying@google.com> Merge "Add build goal "tests"."
160b670f4acfbcf85eb6baf1df156ada835a6a3e 14-Mar-2012 Ying Wang <wangying@google.com> Add build goal "tests".

Bug: 5368571
The phony build goal "tests" will eventually replace the build variant
tests.

Change-Id: Ia656f2cf2260feeaa8fa32e9221b7f9ce0990262
akefile
ain.mk
cd1b924e37162274d2b8998fadfbf39b900e7115 13-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> Merge "Point to new linux prebuilt toolchain for SDK build"
bdbbd2062c4651541b2bd4f496480f3ac3be3b74 13-Mar-2012 Ying Wang <wangying@google.com> Merge "Remove system partition files from the test zip file."
c5f049799c8f41136fcbed723482fb3bdc8579e5 13-Mar-2012 Ying Wang <wangying@google.com> Remove system partition files from the test zip file.

Bug: 6157562
Change-Id: I581c6db7d47b42617f8ef6097ccd0aae52c7e1b4
akefile
0e63fd37ddc539912a1b89875a925c75e4a281b2 13-Mar-2012 Andrew Hsieh <andrewhsieh@google.com> Point to new linux prebuilt toolchain for SDK build

Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
ombo/HOST_linux-x86.mk
49932f1edb5570e47d35716fc8e3440b72d9aaa9 13-Mar-2012 Svetoslav Ganov <svetoslavganov@google.com> Adding clean variables for some variables used in CTS.

1. A CTS package can specify the test runner used to launch
its tests from the device. This is useful for preparing
and cleaning the device through some shell commands if
necessary.

bug:5946699

Change-Id: Ib1d6454c4274b1c37323235c9b3a195f3b9d8131
lear_vars.mk
519316e5685e4ef9360f15045cb7243939fecc27 12-Mar-2012 Keun young Park <keunyoung@google.com> Fix build caused by 168380

Change-Id: Iebda5669f48fe505146b8f2f8b35d06621d4b0e6
ain.mk
7fc7aad152ae595de371a5b969744ff3b971d81c 28-Feb-2012 Keun young Park <keunyoung@google.com> changes to add pdk1 / pdk2 build for PDK build
- additional files will be added to pdk/build
Bug: 6079146

Change-Id: Ieb5fcab8002193250d770b923f60ec7333ce84e5
akefile
ain.mk
asks/apicheck.mk
a1af38d9b3db1537883b04764d51b36eacf4720f 08-Mar-2012 Mathias Agopian <mathias@google.com> Merge "update include paths to new location"
a7c674b1419f1f8478105cfd5127b4f30a853c17 08-Mar-2012 Mathias Agopian <mathias@google.com> Merge "add frameworks/native include paths"
11a7e126e5308fd9a5a48341ee4d0f8bfe8ab790 08-Mar-2012 Ying Wang <wangying@google.com> Merge "Update llvm-rs-cc build to use unified headers in all cases."
5a4eb5f0f8b63c3a0b92d451494497de708c4f45 07-Mar-2012 Stephen Hines <srhines@google.com> Update llvm-rs-cc build to use unified headers in all cases.

Change-Id: I66a2cc5f762b7d170f4bfc6c88f8c7df11be4f4b
ava.mk
fb956ef9cc0dab798d837c9b6c71b39e8fd489a9 06-Mar-2012 Mathias Agopian <mathias@google.com> update include paths to new location

Change-Id: I13dfa74f35ee778615cdb9459fc2e18bc37d62a1
athmap.mk
6d40595e538e0092c1a1ae4e0e7b0aab2eef9c5b 06-Mar-2012 Mathias Agopian <mathias@google.com> Merge "add a name for opengl tests include paths"
bd118e684de7048c5bb3d77b4239e489dbdce782 06-Mar-2012 Mathias Agopian <mathias@google.com> add frameworks/native include paths

Change-Id: I1ede8075dc77f77f5a9bc4a53663d4a74842ab36
onfig.mk
athmap.mk
cdcea7a83d9cffb7a46d73db3f1f9e1cecf0a21b 06-Mar-2012 Mathias Agopian <mathias@google.com> add a name for opengl tests include paths

Change-Id: I4fd30376bcc9549da9391cde99b884eab305d5dd
athmap.mk
23bb6968707c1fa2177c0c0d2c3ddbfdadd6e1b2 03-Mar-2012 Brian Muramatsu <btmura@google.com> Merge "Include CTS Build Rules"
7314933ac7388ef076d5b3d919b4936072ce3859 02-Mar-2012 Brian Muramatsu <btmura@google.com> Include CTS Build Rules

Change-Id: Ieacee8ff6215b22222ea9ea6a1e62fce62daad77
onfig.mk
3ab307a68cbc30ab37d15f62e88dd19b51ac9632 02-Mar-2012 Raphael Moll <raphael@google.com> SDK: Also read sdk/build/tools.OS.atree

This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.

Change-Id: I9a1256548345fb866b0750fce6810913413dd946
akefile
ed6b8155056c52ac6d6a38151a97fc948b4614c3 28-Feb-2012 Andrew Hsieh <andrewhsieh@google.com> BUILD_HOST_64bit=1 to build host tools in 64-bit

By default we build tool in 32-bit. This flag allow individual tool and its
dependencies to be built in 64-bit (eg. Emulator). Fixes to resolve 64-bit
porting issues (in other git) will be submitted seperately.

Change-Id: I486cf7ddac727d3c374ed890857d497c3a69e598
ombo/HOST_darwin-x86.mk
ombo/HOST_linux-x86.mk
ombo/HOST_windows-x86.mk
418027c87a291a7d564839f6e7ad863e241e67ed 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 41ab528f: am 99505268: am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."

* commit '41ab528fe3533847fecddb0c6ee7884b17f35279':
Issue warning when "make snod" with dexpreopt enabled.
9950526875f3b71c764a6d39623842e3c26416db 24-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."

* commit '20b970e25227c4144c61d0d6108905616dc4f08b':
Issue warning when "make snod" with dexpreopt enabled.
acf01ec8371dd1ef14d1f397aa13e86adaaa82cd 24-Feb-2012 Ying Wang <wangying@google.com> Issue warning when "make snod" with dexpreopt enabled.

Change-Id: I481f963634dd384ed6d3de73dfeeda92b37d227e
akefile
92ca609cd18d0e0466b6ee9080c628b38c84251a 24-Feb-2012 Ying Wang <wangying@google.com> Fix bug with the HOST_AR.

Change-Id: I28ab86d3b6e7cbd4391e2640cf8e2be269b03e76
ombo/HOST_darwin-x86.mk
e27e41b19dcfc6f45ce484fabda95783763f196a 21-Feb-2012 Kenny Root <kroot@google.com> Merge "Enable TLS register by default for ARMv7a arch"
87f4d5a926e3b3cacbd0b9136a18b9d16a112ceb 21-Feb-2012 Kenny Root <kroot@google.com> Enable TLS register by default for ARMv7a arch

Everything that is based on ARMv7a should have a cp15 TLS register.
Enable it by default so it's not accidentally missed in newer board
configurations. In fact, this could be enabled for ARMv6 as well, but we
currently don't distinguish between ARMv5 and ARMv6 in the build system.

This can still be disabled by setting it to "false" in the board
configuration, but this shouldn't ever be needed.

Change-Id: Ic2918f32899c8bcfa482f92c98f5a192fa318470
ombo/arch/arm/armv7-a-neon.mk
ombo/arch/arm/armv7-a.mk
026c62e028d23e573a7fbe83093c422e28e0ded2 17-Feb-2012 Scott Anderson <saa@android.com> Merge "Remove simg2img from user_tags.mk"
9869c5e4091fb0ae5a9d3fa5719b3d7c84c1fa77 16-Feb-2012 Svetoslav Ganov <svetoslavganov@google.com> Merge "Adding shell commands for manipulating content via content providers."
9986e1a22032f8502ccb9731405631917c34dd6c 16-Feb-2012 Scott Anderson <saa@android.com> Remove simg2img from user_tags.mk

Change-Id: Ibc0d6cacd25b343424cecce63fb1cd9c6d714f92
Signed-off-by: Scott Anderson <saa@android.com>
ser_tags.mk
605643224e096c43602c2e0e229410fa387e3331 15-Feb-2012 Jean-Baptiste Queru <jbq@google.com> Move AOSP to another fake version number

Change-Id: Ida0282d1eccaa2bdaf4ca54aaf82680efdbaa271
ersion_defaults.mk
c04b56c5b05ef7e2fdc6b24e9428bfb2a3c45a19 27-Jan-2012 Raphael Moll <raphael@google.com> Merge "Move Windows SDK whitelist out of main.mk"

This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.

Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git

(cherry-pick of 347f3051814d7d36a9a6af387e724bb327b53ecd)

Change-Id: I6d1f4c974a6425e50e3e287c66a4e8090cf814cb
ain.mk
aeaf48812d4e6f8b8c5d9377be20968de84d9806 14-Feb-2012 Elliott Hughes <enh@google.com> Merge "Linker script support for constructor priorities."
93a1a0ec6b9c82a124173a414c64ab9d86f04556 13-Feb-2012 Jean-Baptiste Queru <jbq@google.com> am e50d91f9: am d93d4601: am 45873583: Merge "Add extra environment info to build output"

* commit 'e50d91f9dac20546152b575cdab7781b646ee2ed':
Add extra environment info to build output
67772b810d5aef5bca8c0ccd4b3b6ef7e40a7749 09-Feb-2012 Evgeniy Stepanov <eugenis@google.com> Linker script support for constructor priorities.

Change-Id: Ib551019b291a152921431fa2b0b6031474ed6fed
rmelf.x
rmelflib.x
b9d5682c26e8c39b4e455be69823496ea170c138 07-Feb-2012 Svetoslav Ganov <svetoslavganov@google.com> Adding shell commands for manipulating content via content providers.

1. This change adds the shell command to the bin folder on the device.
This will enable using shell commands (assuming right permissions
are held) on a user build to manipulate state of content providers.
For example, this will be used for running CTS tests that rely on
secure settings without adding intermediary APKs and/or manual setup.

Main change:https://android-git.corp.google.com/g/162774

Change-Id: I562eb86a4bb971dbaa42848e95e7650bf2cbb0c9
egacy_prebuilts.mk
ser_tags.mk
5f1c9ba0b87c8b233b5e5d904aae2a4d079a310f 07-Feb-2012 Conley Owens <cco3@android.com> Add extra environment info to build output

This should help us support users with build issues.
Given that they inculde the dumpvars in their error report,
we will be able to avoid asking standard questions like
"what version of Ubuntu are you using?"

Change-Id: Ib7c452d805d5e64075a44dc40e41d4605cc1ef4a
umpvar.mk
b7fc1545f371a46aea6588280449e31c2348d809 07-Feb-2012 Colin Cross <ccross@android.com> Add gcc_demangle to BUILD_TINY_ANDROID projects

libgccdemangle.so is required to build libcorkscrew, which is in
system/core and built when BUILD_TINY_ANDROID is set.

Change-Id: Ide9af58cfc075e27a7368993b29be2c0e53275a8
ain.mk
5dea692715dfe992432037c6005f91875a725841 01-Feb-2012 Ying Wang <wangying@google.com> Use @rpath and @loader_path to avoid absolute path

With "-Wl,-rpath,@loader_path/../lib" the linker embeds
@loader_path/../lib as the target binary's rpath.
Here @loader_path means the path of the binary that initiates the
loading.
With "-install_name @rpath/libfoo.dylib " the linker runtime searches
libfoo.dylib in the binary's embeded rpath.

With this change you can call dlopen() without specifying the full path
of the shared library.

Change-Id: If9beb3f6f4642a377bff603bab5ba3fdb96211bf
ombo/HOST_darwin-x86.mk
80469e4d6c9d14a8e5942260f44e1dd83a51df74 01-Feb-2012 Ying Wang <wangying@google.com> Delete unused var.

Change-Id: Ib6c295287f064529a8b4d8ada15a9fbb73064f1e
ombo/HOST_darwin-x86.mk
b4c2a6404089805ca2bae0c82677115c240cbdd6 01-Feb-2012 Ying Wang <wangying@google.com> Set install name with absolute path for Mac host shared libraries.

Before this change, path of the install name is relative to the top dir.
That means you can execute dynamically-linked binaries only in the top dir.
With this change, you can execute dynamically-linked binaries anywhere.

Change-Id: I1c6441579ffb68505ea678296aceb2e66a6df1be
ombo/HOST_darwin-x86.mk
756eda8b6054e3297e6776223d40e69d048953b8 31-Jan-2012 Nick Sanders <nsanders@google.com> Add build.prop to factory ramdisk

We'll need a special case to set device properties on the factory ramdisk

Change-Id: I146d5c503e8c97005caa1ab1dbaca7ee9ab30faf
Signed-off-by: Nick Sanders <nsanders@google.com>
asks/factory_ramdisk.mk
5d84f1659fbd48253d25785814e5c457575ea2da 31-Jan-2012 Jim Huang <jserv@0xlab.org> TARGET_linux-arm.mk: use single slash version of -print-whatever

The double slash variants are not documented in GCC manual. Therefore,
it is better to use the single slash variants as usual.
ombo/TARGET_linux-arm.mk
8d5610cd1bea3f771245ad3fdb87096e7fffea73 31-Jan-2012 Wink Saville <wink@google.com> Merge "Increase java heap size."
29b3afaf79e89e5707c6a28e7ed55d3c04810352 31-Jan-2012 Wink Saville <wink@google.com> Increase java heap size.

I got an Out of memory while compiling, Andreas Huber suggested that
increasing the heap size, which worked.

Change-Id: Id8293ef100ef814b0fe13aa6e1b891a36a2ee853
efinitions.mk
707328a3efcf9362bfff87c75831436006140d17 30-Jan-2012 Ying Wang <wangying@google.com> Build should fail if any proto file fails compiling

When compile multipling proto files to Java in a for loop.

Change-Id: Ie6a9d3972401b0ad6406bf911db916fcbf88037b
efinitions.mk
5c97da76ad90492a500c63d1cebb8a369795a956 25-Jan-2012 Haruyasu Ishida <haruyasu.ishida@sonyericsson.com> Fix for "dexopt: No such file or directory" error

When common_javalib.jar is created, both LOCAL_BUILT_MODULE and
built_odex targets can be run.

If built_odex target runs before the directory is created by
LOCAL_BUILT_MODULE target, the error occurs.

Change-Id: I1ebcb27630f8373558da6acdfce95f5cdf714bbf
ava_library.mk
347f3051814d7d36a9a6af387e724bb327b53ecd 27-Jan-2012 Raphael Moll <raphael@google.com> Move Windows SDK whitelist out of main.mk

This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.

Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git

Change-Id: Id6178b000c464c989da2c7f22977986a60de1f44
ain.mk
512ce9cb42ac9c20692bdf16a51d921a6fe504be 25-Jan-2012 Dianne Hackborn <hackbod@google.com> You know back when I said this thing about Ice Cream Sandwich MR2?

What was I thinking?

That would be *ridiculous*.

What sane person would come up with a release like that?!?

I mean... four words! Six if you try to say it! Insane!!

Instead, we shall call you:

Jelly Bean.

Yum.

Change-Id: Ice28fc17b7eb77cf6b708958161339890234d1d8
ersion_defaults.mk
fcf246c989110d76a80fc66ac72f1fbba4289ff6 20-Jan-2012 Ying Wang <wangying@google.com> Workaround for lack of "-Wl,--whole-archive" in MacOS's linker.

Change-Id: I2b1de0a253d341bcb7ee05fdc96bdc0d0967985e
ombo/HOST_darwin-x86.mk
df2b4b3aabad4ab065578470b9bfe1fb9bed88b7 13-Jan-2012 Ying Wang <wangying@google.com> Compute TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX.

Sometimes TARGET_TOOLS_PREFIX is passed in as command line makefile
variable or environmental variable without TARGET_TOOLCHAIN_ROOT.
This change computes TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX in
that case.

Change-Id: I0a37dc1f4d1e3e1951faeffd5e9f926f0a6614dd
onfig.mk
4b5e4ba5fd2490c19c370b6e1fe7337c8e476b89 12-Jan-2012 Xavier Ducrohet <xav@android.com> Remove mention of layoutopt/uix as they are gone.
ain.mk
ser_tags.mk
777e86a025c9efa98b8c963a066999bc4b40d11b 11-Jan-2012 Brian Muramatsu <btmura@google.com> Merge "Avoid Rebuilding Core and VMTest Descriptions"
3b1dbe930220d893db1776b7514e71d13d981d35 11-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Revert "Reference new location of SDK toolchain""
d75dbec617307ecb7c728201a4da82f1177ff742 11-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Revert "Reference new location of SDK toolchain"

This reverts commit 1b834c6660c80d376151e977466e1622b67a2af0.
ombo/HOST_linux-x86.mk
b5370bc4cb40a6b20cc1b34c0b583ba78618741c 11-Jan-2012 Conley Owens <cco3@android.com> Merge "Add a module_path_check for vendor files"
b6737c1366aa0b5ca590a508dcab49e6e2b1e0fe 11-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Reference new location of SDK toolchain"
cb8f66305caf4f9252112608ad93e2ef58321244 11-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Revert "Point arm toolchain to the new gcc-4.6 one."

This reverts commit 1f87795eef3ab5f63675dc6e01f304d1a6e46d2a.
ombo/TARGET_linux-arm.mk
umpvar.mk
8e0f7129fa255d94e94042deda7f1113503a7a87 11-Jan-2012 Conley Owens <cco3@android.com> Add a module_path_check for vendor files

When this is enabled we ensure that files from the vendor directory
get installed to /system/vendor/* instead of elsewhere in /system/*.

This changes the PRODUCT_RESTRICT_VENDOR_FILES variable
to accept "owner", "path", "owner path", or "all".
"true" will still only enforce vendor file owner restrictions.

Change-Id: I4598130a590ad56976e011f4cb2a9f5f227d5732
asks/module_owner_check.mk
asks/vendor_module_check.mk
1b834c6660c80d376151e977466e1622b67a2af0 10-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Reference new location of SDK toolchain

Change-Id: If470d742a92061006d94b72f21df5c642348e179
ombo/HOST_linux-x86.mk
ea91f0a40ee114588204b9912345d3d8305ee190 09-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Reference x86 toolchain in its new location

Change-Id: I990b03107d1596a87a8d4cea6973735c60db4c64
ombo/TARGET_linux-x86.mk
umpvar.mk
71b5cc1b8e5b917be7281849c62551f776e87772 09-Jan-2012 Ying Wang <wangying@google.com> Reference the new prebuilt ccache location.

Change-Id: I4450a8254fe82ed3a670ce653f49381d9c075c8e
ombo/select.mk
0c13efb4182662db74dd2c4e63b64f2072711b91 07-Jan-2012 Jing Yu <jingyu@google.com> Merge "Point arm toolchain to the new gcc-4.6 one."
8f8624e61f6ee111b141e91c8364ee00fac79059 07-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 9caacbd7: am 5ea72eff: Use the new location of the emulator kernel

* commit '9caacbd74328624dfc753cecfc42cb29bf14bfad':
Use the new location of the emulator kernel
5ea72effbd944891708d2d6fb61055830e617701 07-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Use the new location of the emulator kernel
akefile
7353e43b850cd532c7d35969291757d5145eada2 07-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am da1c81ab: am a230c4d0: Reference kernel notice in the new location

* commit 'da1c81abe48c76f59953fd2e14a2ae2283d7bf92':
Reference kernel notice in the new location
a230c4d049258915f6614e7a3fadc2dcfec3e160 07-Jan-2012 Jean-Baptiste Queru <jbq@google.com> Reference kernel notice in the new location
akefile
1f87795eef3ab5f63675dc6e01f304d1a6e46d2a 06-Jan-2012 Jing Yu <jingyu@google.com> Point arm toolchain to the new gcc-4.6 one.

Tested build mysid-eng, sojus-eng, trygon-eng, yakju-eng.

Change-Id: I742cf9fcf2407b9098c99136d67161ecf062ac01

Conflicts:

core/combo/TARGET_linux-arm.mk
ombo/TARGET_linux-arm.mk
umpvar.mk
c7a10ddd3115a40de10b34d7dbfe92134ce7ae8f 06-Jan-2012 Ying Wang <wangying@google.com> Include toolchain makefile based on the current config.

So we can have the same set of module names in different host arch
/ toolchain version combinations.

Change-Id: Iec66584bf3de92aedd71a59f9dbe74b6ed025b2e
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
c0a69241010a14796ec8eb6af552b59aed1108ae 06-Jan-2012 Brian Muramatsu <btmura@google.com> Avoid Rebuilding Core and VMTest Descriptions

Only generate the core test and vmtest descriptions when something has
actually changed rather than everytime CTS is built. This should make
iterative test development in CTS more pleasant.

The rule targets are changed to be the paths of the test description
XML files in a separate directory outside of the CTS distribution.
The buildCts.py rule copies these XMLs when they change to the
final CTS distribution location and creates the final plan file.

The dependencies have also been changed to reply upon the full
package paths rather than their phony targets to avoid rebuilding
everything all the time.

Finally, the AppSecurity rule was removed, because I have taken
care of that in my prior change to the Makefiles in the CTS
project.

Change-Id: I88b92c7a4cb4c2c2e20f06641e7ba0604d37f805
asks/cts.mk
f79ce1589153cfd6cd00d129fa8168df304f304e 05-Jan-2012 Al Sutton <al@funkyandroid.com> am 1964c8ed: am d8765f0f: am 80cfc37d: Partial fix for emulator under Lion.

* commit '1964c8ed2d6b1981ee991b5ecd95ab711affdf62':
Partial fix for emulator under Lion.
2185e61343780ddd5f8b1a2b13fddc53b311bf52 05-Jan-2012 Ed Heyl <ed@google.com> am 9a46327e: increment version to 4.0.4

* commit '9a46327e123360490801d0dde95fc94e437e1e73':
increment version to 4.0.4
9a46327e123360490801d0dde95fc94e437e1e73 05-Jan-2012 Ed Heyl <ed@google.com> increment version to 4.0.4

Change-Id: I156516aedb714f589bd0ae2d39bc9e273b775276
ersion_defaults.mk
80cfc37d0f0ddbb7db09b7662b84e816ab409537 05-Jan-2012 Al Sutton <al@funkyandroid.com> Partial fix for emulator under Lion.

Don't use -Wl,-dynamic on Lion
ombo/HOST_darwin-x86.mk
7d2ba7cff79393fbb0e7df91c4d72d4d22789cf8 30-Dec-2011 Nick Sanders <nsanders@google.com> 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
asks/factory_ramdisk.mk
aaa8f06fe39052b903e6d8f4c2a7e0802788f5b6 03-Jan-2012 Ying Wang <wangying@google.com> Default LOCAL_SDK_RES_VERSION to LOCAL_SDK_VERSION

in static_java_library.mk.

Change-Id: I25ad47fea0fdb10c8aa0a0cb0d4c5ed117cd76ef
tatic_java_library.mk
89fbc541ad3fe7787cbe57ca607872c8d20b8f2a 29-Dec-2011 Jean-Baptiste Queru <jbq@google.com> Add CSR to the list of known vendors

Change-Id: I978569e1be4c9d1d52d2b7fb7de2da4d4f616f39
asks/module_owner_check.mk
29b6918fddf7eb4eef4a1defa322f294fbd8fc5c 23-Dec-2011 Ying Wang <wangying@google.com> Remove the restriction that PHONY_PACKAGE needs LOCAL_REQUIRED_MODULES

Change-Id: I33e776ea80368e0f0290169e680689a680186ed6
hony_package.mk
a66c5122082a8e22aa34a33c6e9e86c3d3dc8355 23-Dec-2011 Ying Wang <wangying@google.com> Remove the restriction that PHONY_PACKAGE needs LOCAL_REQUIRED_MODULES

Change-Id: I19a285234f1ddcac5e59312b9164026547652053
hony_package.mk
d38c870d2e168b051692b20ade0fc966c9e2daf7 22-Dec-2011 Conley Owens <cco3@android.com> Get build system to work with Make 3.82

Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
efinitions.mk
ain.mk
015c7885e05019b615b0533a599e3ff003c68623 23-Dec-2011 Conley Owens <cco3@android.com> Merge "Get build system to work with Make 3.82"
4630c321892c252ad25f6035cf93b90de22c4f84 22-Dec-2011 Tor Norbye <tnorbye@google.com> Merge "Make asm-3.1 an optional module, remove from grandfathered list"
d7a1a9b49b9d6e8331bcc5b2ece84903a94553de 22-Dec-2011 Conley Owens <cco3@android.com> Get build system to work with Make 3.82

Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
efinitions.mk
ain.mk
4c54b9fa2ae4597787187e2cb552a877e951eb3a 22-Dec-2011 Ying Wang <wangying@google.com> We should include factory ramdisk if one shot makefile is NOT defined.

Change-Id: I711dbfb0d98a5e8a4d784d3ee6f3f9cfdc926209
asks/factory_ramdisk.mk
14eeea6708c8edf0e9167f3fd7ace430598dde1f 22-Dec-2011 Ying Wang <wangying@google.com> We should include factory ramdisk if one shot makefile is NOT defined.

Change-Id: I92c7f26d13a05c4306c22b2e9e513cdd22e839ce
asks/factory_ramdisk.mk
a4f599148632515733293ffff6a9126683abcd35 22-Dec-2011 Al Sutton <al@funkyandroid.com> am 657aeac8: am 9ce06f11: Don\'t run ranlib on MacOS 10.7

* commit '657aeac8423d9e3cd31c0dffcecaad78a53d7604':
Don't run ranlib on MacOS 10.7
5846050fd4ee7d29917769f2e354c55d09d2087d 22-Dec-2011 Atte Peltomaki <apeltomaki@nvidia.com> am 05e98055: am 60fe963c: build: explicitly define dependency files

* commit '05e98055fdb1d48bac80790cb719838598b687e8':
build: explicitly define dependency files
c26f4d3904328148add1ffb6ccd08ed3fe357d71 22-Dec-2011 Ying Wang <wangying@google.com> Merge "Disable factory ramdisk if build with mm/mmm"
9f0e3c9658f124d96e7a9927e96eb0bbdaca7425 22-Dec-2011 Ying Wang <wangying@google.com> Disable factory ramdisk if build with mm/mmm

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

Change-Id: I5b35821cd287b70702191f3c30be6735d3339544
asks/factory_ramdisk.mk
9d5e83d331a3bb39da65e7e376ed779a0fc28d21 22-Dec-2011 Ying Wang <wangying@google.com> Disable factory ramdisk if build with mm/mmm

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

Change-Id: I51de434e7800ac6e55b0eeca9394361e5e14cd55
asks/factory_ramdisk.mk
fe927e18a698b62b48ce4f662a1170de5b1295ac 22-Dec-2011 Raphael <raphael@google.com> Merge "Allow make 3.82 to be used under Cygwin 1.7"
d44d54a0d947de3bda7132ed9216b9685ace92dd 22-Dec-2011 Raphael <raphael@google.com> Merge "Add 2 SDK directories that can build under Cygwin/Mingw"
931a099a4c56a1efadbc341ed6f8740c15f1aa75 21-Dec-2011 Ying Wang <wangying@google.com> 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
asks/factory_ramdisk.mk
9ce06f11d69f5154843c234fe0624f9e70d39359 21-Dec-2011 Al Sutton <al@funkyandroid.com> Don't run ranlib on MacOS 10.7

Change-Id: I74f4623e6044dd804669aaa70c6e410fa8988d75
ombo/HOST_darwin-x86.mk
c16dbcd8c8518fe19a87c5ec71866e0336a2cf5d 21-Dec-2011 Ying Wang <wangying@google.com> 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
asks/factory_ramdisk.mk
60fe963c63c1b98255ad1cf40573b81b5d90d9c3 21-Dec-2011 Atte Peltomaki <apeltomaki@nvidia.com> build: explicitly define dependency files

Groundwork for distcc support in Android build system,
see distcc FAQ for details on why -MF is needed:
http://distcc.googlecode.com/svn/trunk/doc/web/faq.html
efinitions.mk
0d75a0a54c5ecc0dd1580a7c3da0e0b0aa49bd25 21-Dec-2011 Ying Wang <wangying@google.com> Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES

If there is shared library with the same name.

Change-Id: Iaa43219cab7737c02a79d168f13ad4c473421f24
asks/factory_ramdisk.mk
fc444cf7dfa091bfa45f87ff99be337455700eee 21-Dec-2011 Ying Wang <wangying@google.com> Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES

If there is shared library with the same name.

Change-Id: I6c18ffc2a6c1f6d5b6468677cc420be817ea950d
asks/factory_ramdisk.mk
76bf62d75e7d4680dac1522534c56f4b511e5cd1 19-Dec-2011 Raphael <raphael@google.com> 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
ain.mk
0ae6d2956858ed3a9c0b65fecd70bc783976173c 19-Dec-2011 Raphael <raphael@google.com> Add 2 SDK directories that can build under Cygwin/Mingw

Change-Id: I020c2691d7d92a48bd406360e2752357ae79e3b0
ain.mk
cf0b20413e750c78060cb32ccc5fc1a970aa4085 19-Dec-2011 Bruce Beare <bruce.j.beare@intel.com> am b056d71f: If setupwizard is disabled, don\'t force it to optional

* commit 'b056d71f79b717fb36d375e48c19509900f977d3':
If setupwizard is disabled, don't force it to optional
b056d71f79b717fb36d375e48c19509900f977d3 01-Dec-2011 Bruce Beare <bruce.j.beare@intel.com> If setupwizard is disabled, don't force it to optional

Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ain.mk
4b9d4ea2e23fa1a97ae912b7d6d2729fe267c290 17-Dec-2011 Ying Wang <wangying@google.com> Merge "Collect the GPL source files."
89686538d77c47ed7816594c7597f5d1e456d656 16-Dec-2011 Ying Wang <wangying@google.com> 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
nvsetup.mk
ain.mk
roduct.mk
asks/factory_ramdisk.mk
1eed1cd4291e9bb2416df2b1e3e29a7493bcec0a 16-Dec-2011 Ying Wang <wangying@google.com> Merge "Print out ignored PRODUCT_COPY_FILES"
5fc0057b7d8d14c7bb44547cf35b50f6b897afca 16-Dec-2011 Brian Muramatsu <btmura@google.com> Stop Building CTS VM Tests

Bug 5728172

The VM tests were used with the old test runner.

Change-Id: I7ba819a394bb9643f937240ebd315d7d7820a8bf
asks/cts.mk
193010cc8f0453ce266bbb57c950fa74d78eded7 16-Dec-2011 Ying Wang <wangying@google.com> Print out ignored PRODUCT_COPY_FILES

So that people know their files are not really copied in accident.

Change-Id: I8fab920483230a9f349304dcbdb2fb9d60ee0215
akefile
0a099d904a5f82cba0ce86878d3d3e5e2dbf9e95 16-Dec-2011 Ying Wang <wangying@google.com> 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
nvsetup.mk
ain.mk
roduct.mk
asks/factory_ramdisk.mk
5758b8ed96783861c72b94a822c0ed581f414388 16-Dec-2011 Ying Wang <wangying@google.com> 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
efinitions.mk
ost_java_library.mk
ava.mk
tatic_java_library.mk
bf6c611cae9c8c3540bed07cd3864026a48ca229 16-Dec-2011 Ying Wang <wangying@google.com> 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
efinitions.mk
205a20a42c75de61e5da6807a156b6eca8aeda74 15-Dec-2011 Ying Wang <wangying@google.com> Merge "Support to build static Java library with Android resource"
d497a1db712b6e316955edab462c0177d59fb851 15-Dec-2011 Conley Owens <cco3@android.com> Add several module owners to the whitelist

Change-Id: I9a215b74167efc2a6b3070dc8b616a289669d10f
asks/module_owner_check.mk
20e2083ea0f8bae57ace17f098e7fe71a9625f84 14-Dec-2011 Ying Wang <wangying@google.com> 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
efinitions.mk
ava_library.mk
tatic_java_library.mk
393dde5525b71b425a686ad7304e481b2db3d5ae 15-Dec-2011 Brian Muramatsu <btmura@google.com> resolved conflicts for merge of 80fa947b to master

Change-Id: I0febb15b690932ad342da4b10eb9c0f13d1d1517
f098c807d0fd0c263a6d47e1bfe13b2cdcdefe98 15-Dec-2011 Brian Muramatsu <btmura@google.com> am fea66cee: Merge "Build Support for CTS Native Tests" into ics-mr1

* commit 'fea66cee1cd661b6bf8ead1988cf008fa61b01a7':
Build Support for CTS Native Tests
80fa947b03cb1b86e82823e1c279a072704718cf 15-Dec-2011 Brian Muramatsu <btmura@google.com> am fea66cee: Merge "Build Support for CTS Native Tests" into ics-mr1

* commit 'fea66cee1cd661b6bf8ead1988cf008fa61b01a7':
Build Support for CTS Native Tests
6371da10f85471d9530e53367027078d305fe832 13-Dec-2011 David 'Digit' Turner <digit@google.com> 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
ombo/TARGET_linux-x86.mk
ombo/arch/x86/x86-atom.mk
ombo/arch/x86/x86.mk
237fa073392127a7ba1cfff1b2010191a5343e1f 13-Dec-2011 Brian Muramatsu <btmura@google.com> 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
lear_vars.mk
asks/cts.mk
6a7c6064c245e00a74a3bec8254a0fc784d33a69 13-Dec-2011 Ying Wang <wangying@google.com> Merge "Allow to build Java module from mere static Java libraries."
e109a1d08d27ad18cc6ac70d9742de636ccae67e 13-Dec-2011 Ying Wang <wangying@google.com> Allow to build Java module from mere static Java libraries.

With this change, we can easily turn a static Java library to a shared
Java library.

Change-Id: I9915992cd19879846511d6272483d7a0a934e7eb
ase_rules.mk
efinitions.mk
ava.mk
b5a413e6ccba3c4d02081a15c5d15380bbfb0b0b 13-Dec-2011 Ying Wang <wangying@google.com> Merge "Restrict vendor modules to help AOSP product distribution."
a2c1261e719b4fbac9eee4e348b629360870468f 13-Dec-2011 Jean-Baptiste Queru <jbq@google.com> Set version numbers for AOSP - do not merge

Change-Id: I7be67f46069ed758e67066e696aa2567983fa374
uild_id.mk
ersion_defaults.mk
29371f157a8a5766be91f38bcc3502769d8a596d 13-Dec-2011 Bruce Beare <bruce.j.beare@intel.com> am 38158161: am 3343b27c: x86: The default ATOM BSP flags need to be in sync with the NDK ABI

* commit '381581613aab988acc6f9d5b459fd4f533d8c2a5':
x86: The default ATOM BSP flags need to be in sync with the NDK ABI
dbb31be41302aa4426006685e9c652de8074906a 10-Dec-2011 Ying Wang <wangying@google.com> Restrict vendor modules to help AOSP product distribution.

Bug: 5692177

If you set "PRODUCT_RESTRICT_VENDOR_FILES := true" in a product
configuration, this changes restricts that:
- No overlays in the vendor tree.
- No PRODUCT_COPY_FILES coming from the vendor tree.
- Any referenced package with Android.mk in the vendor tree must have
LOCAL_MODULE_OWNER set to a value that's compared against a whitelist
stored in the core build system.

Change-Id: I172b84c7c853e9a04bf9879ea8dec90bd5054230
ase_rules.mk
lear_vars.mk
roduct.mk
asks/module_owner_check.mk
fd626f2d21a55aec9133424f4303d5450ad9622e 12-Dec-2011 Ying Wang <wangying@google.com> Collect the GPL source files.

Bug: 5693205
Change-Id: I045b83949f8b29d7c5cf5c0ab32c5b83cf398e71
ase_rules.mk
efinitions.mk
asks/collect_gpl_sources.mk
381581613aab988acc6f9d5b459fd4f533d8c2a5 10-Dec-2011 Bruce Beare <bruce.j.beare@intel.com> am 3343b27c: x86: The default ATOM BSP flags need to be in sync with the NDK ABI

* commit '3343b27c534fb4ea238f2feaa0d9346840ee2f92':
x86: The default ATOM BSP flags need to be in sync with the NDK ABI
3343b27c534fb4ea238f2feaa0d9346840ee2f92 09-Dec-2011 Bruce Beare <bruce.j.beare@intel.com> x86: The default ATOM BSP flags need to be in sync with the NDK ABI

Change-Id: Ic741e1795c655ace1e33ae6708219f2708358090
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ombo/TARGET_linux-x86.mk
d2972716be3435771833972981b6225abb6ccdc0 08-Dec-2011 Stephen Hines <srhines@google.com> Merge "Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS."
914f7a2990ef0e02d4632dd77076c6c7bb11e6dd 07-Dec-2011 Stephen Hines <srhines@google.com> Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS.

Change-Id: Ia2a058e6711839d89072c2e96f0c60aa4cedda6b
lear_vars.mk
efinitions.mk
ava.mk
ab7707b7ca44d53868efbf48cc1579d3e675ce5c 07-Dec-2011 Dianne Hackborn <hackbod@google.com> 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.
d7b15982d21bad7a34bba3c6aa1d6448cda117dc 07-Dec-2011 Dianne Hackborn <hackbod@google.com> 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.
e73b24ccbe728476e5bc77aaf2fd6865276cacc3 06-Dec-2011 Dianne Hackborn <hackbod@google.com> Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.

Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246
ersion_defaults.mk
c401b4438c05ea589979ad6b4eefdd5d3d7795e7 07-Dec-2011 Jean-Baptiste Queru <jbq@google.com> am 0cd997ff: am 8af0efd6: Improve handling of absolute paths in out directory

* commit '0cd997ff31852af80eab4f3d0c2db8d1a1328085':
Improve handling of absolute paths in out directory
316febd7153e1c9e13911c216175104febc188db 07-Dec-2011 Jean-Baptiste Queru <jbq@google.com> am 78b68045: am ffe03c98: Set OUT_DIR based on a common base path

* commit '78b680458b3ba53fb2f88a603e371c002eb8944b':
Set OUT_DIR based on a common base path
0cd997ff31852af80eab4f3d0c2db8d1a1328085 07-Dec-2011 Jean-Baptiste Queru <jbq@google.com> am 8af0efd6: Improve handling of absolute paths in out directory

* commit '8af0efd6a157e682d88c9a6e030f37bab9860caf':
Improve handling of absolute paths in out directory
78b680458b3ba53fb2f88a603e371c002eb8944b 07-Dec-2011 Jean-Baptiste Queru <jbq@google.com> am ffe03c98: Set OUT_DIR based on a common base path

* commit 'ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c':
Set OUT_DIR based on a common base path
8af0efd6a157e682d88c9a6e030f37bab9860caf 07-Dec-2011 Jean-Baptiste Queru <jbq@google.com> Improve handling of absolute paths in out directory

Change-Id: If6b320e274fb1cee33808424246ce2c88b9b7ef5
umpvar.mk
ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c 06-Dec-2011 Jean-Baptiste Queru <jbq@google.com> Set OUT_DIR based on a common base path

Change-Id: I2c4ba8b101d4d186ed4b371b9d07b3bcf75bbcc9
Author: Jean-Baptiste Queru<jbq@google.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
umpvar.mk
nvsetup.mk
59075b8fbcc60f1e8459c571f9b37d8ebcdcdc2e 05-Dec-2011 Tor Norbye <tnorbye@google.com> Make asm-3.1 an optional module, remove from grandfathered list

Change-Id: I880cb298fad81d439e557ff5949cc9105bec217b
ser_tags.mk
99bcbeb355959d073e24dc5da9f858ee24cf7baa 02-Dec-2011 Ying Wang <wangying@google.com> Print more info of the image size stats.

Bug: 5620615
Before this change it only reports the limit if the real size exceeeds
or approaches the limit.

Change-Id: Ie1737d6ba2dc2d57ad82c487990e109882526d6e
efinitions.mk
33abebcc3f53ff018dc7954cd32db05d22b054c1 30-Nov-2011 Marius Renn <renn@google.com> am f945235a: am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1

* commit 'f945235a8adc6b163a0e46941791bb305ef37034':
Google Add-On API Documentation Fixes (5429077)
6c33b94c489a7494dd71846e05ad5991bf3b1add 30-Nov-2011 Marius Renn <renn@google.com> am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1

* commit '72db32c744744ae1ace26830ecce968b6a95e173':
Google Add-On API Documentation Fixes (5429077)
f945235a8adc6b163a0e46941791bb305ef37034 30-Nov-2011 Marius Renn <renn@google.com> am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1

* commit '72db32c744744ae1ace26830ecce968b6a95e173':
Google Add-On API Documentation Fixes (5429077)
b50bd7f0097e9b45a8265d418288abae8adbd78c 29-Nov-2011 Ying Wang <wangying@google.com> Move the prebuilt NDKs to their own git project prebuilts/ndk/.

Change-Id: If85986da436d412cff139af1fd8426e420bec121
onfig.mk
9978faf8f56fbb50184bc13931a33d3940822624 29-Nov-2011 Ying Wang <wangying@google.com> Move prebuilt SDKs to their own git project.

Change-Id: Ie6e9614e43bf82b8dd1f8702968be40cfb76b6c5
onfig.mk
dc2450ca25d1169a42dbe9de127b730718bc0eb9 21-Oct-2011 Tor Norbye <tnorbye@google.com> Build fix - include sdk/lint in build.
ain.mk
b1df701ed849ab311344f0c1c94396d03e1835d4 24-Nov-2011 Marius Renn <renn@google.com> 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
asks/sdk-addon.mk
d2cbcb40c085649a5094b2f74f64f853db8d1a2e 22-Nov-2011 Jean-Baptiste Queru <jbq@google.com> Restore AOSP-specific pseudo-version-numbers.

For great justice.

Change-Id: I5a0f722419bff676142ce975a66225f0cd418ff8
uild_id.mk
ersion_defaults.mk
86624bf60872cc80a61a23df3c3f4e63b52f5f34 19-Nov-2011 Jeff Hamilton <jham@android.com> Merge "Bypass alias for grep in the tapas command."
293f9392ba39115a9429b5c8f98a5ca4054b3e21 19-Nov-2011 Jeff Hamilton <jham@android.com> Bypass alias for grep in the tapas command.

Change-Id: I82705535bda927ddc7e9aebb9610d712b68a50d2
efinitions.mk
cbd4821b0a251936f21650a577306c3090972e9e 19-Nov-2011 Svetoslav Ganov <svetoslavganov@google.com> am ecca008c: am 700b18cc: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1

* commit 'ecca008c17c0f74a749289e23f8606f1b92930f6':
Add the support libraries to the platform documentation (build).
877bddc60427d64f5d603e7c7c39ffe80a1d9674 18-Nov-2011 Jing Yu <jingyu@google.com> Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields."
7bf82e017101ab458d085e42ca7d0aaefa8bbc9d 18-Nov-2011 Jing Yu <jingyu@google.com> Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.

http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html

-fstrict-volatile-bitfields is set on by default on gcc-4.6
for ARM target. This causes an inline asm() error. While
upstream gcc community is working on the patch, we shut
off this option temporarily.

This patch does not affect gcc-4.4.3 build.

Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
ombo/TARGET_linux-arm.mk
ecca008c17c0f74a749289e23f8606f1b92930f6 18-Nov-2011 Svetoslav Ganov <svetoslavganov@google.com> 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).
a4c1256fcac9ce5cbf8fdf8af853e31416d51c16 18-Nov-2011 Svetoslav Ganov <svetoslavganov@google.com> 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).
155d855ceed16d3c76c199d1d4812a60348cabcf 18-Nov-2011 Svetoslav Ganov <svetoslavganov@google.com> Add the support libraries to the platform documentation (build).

Added path to the support libraries.

bug: 5629339

Change-Id: Id414597046c528617313881ea857134512d1c2ba
athmap.mk
5f074803fbc14d091fb83208b81b3ffa10f54f90 08-Nov-2011 Ying Wang <wangying@google.com> Build system support to export include paths

Bug: 5573756
With this change, we can set LOCAL_EXPORT_C_INCLUDE_DIRS in the module
definition to export include dir paths.
Paths in LOCAL_EXPORT_C_INCLUDE_DIRS should be relative to the top dir
of the source tree.
If a library (shared or static) exports some include paths, any module
using it will import the include paths and add them to the compiler
command line.

Change-Id: I49aabc589d2cf214044d13ccd5532ef68209adf0
inary.mk
lear_vars.mk
efinitions.mk
ost_shared_library.mk
ost_static_library.mk
egacy_prebuilts.mk
rebuilt.mk
hared_library.mk
tatic_library.mk
1985846eb07757451a6e9f5d4c838e64397b5540 16-Nov-2011 Raphael <raphael@google.com> Merge "SDK: pass $HOST_OUT variable to atree."
c48696770fb4eb0318ae2e270a2e68ccb8219654 16-Nov-2011 Ying Wang <wangying@google.com> Remove BUILT_TESTS_ZIP_PACKAGE's dependency on the image files

Change-Id: I99baaeffe099e8fbb9789fb01b26a9a563e1e90d
akefile
c6e952fec16c06e66a6825328304fa1dec93278b 16-Nov-2011 Ying Wang <wangying@google.com> Don't build userdata.img for tests build.

Change-Id: I2982223919267f7b98f47b002c435e443674729a
akefile
2a533178c1f1f10f6c7060b1cb63523582c1765b 16-Nov-2011 Raphael <raphael@google.com> SDK: pass $HOST_OUT variable to atree.

Required by Change Id623bbef45 in development.git

Change-Id: I43229f1e6aaeea176df92a499b9cda3237fb36b9
akefile
227b9f8b9b5f5041b79b1e33a8d5815b1458d886 14-Nov-2011 Dianne Hackborn <hackbod@google.com> Merge "Dev branch for ICS MR2."
e446160ae11612a4b22790dcef5a1433d7cd6116 12-Nov-2011 The Android Open Source Project <initial-contribution@android.com> am 4115aeae: am 324c814c: Merge from AOSP

* commit '4115aeaef30cc2f13abc4a1e4165995909fa3098':
Add a hash-bang as the first line of a shell script
4115aeaef30cc2f13abc4a1e4165995909fa3098 12-Nov-2011 The Android Open Source Project <initial-contribution@android.com> am 324c814c: Merge from AOSP

* commit '324c814c6f479bb33eb8aa05d221c8a44b8f61b9':
Add a hash-bang as the first line of a shell script
324c814c6f479bb33eb8aa05d221c8a44b8f61b9 12-Nov-2011 The Android Open Source Project <initial-contribution@android.com> Merge from AOSP

Change-Id: Ie444a93a1fcba693332d302de828bdc62fd61647
7deff5fc54b0c143d4e9535df41afabf481cc48e 11-Nov-2011 Ying Wang <wangying@google.com> am bb5ada52: am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES

* commit 'bb5ada524c3c15132c832e076104d44ca7dde5ad':
Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
f9b556cd51f471cce24d2ad53725a6de9ff71f76 11-Nov-2011 Jean-Baptiste Queru <jbq@google.com> Add a hash-bang as the first line of a shell script

Change-Id: I5b663b036ecb25e952ecd2d998971cc326d4ebdf
ind-jdk-tools-jar.sh
bb5ada524c3c15132c832e076104d44ca7dde5ad 11-Nov-2011 Ying Wang <wangying@google.com> am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES

* commit 'a032d3d07372423176e072dfcbcf60a53f8a7d57':
Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
0497315bdecae342172a4977f81accbbc2755f2b 11-Nov-2011 Ying Wang <wangying@google.com> am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES

* commit 'a032d3d07372423176e072dfcbcf60a53f8a7d57':
Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
32a3e84f4d52e121e8b895b948b9a76cf8128f87 11-Nov-2011 Nick Kralevich <nnk@google.com> Merge "make gdbclient work on x86"
a032d3d07372423176e072dfcbcf60a53f8a7d57 11-Nov-2011 Ying Wang <wangying@google.com> Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES

Bug: 5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
roduct.mk
asks/sdk-addon.mk
0ab21d3ed34edbeb8631002db47a6a309581d9a4 11-Nov-2011 Nick Kralevich <nnk@google.com> make gdbclient work on x86

Change-Id: I2fd4fc2b89db13a8db1b177afdab593772cb12f8
umpvar.mk
6e4e1bbbc1f3e3c8e53940ffec24da9d1be4ff25 11-Nov-2011 Dianne Hackborn <hackbod@google.com> Dev branch for ICS MR2.

Change-Id: I53c18f2e84cd0a5c6529da1acc5f2c8d0ad0ef2e
ersion_defaults.mk
9f8e8db188371cb3787a91a03d193f87ad244ea3 04-Nov-2011 Ying Wang <wangying@google.com> Build cache.img on demand

Bug: 5153694
To build cache.img, set BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE (required,
ext4 only for now), BOARD_CACHEIMAGE_PARTITION_SIZE (optional) in
BoardConfig.mk.

Change-Id: I1d8b91646aa1dba88285e008ad3335768bcbddd2
akefile
nvsetup.mk
ain.mk
roduct.mk
ba2c734f71202522464db540260b0df696d26c06 10-Nov-2011 Jim Huang <jserv@0xlab.org> am e39ee4d5: am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE

* commit 'e39ee4d5e043872b3ef8053678a9c6020d82d4b6':
HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
e39ee4d5e043872b3ef8053678a9c6020d82d4b6 10-Nov-2011 Jim Huang <jserv@0xlab.org> am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE

* commit 'cb48497ff2f84e8f7def981246ddc028ea126879':
HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
cb48497ff2f84e8f7def981246ddc028ea126879 06-Sep-2011 Jim Huang <jserv@0xlab.org> HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE

While building Android with latest host gcc, it causes the following
build error:

Install: out/host/linux-x86/bin/mkbootimg
host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
<built-in>:0:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors

In order to make build system happy, this patch does unset macro
_FORTIFY_SOURCE and then define it in host cflags.

Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
ombo/HOST_linux-x86.mk
e04c2c21ee40f7e54924c586d5e7c148e0955ee1 10-Nov-2011 Conley Owens <cco3@android.com> am e915ab45: Place linker arguments after objects for gcc

* commit 'e915ab45a11f88c4fa5f2561c1aaca4b7d3d7593':
Place linker arguments after objects for gcc
e915ab45a11f88c4fa5f2561c1aaca4b7d3d7593 10-Nov-2011 Conley Owens <cco3@android.com> Place linker arguments after objects for gcc

gcc 4.6.1 does not properly link if libraries are specified before
objects.

Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
efinitions.mk
d9e7d257416a4c85f575161c10c589b3656db3e9 10-Nov-2011 Conley Owens <cco3@android.com> Place linker arguments after objects for gcc

gcc 4.6.1 does not properly link if libraries are specified before
objects.

Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
efinitions.mk
d9d2e7a42c18a997ae47e4174713b5e2942044b5 04-Nov-2011 Nick Kralevich <nnk@google.com> x86: enable PIE for dynamically linked executables

Compile all x86 programs on Android with -fPIE and -pie. This enables
PIE (Position Independent Executables), which helps protect Android
applications from exploitation due to memory management bugs.

Note 1: PIE *static* executables are not supported at this time and
require additional linker changes.

Note 2: This change compliments 026a85b129e4540a4d8d40aace47aa0c69f609da,
which was the exact same change, except for ARM.

Testing: Rebuilt the tree completely from scratch, and verified
that the system boots and basic functionality works in the emulator.

Change-Id: I990064c37da3d857e663b27f31fee05f689a2824
ombo/TARGET_linux-x86.mk
ff728d2c2db1f595fdcf8999f5dd081c0245ddff 03-Nov-2011 Brian Muramatsu <btmura@google.com> am 976fbcbd: am e43794ac: am 277be2fe: Stop Packaging Old CTS Test Runner Files

* commit '976fbcbd095ced5b07e7b0ed777f013c7b8ca717':
Stop Packaging Old CTS Test Runner Files
8b36dd1558cc51e2caa367f928837bd8e8045fcd 03-Nov-2011 Brian Muramatsu <btmura@google.com> am e43794ac: am 277be2fe: Stop Packaging Old CTS Test Runner Files

* commit 'e43794ace2a32cff6b1896981ba8bd3a7fa9f562':
Stop Packaging Old CTS Test Runner Files
e43794ace2a32cff6b1896981ba8bd3a7fa9f562 03-Nov-2011 Brian Muramatsu <btmura@google.com> am 277be2fe: Stop Packaging Old CTS Test Runner Files

* commit '277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb':
Stop Packaging Old CTS Test Runner Files
277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb 03-Nov-2011 Brian Muramatsu <btmura@google.com> Stop Packaging Old CTS Test Runner Files

Bug 5563917

This stops packaging the startcts script and the cts.jar into
the android-cts.zip. Since we are only testing using Tradefed,
we should prevent confusion by removing the old test runner.

Change-Id: I79f991617dd9e6a51a314207b4727cce3136d60f
asks/cts.mk
003dc3cf43dfdf3de6672d95fcbcc1211e971cf0 03-Nov-2011 Nick Kralevich <nnk@google.com> Merge "stop using a custom linker script for static executables."
d4495e99333d43c7cd1e8bd2758fac43dba7a0b0 02-Nov-2011 Ying Wang <wangying@google.com> Allow to set ANDROID_BUILDSPEC as path of buildspec.mk

So that clients can set a custom buildspec.mk without adding
buildspec.mk at the top dir.

Change-Id: Ic15efa6cfbf00f04db35447e70bb5bdd63a5058c
onfig.mk
ad2c1b4b44d5b9be32344ead138694c70a52da18 02-Nov-2011 Ying Wang <wangying@google.com> Allow to set ANDROID_BUILDSPEC as path of buildspec.mk

So that clients can set a custom buildspec.mk without adding
buildspec.mk at the top dir.

Change-Id: I4d993e24cea19caffdfe85822cdfdb9483cdfce7
onfig.mk
caf58b1f5c6cecd75e18d2251b3e1da2db0189e5 02-Nov-2011 Dianne Hackborn <hackbod@google.com> am 0c8f79dd: am 1b601a44: Merge "MR1 is version 4.1, API 15." into ics-mr1

* commit '0c8f79dd01366a45b255584ef279e498741728e4':
MR1 is version 4.1, API 15.
2e9e6ffceac422b3fb9a6ccb9398558655d9bd90 02-Nov-2011 Dianne Hackborn <hackbod@google.com> am 1b601a44: Merge "MR1 is version 4.1, API 15." into ics-mr1

* commit '1b601a447247bcc373d417d7be4c89c1e6216b89':
MR1 is version 4.1, API 15.
b32faad390eb8a865b0ea2b18fdfa9b87c4ff689 02-Nov-2011 Dianne Hackborn <hackbod@google.com> MR1 is version 4.1, API 15.

Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a
ersion_defaults.mk
c0debb9b5e2f2f5deb00fb7db5b5c03177b06460 02-Nov-2011 Ying Wang <wangying@google.com> Revert "Build cache.img."

This reverts commit 531bdb546af5127ed9c1012871d780930eb990f5.
akefile
nvsetup.mk
ain.mk
4185447f2f04a646c1659149699dadb6f9a48451 01-Nov-2011 Nick Kralevich <nnk@google.com> stop using a custom linker script for static executables.

This is causing problems with making the linker relocatable.

Change-Id: I53e37fba52eabd3145130712d6e9bff074aed493
ombo/TARGET_linux-arm.mk
531bdb546af5127ed9c1012871d780930eb990f5 01-Nov-2011 Ying Wang <wangying@google.com> Build cache.img.

Change-Id: I3dbe7afa4934fa718ba20605eebd2e3ce2ae82ab
akefile
nvsetup.mk
ain.mk
178ef923ac1a9f9ad2039990832bd1eebe8df5af 01-Nov-2011 Ying Wang <wangying@google.com> Fix build.

Change-Id: I166d4e0c5cc4d2b58c7af3f0207b2d161a9d1715
akefile
bd93d425aedef907d8fef643b748897e9c7dceeb 29-Oct-2011 Ying Wang <wangying@google.com> Unify the user image building code

Bug: 5398808

Before this change we have duplicate code in the Makefile and the
python-based releasetool. That's a real headache to maintain.

Change-Id: I8ddf04a79c6886540e89d990f723d8f77c9dd883
akefile
c72b1403e43884dc7dc9f749be51a8d890d62e27 31-Oct-2011 Joe Onorato <joeo@google.com> Add a tool to let you enforce layering between packages in a java module.

And build system support for it too.

Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
lear_vars.mk
efinitions.mk
ava.mk
e7d25da9292f602606e26038b7ae689c009f696d 28-Oct-2011 Jean-Baptiste Queru <jbq@google.com> am 9a3dfc06: am 68eb6649: am 432f8d88: Reconcile with AOSP master

* commit '9a3dfc06b94a59bdc7005a8a944996c956527c19':
e0c60125b99df5bdf33ae2e573c8faa9ae4ef270 28-Oct-2011 Ying Wang <wangying@google.com> Merge "Add TARGET_COPY_OUT_* variables."
2b6aaa367a334a19cacab1fd2f78ae232e072198 28-Oct-2011 Ying Wang <wangying@google.com> Add TARGET_COPY_OUT_* variables.

They are relative to PRODUCT_OUT so can be used in PRODUCT_COPY_FILES.
If TARGET_COPY_OUT_VENDOR instead of hardcoded system/vendor is used, we
will be able to transition smoothly to a separate vendor staging directory.

Change-Id: Ia9fdb208768cf4699180306280b4c02421b2ea9c
nvsetup.mk
2d50524a0164072d0cf3f60108d0a2227d4cabc1 01-Sep-2011 Mike Lockwood <lockwood@android.com> main.mk: Allow overriding subdirs via make variable TARGET_SUBDIRS

Change-Id: I9e1523833e1567a59b19482c7834fe30479a009f
Signed-off-by: Mike Lockwood <lockwood@android.com>
ain.mk
6af4bb07e3122c12f4391e8a0a51e09dbf69593d 27-Oct-2011 Jing Yu <jingyu@google.com> Merge "Fix build problems with gcc-4.6.x."
fddf23f19e7604e6c5b3c5377e7ff6293539a1da 06-Sep-2011 Jim Huang <jserv@0xlab.org> HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE

While building Android with latest host gcc, it causes the following
build error:

Install: out/host/linux-x86/bin/mkbootimg
host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
<built-in>:0:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors

In order to make build system happy, this patch does unset macro
_FORTIFY_SOURCE and then define it in host cflags.

Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
ombo/HOST_linux-x86.mk
5071047d7e01186e4d027a2180416ab48415cc36 27-Oct-2011 Conley Owens <cco3@android.com> Merge "HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE"
d9ed9eba1bbe4a67fbc8a640e5c89241cd2e721b 27-Oct-2011 Ying Wang <wangying@google.com> am 00d1d614: am b3e6fa5e: Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0

* commit '00d1d614f6e9c29e366b2608cd37814856df5efc':
new LOCAL_DEX_PREOPT option "nostripping"
00d1d614f6e9c29e366b2608cd37814856df5efc 27-Oct-2011 Ying Wang <wangying@google.com> am b3e6fa5e: Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0

* commit 'b3e6fa5e6bdaf6e1e827c3e79ffda1ef796b3a1b':
new LOCAL_DEX_PREOPT option "nostripping"
5a866004b6198282197cde6a84d205d245ae4f44 27-Oct-2011 Xavier Ducrohet <xav@android.com> Remove last reference to layoutopt.

Change-Id: Ifdcf35e0bda41fbb5f04515a4b0f1c60dd130d50
ser_tags.mk
3282e9bb4d26e56f4ed37b55b7771db02374d4c8 27-Oct-2011 Xavier Ducrohet <xav@android.com> Remove references to layoutopt from the build.

Change-Id: I54a41f47a380531f4b50eb26e67e8f52b63269a5
ain.mk
ser_tags.mk
65216a2d3bdf3e6f07010a8ebfccf17017e96db9 27-Oct-2011 Omari Stephens <xsdg@android.com> Revert "Remove layoutopt; replaced by the more generic "lint" tool."

This reverts commit 7a23d45cdca22751c421427ce0e4e12df31945d2.
ain.mk
ser_tags.mk
3015409aae5bbecbcfd925f5da90a7d7b2e33d58 27-Oct-2011 Tor Norbye <tnorbye@google.com> Merge "Remove layoutopt; replaced by the more generic "lint" tool."
7a23d45cdca22751c421427ce0e4e12df31945d2 21-Oct-2011 Tor Norbye <tnorbye@google.com> Remove layoutopt; replaced by the more generic "lint" tool.

Change-Id: I5754d10ec7b3fd03a2eb9a70e5f73201f909e11e
ain.mk
ser_tags.mk
525389ee49af11b313c9652331a2fbfcaff91428 25-Oct-2011 Ed Heyl <ed@google.com> set ID to MR1. Please do not merge.

Change-Id: Ib181d19806a2589ec124b648e2d12c5350b0ce81
uild_id.mk
79e3dec83ee012e94e34ed092cea5b9d60040e9d 24-Oct-2011 Ying Wang <wangying@google.com> new LOCAL_DEX_PREOPT option "nostripping"

Set "LOCAL_DEX_PREOPT := nostripping" to do dex-preopt while not strip
the classes.dex.

Bug: 5396625 5502338
Change-Id: Ie8dea4414ebeefeae89c6433b246faea27baa5e7
ase_rules.mk
lear_vars.mk
ava_library.mk
ackage.mk
026a85b129e4540a4d8d40aace47aa0c69f609da 24-Oct-2011 Nick Kralevich <nnk@google.com> enable PIE for dynamically linked executables

Compile all programs on Android with -fPIE and -pie. This enables
PIE (Position Independent Executables), which helps protect Android
applications from exploitation due to memory management bugs.

Stop using the armelf.x linker script. This script hard codes the
load address of the executable, defeating the position independence
PIE requires.

Note: PIE *static* executables are not supported at this time and
require additional linker changes.

Bug: 5323301
Change-Id: Ieafcc9c4f142495847e163881889d371a59d0878
ombo/TARGET_linux-arm.mk
59d296623b0820fa0689b70c20af1db6b4435ab2 06-Sep-2011 Jim Huang <jserv@0xlab.org> HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE

While building Android with latest host gcc, it causes the following
build error:

Install: out/host/linux-x86/bin/mkbootimg
host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
<built-in>:0:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors

In order to make build system happy, this patch does unset macro
_FORTIFY_SOURCE and then define it in host cflags.

Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
ombo/HOST_linux-x86.mk
4427f4e812b24d773d9bdf21a9d6c4da3d3a9c20 22-Oct-2011 Wink Saville <wink@google.com> Change BUILD_ID.

On master branch build id should be MASTER.

Change-Id: I7829b3933947730b298fca8a4e39de6a60b9caad
uild_id.mk
4377cc701a0bef32aaff34d0d119974544fd20d6 21-Oct-2011 Tor Norbye <tnorbye@google.com> Build fix - include sdk/lint in build

Change-Id: Id65b7a3f72dd6c5104738fa872f3beb029d91163
ain.mk
cec077521e216af1a62951a4b167788b292f7091 18-Oct-2011 Bjorn Bringert <bringert@android.com> Merge "Compile each proto file separately"
20f5efd82caf038697c03daa230345cdda9ae31d 18-Oct-2011 Bjorn Bringert <bringert@android.com> Compile each proto file separately

Before, if a module had several proto source files,
they would all be compiled in a single invocation
of aprotoc. If any of the files imported one of the
other files, you got an aprotoc error about duplicates.
And if you removed the files that were imported
from the list of source files, no Java code
would be generated for the imported files,
causing a Java compile time error.

This changes compiles each proto file separately, which
avoids both of the problems above. It's slightly more
inefficient, but aprotoc is really fast.

Change-Id: I7bd8092ec2953c20269367a1c68ff84acceea3be
efinitions.mk
67d6305c5c814e3a913a4cd69aafdc2f1410b22d 18-Oct-2011 Ying Wang <wangying@google.com> am 55370202: Remvoe whisperd from user_tags.mk.

* commit '5537020242a499e54c351ced962fe437ae1fc4d2':
Remvoe whisperd from user_tags.mk.
5537020242a499e54c351ced962fe437ae1fc4d2 18-Oct-2011 Ying Wang <wangying@google.com> Remvoe whisperd from user_tags.mk.

Change-Id: Ib271c568a6e6907d033040dbe6c3574124fbe469

Bug: 5473754
ser_tags.mk
9baabf8d7e017e4f34fef2f4766671804063df28 17-Oct-2011 Dianne Hackborn <hackbod@google.com> am a0f464a8: New PRODUCT_AAPT_PREF_CONFIG.

* commit 'a0f464a8e7f006177db084df7e925bbb8e5ffed3':
New PRODUCT_AAPT_PREF_CONFIG.
a0f464a8e7f006177db084df7e925bbb8e5ffed3 15-Oct-2011 Dianne Hackborn <hackbod@google.com> New PRODUCT_AAPT_PREF_CONFIG.

To use the new aapt --preferred-configurations option. For use with Prime
to be able to strip everything but xhdpi density bitmaps selectively,
not stripping when this would result in no data for the resource.

Change-Id: I4e1012929b8f9b0b1e79c06496647f69661ba1f2
leanbuild.mk
efinitions.mk
ackage.mk
roduct.mk
roduct_config.mk
32fa8a313cf7b94396761dd09addb2d80848b336 14-Oct-2011 Ying Wang <wangying@google.com> Support to package prebuilt NDK libstlport_shared.so into apk

To package libstlport_shared.so, use the following syntax in the app
module definition:
LOCAL_NDK_STL_VARIANT := stlport_shared
LOCAL_NDK_VERSION := <num>

The rationale behind is:
The NDK prebiult libstlport_shared.so is intentionally different from
the system libstlport.so.
Essentially they are slightly different versions of the library so
shouldn't be mixed up.
libstlport.so is used by the system, but not exposed by the NDK, it is
routinely tweaked in various ways between platform releases, and there
is no guarantee that its ABI is stable, or that it will not be replaced
by something else in the future.
libstlport_shared.so is typically distributed with application packages,
and should not be part of the system.

Change-Id: I72c9911781f7d8402687e9891f3f605f3a60be22
ackage.mk
2b407577256e97f35d1fb25f6ec95415cde8ffdf 13-Oct-2011 Doug Kwan <dougkwan@google.com> Fix build problems with gcc-4.6.x.

Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
ombo/TARGET_linux-arm.mk
5fc85c6bfe8f9789f12cc44cba123eadf98abce2 12-Oct-2011 Dima Zavin <dima@android.com> am 854233e9: core: remove the built fake packages (not installed) on installclean

* commit '854233e9b2e24c75f63db96bb1be9a7bb2cecd84':
core: remove the built fake packages (not installed) on installclean
854233e9b2e24c75f63db96bb1be9a7bb2cecd84 12-Oct-2011 Dima Zavin <dima@android.com> core: remove the built fake packages (not installed) on installclean

Change-Id: I1ff3754132a48c545d0a3215ae23d204aba50637
Signed-off-by: Dima Zavin <dima@android.com>
leanbuild.mk
eee20ca405c886773104ed063124b5f5a80c6f77 12-Oct-2011 Dima Zavin <dima@android.com> am 7dac5909: core: remove fake package timestamps on installclean

* commit '7dac5909d23a78ff6ed2af6e4d937354de8c7756':
core: remove fake package timestamps on installclean
7dac5909d23a78ff6ed2af6e4d937354de8c7756 12-Oct-2011 Dima Zavin <dima@android.com> core: remove fake package timestamps on installclean

Change-Id: Ic07af1f751b301b69fa5cbbb7bf51ad718d54d52
Signed-off-by: Dima Zavin <dima@android.com>
leanbuild.mk
d89452976b6d476896747a0136a1ad40e514e162 11-Oct-2011 Ying Wang <wangying@google.com> Merge "Use shell variable to eliminate $(eval) in commands."
861348a4be2355e49f090271d7410fa850d5c7f8 11-Oct-2011 Android Git Automerger <android-git-automerger@android.com> Merge branch 'master' of ssh://android-git:29418/platform/build
e27347e7a4e41e250b689d54ae911522623b2427 11-Oct-2011 Ying Wang <wangying@google.com> Merge "Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds"
738f053bf3e00af8455d89dd4bb4724e83292e7e 11-Oct-2011 Ed Heyl <ed@google.com> mr0 - do not merge

Change-Id: I3b19b8cdad6820bc8ab2047ac48cb2964132a3fa
uild_id.mk
486be821985f5c6680daee90bdf3befb602a1ed0 08-Oct-2011 Ying Wang <wangying@google.com> Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds

Bug: 5430740
- Remove nonexistent names in PRODUCT_PACKAGES.
- Push down bluetooth-health, hostapd and wpa_supplicant.conf to
generic_no_telephony.mk and large_emu_hw.mk because they are not needed
by sdk builds.
- Remove core.mk from generic_armv5.mk and generic_x86.mk because they
already inherit from generic.mk.

Change-Id: Ie44b95f1cae7ed0d4cf827ffce6a91d41902434d
ain.mk
32ef58e2c13b9692f9b16a14434978200573d26c 10-Oct-2011 Ying Wang <wangying@google.com> Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use.

Bug: 5433204
Change-Id: Id88c21f8d1991d8cbcc5bb7dae784aa72dc4becf
roduct.mk
roduct_config.mk
68fbf0fa52ee5f749b8ec26dd71ed2f72aad37e0 05-Oct-2011 Doug Zongker <dougz@android.com> am 49c6a2b5: fix build fingerprint: dev-keys vs test-keys

* commit '49c6a2b5e4314bd8acfbca88cd43ea49a2c8c30e':
fix build fingerprint: dev-keys vs test-keys
49c6a2b5e4314bd8acfbca88cd43ea49a2c8c30e 05-Oct-2011 Doug Zongker <dougz@android.com> fix build fingerprint: dev-keys vs test-keys

The fingerprint should only say dev-keys if it's actually using custom
keys; builds with the old default (from build/target/product/security)
should still say test-keys.

Change-Id: Ib8c662c348cf63f5db47e2f8f81bc3246cb15fdc
akefile
a4bbf24afde6288f5511fdb1f5600cafa27d9a93 05-Oct-2011 Doug Zongker <dougz@android.com> am f9ede7e9: Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom

* commit 'f9ede7e925a668cc8c0b44cb69c0795cb6c8c896':
sign non-PRESIGNED prebuilt apks
f9ede7e925a668cc8c0b44cb69c0795cb6c8c896 05-Oct-2011 Doug Zongker <dougz@android.com> Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom
08d79c12de87674e006c9b3e8e68f9a52d6e180b 05-Oct-2011 Doug Zongker <dougz@android.com> sign non-PRESIGNED prebuilt apks

Since dev keys can now vary per device, we can't assume they are
checked in with the correct signature.

Change-Id: I7577a3a6bd98d005c15936c99b2944acc4412798
rebuilt.mk
0611aeedeb58bf4df1f1143f602aa64c8dbddc35 05-Oct-2011 Ying Wang <wangying@google.com> Merge "Install path support for vendor modules." into ics-factoryrom
213c1f985daa159065ee41c4fc6ca4e1b8def189 05-Oct-2011 Ed Heyl <edheyl@google.com> am 81703a19: Merge "Support for product-specific dev keys." into ics-factoryrom

* commit '81703a19001ec219c35cb0ecf9bafb6e0dbc1e1d':
Support for product-specific dev keys.
3c21fe5b12d95fe374b9b8c874dc4c48b7f9fce1 04-Oct-2011 Ying Wang <wangying@google.com> Support for product-specific dev keys.

Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
akefile
onfig.mk
ackage.mk
rebuilt.mk
roduct.mk
roduct_config.mk
6886410210277294165dd9de95c7a56ce62547ac 29-Sep-2011 Ying Wang <wangying@google.com> Enforce no prebuilt apks in PRODUCT_COPY_FILES.

Bug: 5391935
Change-Id: I106ffc3277914e57cc1a6fb4cd782286d61b8013
akefile
2a71850eb330ae9e9b098246de09998687c4909c 27-Sep-2011 Ying Wang <wangying@google.com> Merge "Generate an empty target if there is no packages"
f272cd6c2290160a13917a98388af1132443098c 26-Sep-2011 Ying Wang <wangying@google.com> Generate an empty target if there is no packages

Generate an empty target even if there is no packages defined in the
source tree. Such case can happen when building in an unbundled branch.

Change-Id: Id8b94bc00557cd5ea2066859e440427474ced5f5
akefile
becc3da91507193ef4270d65e2756bb0a00c15a9 23-Sep-2011 David 'Digit' Turner <digit@google.com> resolved conflicts for merge of 2f2882a0 to master

Change-Id: Ia07eb9d022a8036c2b1674c591514740aa0d4596
2f2882a04e50af2cf8a7b99d3c2a184c131740fa 23-Sep-2011 David 'Digit' Turner <digit@google.com> am fdb13fcc: am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread

* commit 'fdb13fccfecdf526549ad453a20e8136253edb51':
sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
fdb13fccfecdf526549ad453a20e8136253edb51 23-Sep-2011 David 'Digit' Turner <digit@google.com> am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread

* commit '0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2':
sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2 23-Sep-2011 David 'Digit' Turner <digit@google.com> Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
228fd69eafc8b3d6e59ec6a03d89c9791334b7e5 22-Sep-2011 Dianne Hackborn <hackbod@google.com> Merge "Let's call MR0 4.0.1."
4d2b9bf341e7978225d6a305c2524ff79f2d18c5 21-Sep-2011 Xavier Ducrohet <xav@android.com> Cherrypick 6de7bc61 from master. do not merge.

Copy notice file in the new system image folder

Change-Id: I66496f382b2d13b030de569b573630f3abe5b9de
akefile
7766ea28843bb3cb223c65b1752055288ad245d8 22-Sep-2011 Dianne Hackborn <hackbod@google.com> Let's call MR0 4.0.1.

Change-Id: Ie55012702e2cfb1eb247941e8b73519ad9b5c547
ersion_defaults.mk
6de7bc611babbcc29c529379779723b4bb6b55f5 21-Sep-2011 Xavier Ducrohet <xav@android.com> Copy notice file in the new system image folder

Change-Id: I4fafe5dc9dc1749de56267206a9b847a97e6a14b
akefile
43e18e0d7ba8c83335a4e782f0f3be737322f209 13-Sep-2011 Ying Wang <wangying@google.com> Install path support for vendor modules.

Bug: 5284764
Set "LOCAL_PROPRIETARY_MODULE := true" to install module to vendor
partition.

Change-Id: I9acdda6b2ff3142628b9849ea534b3ec288545a0
ase_rules.mk
lear_vars.mk
nvsetup.mk
99732e2c5937078ab3a65245db4d034669c36d02 21-Sep-2011 Ying Wang <wangying@google.com> am 04c48584: Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom

* commit '04c485843f9fce0f66d18cb96e1051b7382b1f38':
Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.
415f1f66133f8b7873345457696e7a3cca2b85c2 21-Sep-2011 Ying Wang <wangying@google.com> Merge "Install path support for vendor modules."
04c485843f9fce0f66d18cb96e1051b7382b1f38 21-Sep-2011 Ying Wang <wangying@google.com> Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom
c30e190347e88fa56afda1024cd117b2ac9b5fa0 20-Sep-2011 Doug Zongker <dougz@android.com> am 7094bf3a: am 25863d73: build the sqlite3 binary for use by the OTA tools

* commit '7094bf3a5e9d1983d6877f580506d93fd736c437':
build the sqlite3 binary for use by the OTA tools
7094bf3a5e9d1983d6877f580506d93fd736c437 20-Sep-2011 Doug Zongker <dougz@android.com> am 25863d73: build the sqlite3 binary for use by the OTA tools

* commit '25863d738ca171015a57a2154ff6ebe4ae8f5483':
build the sqlite3 binary for use by the OTA tools
25863d738ca171015a57a2154ff6ebe4ae8f5483 20-Sep-2011 Doug Zongker <dougz@android.com> build the sqlite3 binary for use by the OTA tools

Change-Id: I2c6cc02dec74fdcedd3e2a6f3ddb1dfba657a883
akefile
14169bcea813b2f6c5aa6993b7f154d9c03f5b18 19-Sep-2011 Dianne Hackborn <hackbod@google.com> New LOCAL_SDK_RES_VERSION config var.

This allows an app to target a different SDK level for its resources
than it uses for its Java code. This is useful because it is generally
safe to use various newer symbols like attribute names, as older versions
of the platform will simply ignore them.

Change-Id: Ida19ec9f259c4ea70de846e9a63546e263b1c91e
lear_vars.mk
ackage.mk
514c487dcb0f0a3ef800305bbf75c0773f1e4966 16-Sep-2011 Raphael <raphael@google.com> Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE.

Required by Change-Id Ic651e3c3 in sdk.git

Cherry-pick from master c36df7b12bb5e1e97e39c3576d330af37536b02d

Change-Id: Ic51ad7df01ce1bc926ba69f8a031a060edbf0bd1
ain.mk
77fed26921ed7c083fc3f176e19b1f1d78ef80f1 15-Sep-2011 Raphael <raphael@google.com> Don't strip llvm-rs-rc in core/Makefile. DO NOT MERGE.

This is done in development/build/sdk.atree now.

Cherry-pick from master 469bbdf8c37a74e236d129faeaa5483838af9028
akefile
cf29731eea6ecf11a4d5f4d8ae2e549f58f60fc0 16-Sep-2011 Raphael <raphael@google.com> Merge "Don't strip llvm-rs-rc in core/Makefile"
aae801fb1c1c298f378ed43a2ab4db2a29be2905 16-Sep-2011 Raphael <raphael@google.com> Merge "Enable building sdk/avdlauncher in the Win SDK."
c36df7b12bb5e1e97e39c3576d330af37536b02d 16-Sep-2011 Raphael <raphael@google.com> Enable building sdk/avdlauncher in the Win SDK.

Required by Change-Id Ic651e3c3 in sdk.git

Change-Id: I97f389d052ba9abf1c40547abbc6d7c164bdf405
ain.mk
c36b450ab10df53ce116ee7277e431e7b64ea218 15-Sep-2011 Ying Wang <wangying@google.com> Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.

So that prebuilt shared libraries can be referenced with the module name
in other module's Android.mk.

Change-Id: I4c4b471696642694b805b71dd7605b91724ad924
rebuilt.mk
704c0c9fcac5f680411666835fc6bd5d052ba8db 15-Sep-2011 Ying Wang <wangying@google.com> Use LOCAL_REQUIRED_MODULES to add dependency of installed shared libraries

Bug: 5200343
Before this change the build system assumes that shared libraries will
be installed to $(TARGET_SHARED_LIBRARIES). That's not true if the
module uses custom LOCAL_MODULE_PATH.
With this change we defer the evaluation of the dependency to after all
Android.mks are loaded and all modules have their installed path
determined.

Change-Id: Ib6628ed44154a90e8668d31691fbbac67125be6c
inary.mk
469bbdf8c37a74e236d129faeaa5483838af9028 15-Sep-2011 Raphael <raphael@google.com> Don't strip llvm-rs-rc in core/Makefile

This is done in development/build/sdk.atree now.

Change-Id: I2cd8e42192439851e1e42070cf74e6ee7c02ba59
akefile
58dcc788b95c38e3c6829d024f3e43f99391a1cf 15-Sep-2011 Ed Heyl <ed@google.com> Merge commit '4d7ddab160ba29247225e11c2092dcfd68bd6baf' into ics-factoryrom
b8fe43be2846818c38ab237d00db38c246d7f2ec 15-Sep-2011 Ed Heyl <ed@google.com> default version

Change-Id: I6ca2be74916b5bebffd910fdbcbefe158fdfc562
uild_id.mk
4d7ddab160ba29247225e11c2092dcfd68bd6baf 14-Sep-2011 Dianne Hackborn <hackbod@google.com> Hello, Android 4.0.

Change-Id: I0d775bc81e1fb1c3ca0151b15a582035109dc5b5
ersion_defaults.mk
8f77936dd808ef77e0f1f02b0e0f648dc94b79a8 13-Sep-2011 Ying Wang <wangying@google.com> Install path support for vendor modules.

Bug: 5284764
Set "LOCAL_PROPRIETARY_MODULE := true" to install module to vendor
partition.

Change-Id: I1301acc10664a12e313f3b868d9fd6400ac8b133
ase_rules.mk
lear_vars.mk
nvsetup.mk
e5e8c5f218c633b42b3814e36cd062eff099daed 10-Sep-2011 Ying Wang <wangying@google.com> Move forward installed-files.txt in the dependency graph

Bug: 5265104
- Move installed-files.txt forward to ahead of system.img in the
dependency graph, so that even if the system.img fails to build due to
too large size we can still get the size stats.
- Change the script tools/fileslist.py to sort items in decreasing size.

Change-Id: I5913bc51971e341ffbfcf3fa449c987f126e409b
akefile
164285e05f75c770dc936dc51b01ce93983d9831 09-Sep-2011 Brian Muramatsu <btmura@google.com> am 8658fa51: am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5

* commit '8658fa51d15290cf43178d0633b53f11ff08a4aa':
Disable Dexpreopt for generic_arm5
8e5b540cffeac75f698020b9fbbb24dcd7d6b061 08-Sep-2011 Ying Wang <wangying@google.com> am 41346ae4: am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp

* commit '41346ae4077c7dee66a7c04dc91714569dca9303':
Allow uninstallable APPs.
d62de0f88450e310188234ee1b3d5afdd0312b9a 08-Sep-2011 Ying Wang <wangying@google.com> Merge "Provide LOCAL_RENDERSCRIPT_TARGET_API override."
f1054bf22e3a2bde2ee587db2e29d68dada104d2 08-Sep-2011 Ying Wang <wangying@google.com> Merge "Discard hidden files when rounding up resource."
c29dfcad757727bf2c8f640c09121a2d0b55909f 08-Sep-2011 Doug Zongker <dougz@android.com> Merge "save uid/gid/mode information of boot and recovery files"
8658fa51d15290cf43178d0633b53f11ff08a4aa 08-Sep-2011 Brian Muramatsu <btmura@google.com> am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5

* commit '9d014e6570deb3861b503833823e56e1c589626c':
Disable Dexpreopt for generic_arm5
9d014e6570deb3861b503833823e56e1c589626c 08-Sep-2011 Brian Muramatsu <btmura@google.com> am 9353a3be: Disable Dexpreopt for generic_arm5

* commit '9353a3be5fca8a83c3a60e890fbca323f9fb0e04':
Disable Dexpreopt for generic_arm5
9b73fdabc4e81ab089f3435abe411fb7aee3c1e4 08-Sep-2011 Raphael <raphael@google.com> Merge "Enable 'make traceview' under Windows."
d47da7081726c0fdef468cea4ee0530ed25b55c8 08-Sep-2011 Brian Muramatsu <btmura@google.com> am 3eae5b7c: am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS Build

* commit '3eae5b7c1b3197bed4c883a671cfea9d5d9570bf':
Use package.apk.unaligned in CTS Build
9353a3be5fca8a83c3a60e890fbca323f9fb0e04 08-Sep-2011 Brian Muramatsu <btmura@google.com> Disable Dexpreopt for generic_arm5

Bug 5267392

After coming across another place where I would have to use
package.apk.unaligned, I decided maybe it is best to just
disable dexpreopt as was previously suggested.

Use package.apks in the CTS Makefile task.

Change-Id: Iec839a72f4b53441337523b8a9cccda657eec8e8
asks/cts.mk
d9020c2e9a5c686d6208be48daa44bfa23065b2c 07-Sep-2011 Ying Wang <wangying@google.com> Add ABI specific include path for NDK.

Change-Id: I37a935126b9a1e544fc5a7471cf6ca224fc89cf3
inary.mk
23f8bde52dca769ad9d44f74450b32a017b0776d 07-Sep-2011 Doug Zongker <dougz@android.com> save uid/gid/mode information of boot and recovery files

Save these in the target_files so we don't have to depend on using the
contents of android_filesystem_config.h at the tip of tree.

Bug: 5266067
Change-Id: Ica5dd43a2013c9db72d7c9434f9d7de1abaf18f9
akefile
41346ae4077c7dee66a7c04dc91714569dca9303 07-Sep-2011 Ying Wang <wangying@google.com> am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp

* commit 'ba35b2d61531a071533891307904e6ad7f81fb65':
Allow uninstallable APPs.
ba35b2d61531a071533891307904e6ad7f81fb65 07-Sep-2011 Ying Wang <wangying@google.com> resolved conflicts for merge of 162991be to gingerbread-plus-aosp

Change-Id: I06edde6c517b4c4e2bd03e2d1d44da52ee3066d5
162991beb523ad1b88507c3855423866c856b107 07-Sep-2011 Ying Wang <wangying@google.com> Allow uninstallable APPs.

Bug: 5264671
This is needed by cts tests.
It's harmless to existing modules.

Change-Id: I0083471f80d483559b27523d4b88190d7913f6f1
ase_rules.mk
15185063456dcbd6975c89bf9bbb7d9ff81f0f28 02-Sep-2011 Raphael <raphael@google.com> Enable 'make traceview' under Windows.

Change-Id: I2b89d2ee66d0bb4a1b2bb6e4ea15d3b0419cead9
ain.mk
0f2e55e47d269250237885ea01dee4324a9a6eb1 06-Sep-2011 Justin Ho <justinho@google.com> Merge "Updated dex-preopt BOOTCLASSPATH with values from init.rc Bug: 5032006"
0279b62d166c66d507f14aebfbd80c6f2c7202d7 06-Sep-2011 Justin Ho <justinho@google.com> Updated dex-preopt BOOTCLASSPATH with values from init.rc
Bug: 5032006

Change-Id: I6ed7e55ec2b278c0d60ad4e17208480d05af61bc
ex_preopt.mk
e1a8e3aef3834e8b451f2f8ae465c47ed58aba00 03-Sep-2011 Doug Zongker <dougz@android.com> allow setting LOCAL_STRIP_MODULE on multi_prebuilts

Change-Id: I4a58255381ba8a50d8f9512bf9892f5050599393
ulti_prebuilt.mk
3eae5b7c1b3197bed4c883a671cfea9d5d9570bf 03-Sep-2011 Brian Muramatsu <btmura@google.com> am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS Build

* commit '08b8e0024812ea907cf3938bcd07b8dca6188eaf':
Use package.apk.unaligned in CTS Build
08b8e0024812ea907cf3938bcd07b8dca6188eaf 03-Sep-2011 Brian Muramatsu <btmura@google.com> am 2306106d: Use package.apk.unaligned in CTS Build

* commit '2306106d3e2cd774ef0b2cd782442f90c402341f':
Use package.apk.unaligned in CTS Build
2306106d3e2cd774ef0b2cd782442f90c402341f 03-Sep-2011 Brian Muramatsu <btmura@google.com> Use package.apk.unaligned in CTS Build

Bug 5252989

This prevents dexopt installation failures when trying to
install CTS apks on production devices.

Change-Id: I1eeb0ac567c3be3b831c8c27dee4005ec00fd7cd
asks/cts.mk
19b22a94132e3ef670d87a045afb64cfd00c13b6 02-Sep-2011 Justin Ho <justinho@google.com> Remove pinyinIME

Change-Id: If83419336294eb56d5b96384a7bc9d9821888b02
ser_tags.mk
bdab41a16f63630672bde02af28d2e567578fb21 01-Sep-2011 Justin Ho <justinho@google.com> Add image size calcuations into the script

Change-Id: Ide13a873982bae21e2b8735a235389a660abd592
akefile
b139b6a1a550daa0df4e670ab3fa550be8204d2f 31-Aug-2011 Justin Ho <justinho@google.com> Calculate system image size at build, for harvesting later

Change-Id: I6bfcde0e5df3f6da453f28354839e356f9191c0e
akefile
041fb639bfb979f4ab18d6dcaf63656639b2eec5 31-Aug-2011 David 'Digit' Turner <digit@google.com> sdk: Fix broken google_sdk and google_sdk_x86 add-on build.

This patch fixes the broken builds for PRODUCT-google_sdk-sdk_addon
and PRODUCT-google_sdk_x86-sdk_addon.

Change-Id: Iba0f23a03c143cd38aaba98b0bd0d52686330ed6
asks/sdk-addon.mk
17a27047bb4d5f255b1c1c55864dae4425e9d6ee 30-Aug-2011 Justin Ho <justinho@google.com> Revert Ic7c40c50: Support to run dex-preopt on prebuilt apks
Collect some additional system image space, moving odex files to user partition on trygon-user

Change-Id: If992536ff0da14cc5b9ba51811b8a0b76f1b8f83
rebuilt.mk
a941d137faa59acc7c80e7d263c97d8676859a12 30-Aug-2011 Stephen Hines <srhines@google.com> Provide LOCAL_RENDERSCRIPT_TARGET_API override.

BUG=5206223

This allows us to set the RS API level independent of the other SDK
versions that a developer might choose.

Change-Id: Id8b476abcbbbdaa86e04ba0ea16414cb2fa5bd15
lear_vars.mk
ava.mk
5d8a5ceecb291b6ab6ba64f9e604db419fb81c8c 30-Aug-2011 Eino-Ville Talvala <etalvala@google.com> Merge "Add filterfw.jar to standard list of java libraries to include."
45bee774eb8c34df3b0e48557d17e28d78aada2a 29-Aug-2011 Ying Wang <wangying@android.com> am a1b603a5: am 4b398749: am c5033a33: Merge "x86: remove obsolete comments"

* commit 'a1b603a556e338d4899a62ea37810aff81ab7fa1':
x86: remove obsolete comments
9a1dd17028d0259c799c7c81aa54c042324a29c7 29-Aug-2011 David 'Digit' Turner <digit@android.com> am 3db43165: am 80d41e4b: am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"

* commit '3db43165b09defcbeebdbeddff158b4e1f85d5c4':
sdk: add DLL_EXTENSION as an atree variable
76a7d82fac1e94617a97393a60f1a2877d841105 22-Aug-2011 Eino-Ville Talvala <etalvala@google.com> Add filterfw.jar to standard list of java libraries to include.

Since classes from this jar are part of the public API, it should be
included by default.

Also add the jar into the dex_preopt list.

Bug: 5098987
Change-Id: Ib39deffea43714eb56630ad1d65411cfde5878fd
ex_preopt.mk
ava.mk
a1b603a556e338d4899a62ea37810aff81ab7fa1 26-Aug-2011 Ying Wang <wangying@android.com> am 4b398749: am c5033a33: Merge "x86: remove obsolete comments"

* commit '4b3987498eb15dc654fe572aadf53396aac36479':
x86: remove obsolete comments
4b3987498eb15dc654fe572aadf53396aac36479 26-Aug-2011 Ying Wang <wangying@android.com> am c5033a33: Merge "x86: remove obsolete comments"

* commit 'c5033a3357b824a8285da67357a0d289750f4a72':
x86: remove obsolete comments
c5033a3357b824a8285da67357a0d289750f4a72 26-Aug-2011 Ying Wang <wangying@android.com> Merge "x86: remove obsolete comments"
9d99d7dfb88f63d0cebef00ca426a834aad44048 26-Aug-2011 David 'Digit' Turner <digit@google.com> resolved conflicts for merge of 6da54b6e to master

Change-Id: Ic1e08fffacb66e8006877b7b5c51e9e7f03d39a2
3db43165b09defcbeebdbeddff158b4e1f85d5c4 25-Aug-2011 David 'Digit' Turner <digit@android.com> am 80d41e4b: am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"

* commit '80d41e4b7555aed399c7bd23647947d7eade3fe6':
sdk: add DLL_EXTENSION as an atree variable
6da54b6e0e0b9daba92562fbf4434887dc1e3528 25-Aug-2011 David 'Digit' Turner <digit@google.com> resolved conflicts for merge of 7be88d00 to honeycomb-plus-aosp

Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
80d41e4b7555aed399c7bd23647947d7eade3fe6 25-Aug-2011 David 'Digit' Turner <digit@android.com> am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"

* commit 'a2cc9b227ae01803dfc4bc1987071fd6eee08bb6':
sdk: add DLL_EXTENSION as an atree variable
7be88d00bb26d163b1432ea9a04e07998c26133c 25-Aug-2011 David 'Digit' Turner <digit@android.com> am 77c6261f: Merge "emulator: Enable GLES emulation libraries"

* commit '77c6261fb074d87b75d669dd9fb9ab5a12a52cc9':
emulator: Enable GLES emulation libraries
d7d096df71c65cbcd35def83bdb4f7cc86c3f290 08-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Tighten the toolchain version check

Bug: 3076137
Change-Id: Ibd9f1f13916e31596f94a5b0a90293995da7f2cf
ain.mk
557c51f2ea85993da1f6f8fd3322ee36d8110b64 25-Aug-2011 David 'Digit' Turner <digit@android.com> sdk: add DLL_EXTENSION as an atree variable

This patch defines the DLL_EXTENSION variable to the host
shared library suffix (i.e. either ".so", ".dll" or ".dylib")
when packaging the SDK.

This is required by another patch to sdk/build/tools.atree that
will use ${DLL_EXTENSION} to copy the GLES emulation host libraries
to $SDK/tools/lib

Change-Id: I120d39e905afb453b0702d5f0eb2707f214385cc
akefile
6e41a7483aea711cb81c2223724c421468872803 24-Aug-2011 Ying Wang <wangying@google.com> Merge "Provide mechanism to override llvm-rs-cc headers."
d4136c0fc67d4330194ea4e612117e84be110d8b 24-Aug-2011 Stephen Hines <srhines@google.com> Provide mechanism to override llvm-rs-cc headers.

Change-Id: I87fd496069a9dfde633e2d232e436fa5d7315cc0
lear_vars.mk
ava.mk
ca94f3583f33bb8dc5243dcbb50738fff9f945d1 23-Aug-2011 jeffhao <jeffhao@google.com> Removing target-api option from build.

This is cherry-picked from dalvik-dev.

Change-Id: I85cd23c08fcad400e6426cdaad079e91dcd9babf
ava.mk
43dd89d2a0c166525db0af4162b9b08aaa186aed 23-Aug-2011 David 'Digit' Turner <digit@android.com> emulator: Enable GLES emulation libraries

This patch enables the build of OpenGLES emulation libraries
(both in the guest and the host) for any emulator-specific
product config.

+ update core/main.mk to ensure that the right path is parsed
when building the Windows SDK

Change-Id: Ifde047f8c0ef922504a7286c8c5b57f7c79c71f8
ain.mk
88833405c4bc45d8b25f8586aa33a713b5870db0 17-Aug-2011 Raphael Moll <ralf@android.com> am cfdfad3f: am 807c7980: am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths."

* commit 'cfdfad3fcadc8bba30f00dbe2f2e835d61cde9ef':
Add sdk/rule_api to the Windows build paths.
cfdfad3fcadc8bba30f00dbe2f2e835d61cde9ef 17-Aug-2011 Raphael Moll <ralf@android.com> am 807c7980: am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths."

* commit '807c79802d5e8b1613bf36bb780cf3250f443aa2':
Add sdk/rule_api to the Windows build paths.
807c79802d5e8b1613bf36bb780cf3250f443aa2 17-Aug-2011 Raphael Moll <ralf@android.com> am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths."

* commit '7d9fe5174787a5638993a15b165bc9115c16da0f':
Add sdk/rule_api to the Windows build paths.
15e199c8574a14788e90f3df538360f3d40448b8 17-Aug-2011 Wink Saville <wink@google.com> DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2.

Change-Id: Ib30bf10669119b588c691e4cebdc8093f402e3e4
ersion_defaults.mk
408c7f8a8f61deda637b884cca91e670f7d23c0a 17-Aug-2011 Raphael Moll <ralf@android.com> Add sdk/rule_api to the Windows build paths.

Change-Id: I4976b50d829e4b26b4f9935a1a184937dd115198
ain.mk
d1975a2946c899513e0e041627be104fb536cf65 17-Aug-2011 Brian Swetland <swetland@google.com> fix tiny android builds (add mksh)

Change-Id: I0cf5068b6e9b350259009c5ecf7f2946d05f7b2d
ain.mk
c963eae72ca502ac847fa03e87644c660b868295 10-Aug-2011 Stephen Hines <srhines@google.com> Update build to properly use prebuilt llvm-rs-cc.

Change-Id: I52a83066b6c08d05d69db4f93631eeaf9c0b41c6
efinitions.mk
ava.mk
6ab5d6aa166f14c79f31240d2902b5b539253af3 11-Aug-2011 Ying Wang <wangying@google.com> Discard hidden files when rounding up resource.

Aapt will discard the hidden files anyway.
With this change, we can avoid unnecessary rebuild if a module has only
hidden files in its resource dir.

Change-Id: Iaf0a13e038cca5fb60012c550cc90f7abbe967e1
efinitions.mk
aa1c321a58e3dcce72c144d7404ce7cef413586e 02-Aug-2011 Chih-Wei Huang <cwhuang@linux.org.tw> x86: remove obsolete comments

Change-Id: Ifb12892c17a50f85c7700d6413ea295a4dad7047
ombo/TARGET_linux-x86.mk
6d0f51b44ba2a427cc15bcdc317020a6477d2078 03-Aug-2011 Dan Morrill <morrildl@google.com> Updating version to 2.3.7 to reflect some patches.

Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
ersion_defaults.mk
b3eae868dd9648115044ec304ed6a9bcd2405962 03-Aug-2011 Dan Morrill <morrildl@google.com> Bumping version to 2.3.6 to reflect a few patches.

Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
ersion_defaults.mk
b194b9d185bfb521ba7ad0a8773906e7facb3fcb 29-Jul-2011 Raphael Moll <ralf@android.com> am dd9e8477: am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."

* commit 'dd9e8477e6cc1a8de556dd7942fb81c049e2e373':
Add sdk/assetstudio to the Windows build paths.
603755d6cebc50d2f9debeec284f6614e085170d 29-Jul-2011 Ying Wang <wangying@google.com> resolved conflicts for merge of 9b5447df to master

Change-Id: I1fe490a9e0bf01321c845ab0150fead06c16d68b
dd9e8477e6cc1a8de556dd7942fb81c049e2e373 29-Jul-2011 Raphael Moll <ralf@android.com> am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."

* commit '266a571fbd557c402e937130922ced8c523dd451':
Add sdk/assetstudio to the Windows build paths.
9b5447df850ea7452b49ea6622d84692c39b133c 29-Jul-2011 Ying Wang <wangying@google.com> am 24cad7d4: Add iptables and ip6tables to core.mk.

* commit '24cad7d4f7962d3413d520791cb2b8a5a5266f58':
Add iptables and ip6tables to core.mk.
266a571fbd557c402e937130922ced8c523dd451 29-Jul-2011 Raphael Moll <ralf@android.com> am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."

* commit 'dceb46559eb8077553d1bd4d738fb4b325af9396':
Add sdk/assetstudio to the Windows build paths.
24cad7d4f7962d3413d520791cb2b8a5a5266f58 29-Jul-2011 Ying Wang <wangying@google.com> Add iptables and ip6tables to core.mk.

Change-Id: I1cb2be8a28013b20d1032a8d766021a2f4aca9e1
ser_tags.mk
667ec86a33b8eff749b429fb0926a0c0b1ad1646 29-Jul-2011 Raphael Moll <ralf@android.com> Add sdk/assetstudio to the Windows build paths.

Change-Id: Ide8d418aa25cf39852a25e08fd2a27c7882586e7
ain.mk
6e7db38de7cfc905413e27cc8967909727db3022 27-Jul-2011 Ying Wang <wangying@google.com> Use shell variable to eliminate $(eval) in commands.

$(eval) in the commands does not evaulate in the same order in emake as
in gmake. Using shell vars work in both makes.

Change-Id: I4e95adb2bc6f4600e29b9a8524275a099f47a401
efinitions.mk
b934e49c3a1e890b2dcc716ebce3a136a7d10b8f 21-Jul-2011 Ying Wang <wangying@google.com> Put the NDK library paths ahead of TARGET_GLOBAL_LD_DIRS

To avoid race condition:
Say a module with LOCAL_NDK_VERSION built in the full source tree,
Before this change it may be linked against TARGET_GLOBAL_LD_DIRS/libc.so
that's being partially written out by the linker, because there is no dependency
between the module and TARGET_GLOBAL_LD_DIRS/libc.so.

Change-Id: If6e4921d226fee133b53e4d819a07b48f4fca016
hared_library.mk
be3689e9817e7c8c64cf8a374c2905adefb008c4 15-Jul-2011 Doug Kwan <dougkwan@google.com> Conditionally disable -Wno-unused-but-set-variable for gcc-4.6.
We used to do that unconditionally but that caused lots of spurious
warnings in gcc-4.4.x about an unrecognized gcc option.

Change-Id: Idb5118b069871859e07a7efa04914ab6ed0b1372
ombo/TARGET_linux-arm.mk
onfig.mk
64000a2a003f6c50d0c24f6264779c1b4f0ce101 14-Jul-2011 Tsu Chiang Chuang <tsu@google.com> Merge "fix mixing argument in makefile."
44802a22e3d2951cee01b0dcf0a93aa23e46638b 14-Jul-2011 Tsu Chiang Chuang <tsu@google.com> fix mixing argument in makefile.

Change-Id: I659d996dda0a2047ebb3240607e66411fc60fda6
asks/cts.mk
a7d9ca371e552c3aec62cab9de958c55d0dd2ea3 13-Jul-2011 Ying Wang <wangying@google.com> Use the LOCAL_* as dependency.

PRIVATE_* should be used only in the build commands.

Change-Id: Ie1d8db7c78012a8615b893d3ef3be893da7466f4
ase_rules.mk
inary.mk
e33ba4c49ed461d608c65eb4e09d31ca81d167ff 12-Jul-2011 Jeff Brown <jeffbrown@google.com> Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
akefile
inary.mk
uild-system.html
ombo/HOST_linux-x86.mk
ombo/TARGET_linux-x86.mk
onfig.mk
umpvar.mk
nvsetup.mk
roduct_config.mk
ser_tags.mk
d19750e87f454507a9cee01989416ffbd14ea3f5 11-Jul-2011 David 'Digit' Turner <digit@google.com> am 36331f84: resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp

* commit '36331f8455822539fe4fbb0a25fbc377bbc80a89': (23 commits)
sdk-addon.mk: Copy image files to ABI-specific dir
emulator: Enable dex-preoptimization
sdk: provide ABI-dependent atree files
emulator: Build emulator platform images as ARMv7-A
x86: Add proper gcc-4.4.3 x86 toolchain support.
sdk: Add pc-bios files for IA qemu emulator
x86: qemu emulator is the default build target
Add full_x86 product.
x86: sdk_x86 build target
Minor cleanup - DO NOT MERGE
Clean up full config - DO NOT MERGE
Make a full list of locales available
Truly default to the full config.
generic_x86 builds don't need/use the sparse ext4 format.
Use ext4 file system for generic_x86 userdata partition
GB Updates for init.rc and boot command line
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
Display the TARGET_ARCH_VARIANT
Add generic_x86-eng to the lunch menu
Move buildspec vars to BoardConfig.mk
...
36331f8455822539fe4fbb0a25fbc377bbc80a89 11-Jul-2011 David 'Digit' Turner <digit@google.com> resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp

Change-Id: If2b21def45b5de222e560af442a0ff9f56da5a35
a6467cc8740570be7e1596835409a80b92c7ef96 09-Jul-2011 Doug Kwan <dougkwan@google.com> Disable gcc-4.6's Wunused-but-set-variables warning.

Change-Id: Ia02fa536410b9200beca1d9d120ec448c82e5ca8
onfig.mk
eb0a62cb26d7bed289df823e2d68e422c39b5659 08-Jul-2011 Jaikumar Ganesh <jaikumarg@android.com> am b399f5e8: Merge "Rename health shared library."

* commit 'b399f5e81e2a644776f163e499df5bd0a38fe272':
Rename health shared library.
19efd6f11f262d58d7af8761b7d3bd3ea3f99c30 08-Jul-2011 Jaikumar Ganesh <jaikumarg@android.com> Rename health shared library.

Change-Id: Ibd95333433bc2fb12322a9683bb3e0c0176dbce9
relink-linux-arm.map
9fb131a9b6aa23223e79af4f1bb8b9823727b4f5 08-Jul-2011 David 'Digit' Turner <digit@google.com> sdk-addon.mk: Copy image files to ABI-specific dir

Change-Id: I39ad022a5bb03ea39fc41c134d1d4855dc491deb
asks/sdk-addon.mk
3248bb2e076cb26a71c6a08e9788b2853e1f5f97 23-Jun-2011 David 'Digit' Turner <digit@android.com> sdk: provide ABI-dependent atree files

Backport from AOSP master

This patch allows development/sdk/ to provide ABI-specific .atree
files. This is useful to copy prebuilt CPU model-specific files
to the SDK platform image directory.

This is needed to deal with the fact that for ARMv7 platform builds,
the kernel image to use is prebuilt/android-arm/kernel-qemu-armv7 instead
of prebuilt/android-arm/kernel/qemu

Change-Id: Ib76caa54a059eca2dafc9cdba812b29f98b5e3c3
Orig-Change-Id: Icdca751852c01421fccf196436a9bc1114ea90f7
akefile
4227d02e6fa7399c8efd7c8d737b7a53d8076a28 07-Jul-2011 Ying Wang <wangying@google.com> Merge "Enable LOCAL_STRIP_MODULE for prebuilt binaries"
0219e9292e242b61058475c914930a4880c1acf2 06-Jul-2011 Ji-Hwan Lee <jihwan@google.com> Enable LOCAL_STRIP_MODULE for prebuilt binaries

Currently, prebuilt binaries with debug symbols are installed unstripped.

There are only a few of prebuilt shared library (that I'm trying to fix),
so I can do this manually by making intermediate target and applying
TARGET_STRIP, each of them, one by one.

But dynamic_binary.mk has more features than stripping binaries
(like copying unstripped binaries to symbols directory)
and if I do it manually, they will lose all the benefits.

Note that this doesn't change anything when LOCAL_STRIP_MODULE is not set.
I actually tried to force strip every BUILD_PREBUILT'ed modules,
but there were a few problems:

- Some packages are not installed (i.e. not in PRODUCT_PACAKGES)
but are built (i.e. in ALL_MODULES). And some of them are built in spite
that they do not have appropriate prebuilt shared library for TARGET_ARCH.
Stripping them causes "unknown format".

- Some prebuilt modules set LOCAL_MODULE_CLASS incorrectly.
Example is default.supp of external/valgrind/main, which should be ETC,
not SHARED_LIBRARY.

Both are better fixed, but I concluded that it's better to be conservative.

Bug: 4585734
Change-Id: If71723b1d76007d45b02429ea5161a8265dd5b6d
rebuilt.mk
63152fd929265b73195492e64b29352e1d068287 08-Jul-2010 Bruce Beare <brucex.j.beare@intel.com> x86: Add proper gcc-4.4.3 x86 toolchain support.

This patch combines 7 AOSP patches to add proper support
to build x86 platform images using the 4.4.3 toolchain.

The Orig-Changed-Id fields below correspond to the change ids
of the original changes in the AOSP master branch history.

Define __ANDROID__ for x86 to be on par with ARM build requirements
Orig-Change-Id: I79c8f29af1f20b694f22a39f848216022809a5c6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>

Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
Orig-Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e

IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
Change-Id: I9ba661d68a3b375c21eb6b56442d8ba66a5369b3
Orig-Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

x86: Use GCC 4.4.3
Orig-Change-Id: I083c1afcbb98cfeb48d7bcb7681e5c34db52e767
Author: H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

x86: the -mbionic flag is needed for IA builds.
Orig-Change-Id: I00c75f37d7ea46b9f8ad3d7b2ff7094477ff0916
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

x86: Disable stack-protector until bionic is fixed
Orig-Change-Id: I2862de5c1b02490197704f4578a8a91d0565eef0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>

Clean up of X86 build flags
Orig-Change-Id: Ife75c32cd49b32345712dee28fa5f2283069a90e
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
Author: Bruce Beare <bruce.j.beare@intel.com>

x86: Enable -fstack-protector
Orig-Change-Id: I1fe10159b7a29452ecfc6ba328164948cf9950d6
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ombo/TARGET_linux-x86.mk
f844ec96dd36f6fe3a1aa52c751bc0fbf1562222 31-May-2011 Bruce Beare <bruce.j.beare@intel.com> x86: qemu emulator is the default build target

Change-Id: I200536d2d997eda6a6e62eaa9050269e3c7ff6c4
Orig-Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
akefile
8a545e04ee862f88284ea122c3ddc402419cb689 22-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Truly default to the full config.

It is much better than generic for emulator-based work.

Orig-Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
nvsetup.mk
ecabf85f325b6b38a59f32eacfd71b5cc3f9061c 31-May-2011 Bruce Beare <bruce.j.beare@intel.com> Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures

Orig-Change-Id: I5c1010d9caaa8d9ffaf65999fa3649c3c2be8caa
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
onfig.mk
nvsetup.mk
f7e4141f0eefd5f534bb7720347b4db9cba84afb 14-Oct-2010 Bruce Beare <bruce.j.beare@intel.com> Display the TARGET_ARCH_VARIANT

Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
umpvar.mk
f7661706b03e4258d1b48c6ad71ce4a5e287ee2a 31-May-2011 Bruce Beare <bruce.j.beare@intel.com> Allow TARGET_ARCH to be set from BoardConfig.mk

Orig-Change-Id: I66aed78b763d238719822257c1f4f35301247df6
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
onfig.mk
umpvar.mk
nvsetup.mk
c101e27d547ee218337b2600e8158dedd0a064af 31-May-2011 Bruce Beare <bruce.j.beare@intel.com> Refactor Stripper. Allow a stripper other than SOSLIM to be specified

Orig-Change-Id: I61137f5bb123dc5f610af9928ed3debdf85ba74d
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ombo/HOST_darwin-x86.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
ombo/select.mk
onfig.mk
efinitions.mk
ynamic_binary.mk
c0a177c8ec7bea42926996bb9744ecc60eed8404 06-Jul-2011 Ying Wang <wangying@google.com> Remove vpn from FRAMEWORKS_BASE_SUBDIRS

To eliminate build warning.
Reference commit: 44e27b5c74b5f441973561a4f945cb58e0cc45a4
which removed framework/base/vpn.

Change-Id: I539e4bc2a4008c8b9eed74dd53eec1f55db3abe5
athmap.mk
40b5a67ecd70eee8583b6b12775d18255868d89f 01-Jul-2011 Mike Lockwood <lockwood@android.com> Remove obsolete persist.service.adb.enable property from default.prop

Change-Id: I59a2da01eddfc1fa775e027a86f7f818a146a6b0
Signed-off-by: Mike Lockwood <lockwood@android.com>
ain.mk
8f77c9ded3b64764ebe6f2cb1be45a2de0b7bec9 21-Jun-2011 Evgeniy Stepanov <eugenis@google.com> Add .gnu_debuglink when stripping DSOs.

This is used by debug tools to find symbols for the stripped binary.
Adds ~70 bytes to each DSO, ~25000 bytes total, which is about 0.01% of the
system image.

This change only affects -eng and -userdebug builds, and does not affect -user.

Change-Id: I0c92a9e09fbc97184dea66813923568cbcc2a3fe
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
690b9b316fd22e4e760c8c786e4c9d72a03f0fe4 27-Jun-2011 David 'Digit' Turner <digit@android.com> am 11e1d5fb: am 6236d356: am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"

* commit '11e1d5fb3a33de9c5aad7c21294b8019a0f042b8':
sdk: provide ABI-dependent atree files
4839e47309ccefc41d4e7055f701104995472723 23-Jun-2011 Raphael <raphael@google.com> am 2ec35cc8: am 4aed6434: am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.

* commit '2ec35cc88f10bcd11d3a193d58a1ab245caebce5':
SDK: properly strip all SDK llvm-rs-cc linux binaries.
0ef25320d5c5dd749769e9d0c4c803d8fc4b4e42 23-Jun-2011 David 'Digit' Turner <digit@android.com> am a85ebfb0: am fa112f98: am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"

* commit 'a85ebfb059080865a549539a9d2758c4e8b8aeed':
Turn-off implicit GNU Make RC/SCCS rules
ecb957705cc62e9f9079ee86e86796fc82d0a7e3 23-Jun-2011 Raphael <raphael@google.com> resolved conflicts for merge of 732936d9 to master

Change-Id: I1fc667057aebbbef19bde746ebcc650ac0e8c35c
11e1d5fb3a33de9c5aad7c21294b8019a0f042b8 23-Jun-2011 David 'Digit' Turner <digit@android.com> am 6236d356: am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"

* commit '6236d356a01150bc517bd639398df704735cc0fc':
sdk: provide ABI-dependent atree files
6236d356a01150bc517bd639398df704735cc0fc 23-Jun-2011 David 'Digit' Turner <digit@android.com> am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"

* commit 'b92c7a2c1293d2921739a4d7210b4a0d1c99156b':
sdk: provide ABI-dependent atree files
cac8e55714424d385da5b40e5952dc539e510454 23-Jun-2011 David 'Digit' Turner <digit@android.com> Merge "sdk: provide ABI-dependent atree files"
77ec16ae9e00a929b1925aeca9635dee5dbff0a0 23-Jun-2011 David 'Digit' Turner <digit@android.com> sdk: provide ABI-dependent atree files

This patch allows development/sdk/ to provide ABI-specific .atree
files. This is useful to copy prebuilt CPU model-specific files
to the SDK platform image directory.

This is needed to deal with the fact that for ARMv7 platform builds,
the kernel image to use is prebuilt/android-arm/kernel-qemu-armv7 instead
of prebuilt/android-arm/kernel/qemu

Change-Id: Icdca751852c01421fccf196436a9bc1114ea90f7
akefile
2ec35cc88f10bcd11d3a193d58a1ab245caebce5 23-Jun-2011 Raphael <raphael@google.com> am 4aed6434: am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.

* commit '4aed64341c6cff484c9b78fed3d13131049858c9':
SDK: properly strip all SDK llvm-rs-cc linux binaries.
4aed64341c6cff484c9b78fed3d13131049858c9 23-Jun-2011 Raphael <raphael@google.com> am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.

* commit '0b6ece9dafcf6f06dd4418829434cdc4376375a3':
SDK: properly strip all SDK llvm-rs-cc linux binaries.
a85ebfb059080865a549539a9d2758c4e8b8aeed 23-Jun-2011 David 'Digit' Turner <digit@android.com> am fa112f98: am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"

* commit 'fa112f982241fc3efa0129094e87a34f2317f41e':
Turn-off implicit GNU Make RC/SCCS rules
0b6ece9dafcf6f06dd4418829434cdc4376375a3 27-May-2011 Raphael <raphael@google.com> SDK: properly strip all SDK llvm-rs-cc linux binaries.

Change-Id: Id3f024e90ef04eff4cc13a2202fcc9e94c5ac72f
akefile
9de99fe2d2e5bbc6aed28449ff2db60edb1c6414 23-Jun-2011 Ying Wang <wangying@google.com> Use the host STL for host native test.

Bug: 4584343
Change-Id: I420b7d955142d57993295cec12e54c94d5a75b88
ost_native_test.mk
fa112f982241fc3efa0129094e87a34f2317f41e 23-Jun-2011 David 'Digit' Turner <digit@android.com> am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"

* commit 'c134712ffa9e6617df46334a6293ddd80e05cf98':
Turn-off implicit GNU Make RC/SCCS rules
04b49109710f74c59fb65b09b2028e5de7901f67 22-Jun-2011 David 'Digit' Turner <digit@android.com> Merge "Turn-off implicit GNU Make RC/SCCS rules"
732936d99a411e99c9a318506c778f8e8b23a17a 22-Jun-2011 Raphael <raphael@google.com> resolved conflicts for merge of 8508a073 to honeycomb-plus-aosp

Change-Id: I376928881adb0e9fd62fabc1e21542bf0d700ca2
52d697d432e0684fb13884c94f7768c5ec8ef8ec 22-Jun-2011 David 'Digit' Turner <digit@android.com> Turn-off implicit GNU Make RC/SCCS rules

This small patch prevents GNU Make from stating RCS and SCCS
specific files on the filesystem. This makes the output of
"make -d" slightly more readable, and also reduces the no-change
time on AOSP master by a bit less than a second on average.

Change-Id: Ifa50ace32e8689717956d7247b0d6f53ef72b7a1
ain.mk
8508a073523f02837c767d6c3d62ca8f623b1f40 22-Jun-2011 Raphael Moll <ralf@android.com> am 6e65ddb2: am cb84196f: Merge "Lunch: don\'t use a toolchain that doesn\'t exist."

* commit '6e65ddb20aa82522b3fdc72c87d365f22e9a43ed':
Lunch: don't use a toolchain that doesn't exist.
c639c787a0932b230be0d991941ce26c0faea81b 21-Jun-2011 Raphael Moll <ralf@android.com> Lunch: don't use a toolchain that doesn't exist.

"lunch sdk-eng" on cygwin tries to use a gcc.exe from the
prebuild arm toolchain, but it doesn't exist. This prevents
from setting variables to point on a gcc toolchain if there
is none for the given arch.

Change-Id: I3b72220663687f9fdaacc050899aef00632f2c3c
ombo/TARGET_linux-arm.mk
umpvar.mk
c383f1b65dd640ecb05ba803ff659ec7e223072b 20-Jun-2011 Ying Wang <wangying@google.com> Merge "Uniq the system properties."
cf5da40e5295f28f84e760dccfb02278c55dfc10 18-Jun-2011 Ying Wang <wangying@google.com> Fix tab.

The tab broke unbundled targets.

Change-Id: Ia97d4bdd69f7bb48eb3c51a01f0ab7085b5949a0
roduct_config.mk
c0de1ea8dfebc69a17dd3eb470102d2923927f95 18-Jun-2011 Ryo Fujii <royfujii@google.com> Merge "fix broken build rules for host VM."
7e8d442ca4f716dd3a67a63ae59779a1e1a6b45f 18-Jun-2011 Ying Wang <wangying@google.com> Uniq the system properties.

If multiple items with the same key appear in a config variable,
only the first item is taken.

Change-Id: Icf57befafb36ec35dd4d48c8c3ec595f353f68e7
akefile
efinitions.mk
99acb9c261a1393c1556015e775b4cc649bb340f 17-Jun-2011 Eric Laurent <elaurent@google.com> created speex resampler library

Change-Id: I4424cb40416d94ccf4637fbbb53f02d595c31e3d
athmap.mk
cc7dccc815cfd6c29e934f038cd0a0b9d8f51a6a 17-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more"

* commit '91ba5de815d7bec3b7e72ddf2c5b063f42b7211b':
Tweak prelink map even more
7751f426fed7e2ec53cea180dbca604a2b10bbc1 17-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Tweak prelink map even more

Change-Id: I83149194f8c4e0193274f9c74d9718cecba82cb0
relink-linux-arm.map
af1b618c0d0ed2c36acebefe8cd1b38eea17c9ef 17-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"

* commit 'c5e5d9897f6fc18123a8f5d15a90152019979a22':
Tweak prelink map
c5e5d9897f6fc18123a8f5d15a90152019979a22 17-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 9d7590b9: Merge "Tweak prelink map"

* commit '9d7590b93ff549cf8a4b432932fa68799166ed79':
Tweak prelink map
cbb3266b4712fe0aa82d80d9d6db0974be9eea3f 17-Jun-2011 Ryo Fujii <royfujii@google.com> fix broken build rules for host VM.
nvsetup.mk
roduct_config.mk
36c1f10dee646935d73106a01b1d50628b9a2dcb 17-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge "Relax the constraint of 64bit build environment."
2914f7f3b3b4152fee6b6ab012e58e8166e3d7a2 25-May-2011 Ying Wang <wangying@android.com> Relax the constraint of 64bit build environment.

Change-Id: Id349f424b122816f42c99769b629a9447986cf20
onfig.mk
ain.mk
82b96df21532bd5e9b09d3c7c37c86fc57409d07 17-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Tweak prelink map

Change-Id: Ic04a67eab8a94a1cbb045dd460e15c2b673392b2
relink-linux-arm.map
5e2e09c569092dcc19f9646060cc1c33266eb213 17-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am ee803184: am f771489d: Merge "Tweak prelink map, more"

* commit 'ee8031843e4dc3e9ff60c1acdc516121145fece1':
Tweak prelink map, more
ee8031843e4dc3e9ff60c1acdc516121145fece1 17-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am f771489d: Merge "Tweak prelink map, more"

* commit 'f771489d95289bf0d98cb92b504fccbe0a1f5fd7':
Tweak prelink map, more
398aaee7d7e1fd6883552c2f605c07d85bfdb58e 17-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Tweak prelink map, more

Change-Id: Ia78df90647029cfec76c7ccb7e71c477a4b6f9e7
relink-linux-arm.map
2ba042f9d86c7715cbca07e0fd417d8cf9496846 17-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 40dc95be: am 14273125: Merge "Tweak prelink map"

* commit '40dc95be7744871b5363ae2e21a14343cd666b0f':
Tweak prelink map
40dc95be7744871b5363ae2e21a14343cd666b0f 17-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 14273125: Merge "Tweak prelink map"

* commit '142731256afc708f4ec07247bffbe733dcaed0f4':
Tweak prelink map
1c594eab70c4ea9ffcc752a952d38861e5dddeec 17-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Tweak prelink map

Change-Id: Id4a3aea8ecc1c04178303c543fa81cecf4cf85f1
relink-linux-arm.map
13c7c0234d4e484cc72138424a61d0f8e85eb712 16-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am eb9fc27d: am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"

* commit 'eb9fc27dbe062248167981d2a4f1aa9e058a2313':
Switch back to mksh as the default
eb9fc27dbe062248167981d2a4f1aa9e058a2313 16-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"

* commit '4c90a648cd0e1310d4b934c54905af3cf40b2770':
Switch back to mksh as the default
4c90a648cd0e1310d4b934c54905af3cf40b2770 16-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 14bf45f3: Merge "Switch back to mksh as the default"

* commit '14bf45f31d99cdaa5cc0c46efa3f2c2724704173':
Switch back to mksh as the default
256b14b2f868223e9adcdd355acffb950b230fb1 16-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Switch back to mksh as the default

Change-Id: I4f39e8d8cc22520cd36f83f8675a716cc1ade1d9
onfig.mk
8edd7f9a35276ca3e2c284e8b637fce3b7156b32 10-Jun-2011 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 3f72af13 to master

Change-Id: I675df80f6e4435e6fb275c8c1527fdc966c0322c
3f72af13706bc6715f692b8e4879dbb50f818881 10-Jun-2011 Dianne Hackborn <hackbod@google.com> Merge cb5b6d16

Change-Id: I95670014aa3e8b83713169e4f414ef058b15f870
cb5b6d1690bdef279738b42d5eaf5e65121c8fd3 10-Jun-2011 Dianne Hackborn <hackbod@google.com> am 0b22d93b: Welcome, Android 3.2.

* commit '0b22d93be32eeff06e6626ad766b040057b931a5':
Welcome, Android 3.2.
0b22d93be32eeff06e6626ad766b040057b931a5 09-Jun-2011 Dianne Hackborn <hackbod@google.com> Welcome, Android 3.2.

Change-Id: Iedf0f75a3338aca09647779f3cbfb4a94f615493
ersion_defaults.mk
0d23fec792d2bc92417d2b2e716be73704efc240 09-Jun-2011 Mike Lockwood <lockwood@android.com> Add support for products overriding properties in /default.prop

We need this to allow products to specify the default USB configuration,
and allow the build system to add adb to this configuration
for eng and userdebug builds.

For example:

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
persist.sys.usb.config=mtp

Change-Id: I83d7d918e57a8117eb96919e17d8ad52afdc0388
Signed-off-by: Mike Lockwood <lockwood@android.com>
akefile
roduct.mk
roduct_config.mk
bb41d06d9645b38a3de587512396b7b4a77fc7f7 09-Jun-2011 Dan Morrill <morrildl@google.com> Update version to 2.3.5.

Change-Id: I310c09c6f2d1c0e0067bf4a44bed5958664c1591
ersion_defaults.mk
569e4fab496588ce5b4913424540c8477afba318 09-Jun-2011 Joe Onorato <joeo@google.com> Merge "post process the system properties"
9197a487b4a30bcbc6ef41471ca5aa03440dca1f 09-Jun-2011 Joe Onorato <joeo@google.com> post process the system properties

Change-Id: Ib78fe238d90dd4523326e4fa088d9333edc9e299
akefile
1cc1b10f0b17fbeca0837578582cba2e98a74f23 08-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am f0d2a546: Merge 78e7f1f0

* commit 'f0d2a54669c8bf14e95482437e361c81dfb62404':
Increase the Java heap size for droiddoc
70776231ee8a972e2c22b08908c10ebaad9a4841 08-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 45a3ad7d: Merge c1efb060

* commit '45a3ad7d225495367a47440da118609b4940fe71':
Relax the constraint of 64bit build environment.
f0d2a54669c8bf14e95482437e361c81dfb62404 07-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge 78e7f1f0

Change-Id: I4d24d154fd3964a4433baf87e4061421fce28986
45a3ad7d225495367a47440da118609b4940fe71 07-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge c1efb060

Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
e3c3c6d4fecf12e725dbf0f5bb9967787149c457 07-Jun-2011 Doug Kwan <dougkwan@google.com> Allow per module RTTI setting. This fixes a bug in previous check-ins.

Change-Id: I5fcac192a7945720fd7667f7497078d310370bc5
inary.mk
lear_vars.mk
3c22287c1b5560570173237acfd4e99d33266eb1 07-Jun-2011 Martijn Coenen <maco@google.com> Revert "x86: Enable -fstack-protector"

This reverts commit e397dcccbb1bb2ed52b4d6febaee8fb900154b3e.
ombo/TARGET_linux-x86.mk
65b710aefd045af1008ac597a18e4b5ddb616252 07-Jun-2011 Ying Wang <wangying@google.com> Merge "Use arg list file to pass arguments to jar."
5d627263c8d685b351d1565d2c2d2a5e4896d63a 06-Jun-2011 David Turner <digit@android.com> am 0a2d335e: am c1705c9a: Merge "x86: Enable -fstack-protector"

* commit '0a2d335e99bae3c257c0e26fe180d00de04bebaa':
x86: Enable -fstack-protector
194a8ec8aee8511d90354c4b97fecfd0df52c837 06-Jun-2011 Ying Wang <wangying@google.com> Use arg list file to pass arguments to jar.

To fix error "/bin/bash: Argument list too long"

Change-Id: Ie336b18f9a7eba38d94a6e32c07a88589ce9f1fd
ase_rules.mk
efinitions.mk
1081a05359cf75d8c7444a33c4c4a3a8d2b53140 06-Jun-2011 Doug Kwan <dougkwan@google.com> Merge "Revert "Clear LOCAL_RTTI_FLAG.""
486ce3495c0e5ae4f077ab03dbda7c008b4f6995 06-Jun-2011 David Turner <digit@android.com> am e4778e6a: am 4272b32a: Merge "Clean up of X86 build flags"

* commit 'e4778e6ab82a40475081482f26759985deeb7f21':
Clean up of X86 build flags
0a2d335e99bae3c257c0e26fe180d00de04bebaa 06-Jun-2011 David Turner <digit@android.com> am c1705c9a: Merge "x86: Enable -fstack-protector"

* commit 'c1705c9ad8da4d6c2d267e27afd6e16aa7b431b6':
x86: Enable -fstack-protector
6f937973ff9738d37e3ef9dce551a1877dca98a6 06-Jun-2011 Doug Kwan <dougkwan@google.com> Revert "Clear LOCAL_RTTI_FLAG."

This reverts commit f524df7ce1a5e276607563272fa1838967a4a239.
lear_vars.mk
e4778e6ab82a40475081482f26759985deeb7f21 06-Jun-2011 David Turner <digit@android.com> am 4272b32a: Merge "Clean up of X86 build flags"

* commit '4272b32a86bd22ce560e41816cece950a7af4e51':
Clean up of X86 build flags
78e7f1f014073fd4a788ecf293fa43f6fe32b894 06-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 536938e0: am 978f86ea: Merge "Increase the Java heap size for droiddoc"

* commit '536938e01195a2ee279a6652e0b88c50d5f4c2a8':
Increase the Java heap size for droiddoc
536938e01195a2ee279a6652e0b88c50d5f4c2a8 06-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 978f86ea: Merge "Increase the Java heap size for droiddoc"

* commit '978f86ea5439ce192e9c343fc2565f1ec4e2e6d2':
Increase the Java heap size for droiddoc
978f86ea5439ce192e9c343fc2565f1ec4e2e6d2 06-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge "Increase the Java heap size for droiddoc"
f524df7ce1a5e276607563272fa1838967a4a239 04-Jun-2011 Doug Kwan <dougkwan@google.com> Clear LOCAL_RTTI_FLAG.

Change-Id: I0f1388e76af1ce0592cd3271a689fbb6c0ea3eba
lear_vars.mk
4387dc3ee112839226bccc9454d6a7e539850320 03-Jun-2011 Ying Wang <wangying@google.com> am 823f6389: am 3487736b: am 7d83ef8f: Support custom RenderScript compiler

* commit '823f63894fb4ad5c1280a5ee7eb004792223a488':
Support custom RenderScript compiler
32945410b9b30338334069c6c5f435baa9aefa5d 02-Jun-2011 Ying Wang <wangying@google.com> am bb567df0: am 4cd9e2d9: am 06e2f72b: Support to run dex-preopt on prebuilt apks.

* commit 'bb567df00abfe33d800339eba089b8cfd91a7785':
Support to run dex-preopt on prebuilt apks.
c33e07396b4de4453c9212aaeb13c0c36b875589 01-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge from gingerbread

Change-Id: If6c009d62eb4b2ed931d3e5082d08ad996aca689
e804fc92ec3c19d136a86703a34d954d42cfeca6 01-Jun-2011 Doug Kwan <dougkwan@google.com> Merge "Allow enabling RTTI in a module."
c1efb06045132bc620e71be120a0ca71d81b35d5 01-Jun-2011 Jean-Baptiste Queru <jbq@google.com> am 3c60c67a: Merge from open-source gingerbread

* commit '3c60c67ad2a157f5bfb731accfc74f5b42c69851':
Relax the constraint of 64bit build environment.
3c60c67ad2a157f5bfb731accfc74f5b42c69851 01-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge from open-source gingerbread

Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b
149dd914b8799d67b8c4a6fb502b44058a3e14b8 01-Jun-2011 Joe Onorato <joeo@google.com> Switch the java encoding from ascii to utf8.

Change-Id: Iee0972df68b44fc8c653812cf165b57350a7ec5d
efinitions.mk
f7ad63ae65f75e5aa0d0a8234feddacdace95df0 31-May-2011 Dan Bornstein <danfuzz@android.com> Clean up how dex preoptimization gets configured.

Change-Id: I505ac438f1b963060b4be36d94bb5fbee6112dc5
ain.mk
roduct_config.mk
823f63894fb4ad5c1280a5ee7eb004792223a488 28-May-2011 Ying Wang <wangying@google.com> am 3487736b: am 7d83ef8f: Support custom RenderScript compiler

* commit '3487736bac5625bef8ff9bc4ef311b29348055d9':
Support custom RenderScript compiler
3487736bac5625bef8ff9bc4ef311b29348055d9 28-May-2011 Ying Wang <wangying@google.com> am 7d83ef8f: Support custom RenderScript compiler

* commit '7d83ef8ff7679239063bb8484f0c1fdcf31abf8b':
Support custom RenderScript compiler
7d83ef8ff7679239063bb8484f0c1fdcf31abf8b 26-May-2011 Ying Wang <wangying@google.com> Support custom RenderScript compiler

Change-Id: I85e38e84565e04f99dd26217f280274883dc322d
lear_vars.mk
efinitions.mk
ava.mk
af85000e7a219a3a2c082e7921a5d7753d33e334 27-May-2011 Brian Carlstrom <bdc@google.com> Breakup android.core.tests.libcore based on top level package name

git cherry-pick --no-commit ec122eb2c11dfb8553d3707208a1ecbe7366f61b

Change-Id: I685ece362674f83f179ace34367fce88a7f541fb
asks/cts.mk
1482d2db83abaa7d9a01831bdaeb99d4a68fd68a 27-May-2011 Ying Wang <wangying@google.com> am e2419c89: Support to run dex-preopt on prebuilt apks.

* commit 'e2419c89cef4eeae1b6cd113ef1c92d397834841':
Support to run dex-preopt on prebuilt apks.
bb567df00abfe33d800339eba089b8cfd91a7785 27-May-2011 Ying Wang <wangying@google.com> am 4cd9e2d9: am 06e2f72b: Support to run dex-preopt on prebuilt apks.

* commit '4cd9e2d99090502ced431b7abbff94bcc2176745':
Support to run dex-preopt on prebuilt apks.
4cd9e2d99090502ced431b7abbff94bcc2176745 27-May-2011 Ying Wang <wangying@google.com> am 06e2f72b: Support to run dex-preopt on prebuilt apks.

* commit '06e2f72bc9e0f3fdbeaa9d4b00ac6fca7e0c4a7c':
Support to run dex-preopt on prebuilt apks.
06e2f72bc9e0f3fdbeaa9d4b00ac6fca7e0c4a7c 27-May-2011 Ying Wang <wangying@google.com> Support to run dex-preopt on prebuilt apks.

Change-Id: Ic7c40c502934d7588166f26bbb6e2f235d1efdea
rebuilt.mk
e2419c89cef4eeae1b6cd113ef1c92d397834841 27-May-2011 Ying Wang <wangying@google.com> Support to run dex-preopt on prebuilt apks.

Change-Id: I11450310144cb8d7f127c427ada4a0589e030843
rebuilt.mk
d90ff5e4c33ae020af1078f3b2c09b3a9fce514b 26-May-2011 Ying Wang <wangying@google.com> Fix possible unnecessary rebuild

This fix the unnecessary rebuild in the following scenario:
A package rename its manifest package name and the old R.java was still
in its intermediate dir. The rule to generate R_file_stamp may always
copy the old R.java with timestamp reserved and the R_file_stamp never
gets updated.

Change-Id: I659cbb00f0e7734d7d71e1ca66065f587c8dee2c
ackage.mk
e397dcccbb1bb2ed52b4d6febaee8fb900154b3e 04-May-2011 Bruce Beare <bruce.j.beare@intel.com> x86: Enable -fstack-protector

Change-Id: I1fe10159b7a29452ecfc6ba328164948cf9950d6
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ombo/TARGET_linux-x86.mk
4272b32a86bd22ce560e41816cece950a7af4e51 25-May-2011 David Turner <digit@android.com> Merge "Clean up of X86 build flags"
bd08b7e415deddcc32a44e1e52b75a9d298706f1 25-May-2011 Ying Wang <wangying@google.com> Merge "Fix use of intermediates in droiddoc"
053dccb159e2f73aa763bfdc4578586fba57f841 25-May-2011 Ying Wang <wangying@android.com> Relax the constraint of 64bit build environment.

Change-Id: Id8be221dcfa07651a4d9a2776b00e907b4ff750e
onfig.mk
ain.mk
cdef404572a71ea320f59643c52143764bd590fe 19-May-2011 Jean-Baptiste Queru <jbq@google.com> Merge 5d66a07d - do not merge

Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
5812d7b4694d36b728ff142588861f82abffa49c 26-Apr-2011 Mark D Horn <mark.d.horn@intel.com> Clean up of X86 build flags

Review and clean-up of both compiler and linker flags
to ensure proper usage and consistency for images, toolchain,
SDK, and NDK.

Change-Id: Ife75c32cd49b32345712dee28fa5f2283069a90e
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
Author: Bruce Beare <bruce.j.beare@intel.com>
ombo/TARGET_linux-x86.mk
772a0f6794d1650b0c6f8a5e1d523757c3a9450c 18-May-2011 Jean-Baptiste Queru <jbq@google.com> Switch to mksh as the default shell.

Switch the emulator builds to ash to make sure it still
works, in case we find that we need to go back to using ash.

Change-Id: Id5641940b63cc4225011be1c375f4c86ec4d21cc
onfig.mk
fb790877a0dc0c1c10e368e00af28114d2f2a967 17-May-2011 Ying Wang <wangying@google.com> Fix use of intermediates in droiddoc

Droiddoc should be product-independent.

Change-Id: I23ac746330ce7cd0ad47d49c01dcfa824228d60c
roiddoc.mk
77440f3c37a3eb8e430b11caf51943a34ad767f0 15-May-2011 Tsu Chiang Chuang <tsu@google.com> adding TF dependency to vm-tf, since now we are using cts-tf things.

Change-Id: Ia7538dc204faa93f47cd3fd104ed05c9da3e8741
asks/cts.mk
477e963276a1fb3759cbf40fc4ea1039b0d22057 11-May-2011 Dianne Hackborn <hackbod@google.com> am ea4d9f55: am 22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.

* commit 'ea4d9f557b20e7a4ef77e6ac0c573cf3a9a5fd3a':
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
ea4d9f557b20e7a4ef77e6ac0c573cf3a9a5fd3a 11-May-2011 Dianne Hackborn <hackbod@google.com> am 22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.

* commit '22b5d62172f1563a2513dea314c037703cddf217':
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
9a8ecf970bf53f7f43a8722212ff4b217a6bb403 11-May-2011 Doug Kwan <dougkwan@google.com> Allow enabling RTTI in a module.

Change-Id: Ie8ce920e3ccb7e53bdf917d8ac5a386df3e7836a
inary.mk
efinitions.mk
174c15d067a54ad056d4cc368f790b89fc71dfe9 10-May-2011 Jean-Baptiste Queru <jbq@google.com> Use actual numbers in version numbers.

This string is used in the browser user agent, and some
sites get confused when this isn't a dotted-number version
number into thinking that they should serve stripped down HTML.
This clears the confusion.

Change-Id: I6c959ff17c540a1f3808f19238b9eb93ba170d2e
ersion_defaults.mk
22b5d62172f1563a2513dea314c037703cddf217 10-May-2011 Dianne Hackborn <hackbod@google.com> DO NOT MERGE. We are now dev branch for Honeycomb MR2.

Change-Id: Icde20a70a35fc28e168eba4809c1c011ac5265b4
ersion_defaults.mk
76ace42ca222bf1fa13da48a6fb83a6bb5f8efc4 30-Apr-2011 Brian Carlstrom <bdc@google.com> Merge "Avoid loading all CA certs into Zygote memory, lazily load instead (1 of 3)"
27f52e54e60c022783494597d7bdfde7d7d1d770 29-Apr-2011 Tsu Chiang Chuang <tsu@google.com> Merge "adding a new package to run vm tests in cts-tf"
84d1ee8ab3f2e913a6bf0530fd31c260f3fd4234 26-Apr-2011 Brian Carlstrom <bdc@google.com> Avoid loading all CA certs into Zygote memory, lazily load instead (1 of 3)

Previously the CA certs stored in the BKS KeyStore at
/system/etc/security/cacerts.bks was loaded in the Zygote. As the the
number of CAs are started to increase, this is causing more and more
memory to be used for rarely used CAs. The new AndroidCAStore KeyStore
implementation reads the CAs as needed out of individual PEM
certificate files. The files can be efficiently found because they are
named based on a hash CA's subject name, similar to OpenSSL.

Bug: 1109242

Details:

build

Removing old cacerts.bks from GRANDFATHERED_ALL_PREBUILT and
adding new cacerts directory to core PRODUCT_PACKAGES

core/legacy_prebuilts.mk
target/product/core.mk

libcore

cacerts build changes. Move cacerts prebuilt logic to new
CaCerts.mk from NativeCode.mk where it didn't make sense. Updated
Android.mk's dalvik-host target to install new cacerts files.

Android.mk
CaCerts.mk
NativeCode.mk

Remove old cacerts.bks and add remove certimport.sh script used to
generate it.

luni/src/main/files/cacerts.bks
luni/src/main/files/certimport.sh

Recanonicalize cacerts files using updated vendor/google/tools/cacerts/certimport.py
(See below discussion of certimport.py changes for details)

luni/src/main/files/cacerts/00673b5b.0
luni/src/main/files/cacerts/03e16f6c.0
luni/src/main/files/cacerts/08aef7bb.0
luni/src/main/files/cacerts/0d188d89.0
luni/src/main/files/cacerts/10531352.0
luni/src/main/files/cacerts/111e6273.0
luni/src/main/files/cacerts/1155c94b.0
luni/src/main/files/cacerts/119afc2e.0
luni/src/main/files/cacerts/11a09b38.0
luni/src/main/files/cacerts/12d55845.0
luni/src/main/files/cacerts/17b51fe6.0
luni/src/main/files/cacerts/1920cacb.0
luni/src/main/files/cacerts/1dac3003.0
luni/src/main/files/cacerts/1dbdda5b.0
luni/src/main/files/cacerts/1dcd6f4c.0
luni/src/main/files/cacerts/1df5ec47.0
luni/src/main/files/cacerts/1e8e7201.0
luni/src/main/files/cacerts/1eb37bdf.0
luni/src/main/files/cacerts/219d9499.0
luni/src/main/files/cacerts/23f4c490.0
luni/src/main/files/cacerts/27af790d.0
luni/src/main/files/cacerts/2afc57aa.0
luni/src/main/files/cacerts/2e8714cb.0
luni/src/main/files/cacerts/2fa87019.0
luni/src/main/files/cacerts/2fb1850a.0
luni/src/main/files/cacerts/33815e15.0
luni/src/main/files/cacerts/343eb6cb.0
luni/src/main/files/cacerts/399e7759.0
luni/src/main/files/cacerts/3a3b02ce.0
luni/src/main/files/cacerts/3ad48a91.0
luni/src/main/files/cacerts/3c58f906.0
luni/src/main/files/cacerts/3c860d51.0
luni/src/main/files/cacerts/3d441de8.0
luni/src/main/files/cacerts/3e7271e8.0
luni/src/main/files/cacerts/418595b9.0
luni/src/main/files/cacerts/455f1b52.0
luni/src/main/files/cacerts/46b2fd3b.0
luni/src/main/files/cacerts/48478734.0
luni/src/main/files/cacerts/4d654d1d.0
luni/src/main/files/cacerts/4e18c148.0
luni/src/main/files/cacerts/4fbd6bfa.0
luni/src/main/files/cacerts/5021a0a2.0
luni/src/main/files/cacerts/5046c355.0
luni/src/main/files/cacerts/524d9b43.0
luni/src/main/files/cacerts/56b8a0b6.0
luni/src/main/files/cacerts/57692373.0
luni/src/main/files/cacerts/58a44af1.0
luni/src/main/files/cacerts/594f1775.0
luni/src/main/files/cacerts/5a3f0ff8.0
luni/src/main/files/cacerts/5a5372fc.0
luni/src/main/files/cacerts/5cf9d536.0
luni/src/main/files/cacerts/5e4e69e7.0
luni/src/main/files/cacerts/60afe812.0
luni/src/main/files/cacerts/635ccfd5.0
luni/src/main/files/cacerts/67495436.0
luni/src/main/files/cacerts/69105f4f.0
luni/src/main/files/cacerts/6adf0799.0
luni/src/main/files/cacerts/6e8bf996.0
luni/src/main/files/cacerts/6fcc125d.0
luni/src/main/files/cacerts/72f369af.0
luni/src/main/files/cacerts/72fa7371.0
luni/src/main/files/cacerts/74c26bd0.0
luni/src/main/files/cacerts/75680d2e.0
luni/src/main/files/cacerts/7651b327.0
luni/src/main/files/cacerts/76579174.0
luni/src/main/files/cacerts/7999be0d.0
luni/src/main/files/cacerts/7a481e66.0
luni/src/main/files/cacerts/7a819ef2.0
luni/src/main/files/cacerts/7d3cd826.0
luni/src/main/files/cacerts/7d453d8f.0
luni/src/main/files/cacerts/81b9768f.0
luni/src/main/files/cacerts/8470719d.0
luni/src/main/files/cacerts/84cba82f.0
luni/src/main/files/cacerts/85cde254.0
luni/src/main/files/cacerts/86212b19.0
luni/src/main/files/cacerts/87753b0d.0
luni/src/main/files/cacerts/882de061.0
luni/src/main/files/cacerts/895cad1a.0
luni/src/main/files/cacerts/89c02a45.0
luni/src/main/files/cacerts/8f7b96c4.0
luni/src/main/files/cacerts/9339512a.0
luni/src/main/files/cacerts/9685a493.0
luni/src/main/files/cacerts/9772ca32.0
luni/src/main/files/cacerts/9d6523ce.0
luni/src/main/files/cacerts/9dbefe7b.0
luni/src/main/files/cacerts/9f533518.0
luni/src/main/files/cacerts/a0bc6fbb.0
luni/src/main/files/cacerts/a15b3b6b.0
luni/src/main/files/cacerts/a3896b44.0
luni/src/main/files/cacerts/a7605362.0
luni/src/main/files/cacerts/a7d2cf64.0
luni/src/main/files/cacerts/ab5346f4.0
luni/src/main/files/cacerts/add67345.0
luni/src/main/files/cacerts/b0f3e76e.0
luni/src/main/files/cacerts/bc3f2570.0
luni/src/main/files/cacerts/bcdd5959.0
luni/src/main/files/cacerts/bda4cc84.0
luni/src/main/files/cacerts/bdacca6f.0
luni/src/main/files/cacerts/bf64f35b.0
luni/src/main/files/cacerts/c0cafbd2.0
luni/src/main/files/cacerts/c215bc69.0
luni/src/main/files/cacerts/c33a80d4.0
luni/src/main/files/cacerts/c527e4ab.0
luni/src/main/files/cacerts/c7e2a638.0
luni/src/main/files/cacerts/c8763593.0
luni/src/main/files/cacerts/ccc52f49.0
luni/src/main/files/cacerts/cdaebb72.0
luni/src/main/files/cacerts/cf701eeb.0
luni/src/main/files/cacerts/d16a5865.0
luni/src/main/files/cacerts/d537fba6.0
luni/src/main/files/cacerts/d64f06f3.0
luni/src/main/files/cacerts/d777342d.0
luni/src/main/files/cacerts/d8274e24.0
luni/src/main/files/cacerts/dbc54cab.0
luni/src/main/files/cacerts/ddc328ff.0
luni/src/main/files/cacerts/e48193cf.0
luni/src/main/files/cacerts/e60bf0c0.0
luni/src/main/files/cacerts/e775ed2d.0
luni/src/main/files/cacerts/e7b8d656.0
luni/src/main/files/cacerts/e8651083.0
luni/src/main/files/cacerts/ea169617.0
luni/src/main/files/cacerts/eb375c3e.0
luni/src/main/files/cacerts/ed049835.0
luni/src/main/files/cacerts/ed524cf5.0
luni/src/main/files/cacerts/ee7cd6fb.0
luni/src/main/files/cacerts/f4996e82.0
luni/src/main/files/cacerts/f58a60fe.0
luni/src/main/files/cacerts/f61bff45.0
luni/src/main/files/cacerts/f80cc7f6.0
luni/src/main/files/cacerts/fac084d7.0
luni/src/main/files/cacerts/facacbc6.0
luni/src/main/files/cacerts/fde84897.0
luni/src/main/files/cacerts/ff783690.0

Change IntegralToString.intToHexString to take width argument to
allow for leading zero padding. Updated existing callers to
specify 0 padding desired. Add testing of new padding
functionality.

luni/src/main/java/java/lang/Character.java
luni/src/main/java/java/lang/Integer.java
luni/src/main/java/java/lang/IntegralToString.java
luni/src/test/java/libcore/java/lang/IntegralToStringTest.java

Improved to throw Exceptions with proper causes

luni/src/main/java/java/security/KeyStore.java
luni/src/main/java/java/security/Policy.java
luni/src/main/java/java/security/cert/CertificateFactory.java
luni/src/main/java/javax/crypto/Cipher.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/OpenSSLSignature.java

Indentation fixes

luni/src/main/java/java/security/SecureRandom.java

Fix X509CRLSelector.getIssuerNames to clone result and added test to cover this.

luni/src/main/java/java/security/cert/X509CRLSelector.java
luni/src/test/java/libcore/java/security/cert/X509CRLSelectorTest.java

Fixed bug where we created an X500Principal via a String
representation instead of from its original encoded bytes. This
led to a difficult to track down bug where CA 418595b9.0 where the
NativeCode.X509_NAME_hash of a Harmony (but not BouncyCastle)
X509Certificate would not hash to the expected value because the
encoded form used an ASN.1 PrintableString instead of the
UTF8String form found in the original certificate.

luni/src/main/java/org/apache/harmony/security/x501/Name.java

Add a new RootKeyStoreSpi and register it as the
AndroidCAStore. This new read-only KeyStore implementation that
looks for certificates in $ANDROID_ROOT/etc/security/cacerts/
directory, which is /system/etc/security/cacerts/ on devices. The
files are stored in the directory based on the older md5 based
OpenSSL X509_NAME_hash function (now referred to as
X509_NAME_hash_old in OpenSSL 1.0)

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/RootKeyStoreSpi.java
luni/src/main/java/org/apache/harmony/xnet/provider/jsse/JSSEProvider.java

Added OpenSSL compatible X509_NAME_hash and X509_NAME_hash_old
functions for producting an int hash value from an X500Principal.

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/NativeCrypto.java

Changed TrustManagerFactoryImpl to use AndroidCAStore for its default KeyStore

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerFactoryImpl.java

Changed TrustManagerImpl to be AndroidCAStore aware. If it detects
an AndroidCAStore, it avoids generating the acceptedIssuers array
at constructions, since doing so would force us to parse all
certificates in the store and the value is only typically used by
SSLServerSockets when requesting a client certifcate. Because we
don't load all the trusted CAs into the IndexedPKIXParameters at
startup in the case of AndroidCAStore, we now check for new CAs
when examining the cert chain for unnecessary TrustAnchors and for
a newly discovered issuer at the end of the chain before
validation.

luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java

Updated KeyStoreTest to cope with read only KeyStore. Update
test_cacerts_bks (now renamed test_cacerts) to use the
AndroidCAStore for validating system CA certificate
validity. Register AndroidCAStore as an expected KeyStore type
with StandardNames.

luni/src/test/java/libcore/java/security/KeyStoreTest.java
support/src/test/java/libcore/java/security/StandardNames.java

Added test of X500Principal serialization while investigating Name
encoding issue. However, the actual Name bug was found and
verified by the new test_cacerts test.

luni/src/test/java/libcore/javax/security/auth/x500/X500PrincipalTest.java

vendor/google

Change canonical format for checked in cacerts to have PEM
certificate at the top, as required by Harmony's X.509
CertificateFactory.

tools/cacerts/certimport.py

Change-Id: I35164580e04c6f79404de9e3139694c30c57eb8b
egacy_prebuilts.mk
9d047acbccf907e7487ae657891c49d2849d2fa3 28-Apr-2011 Tsu Chiang Chuang <tsu@google.com> adding a new package to run vm tests in cts-tf

Change-Id: I523860b4e73b11cc158706a30e6694d9188a6697
asks/cts.mk
c6bb84159c562fa6c0f77f88c0f784cd98d4c766 27-Apr-2011 Ying Wang <wangying@google.com> Merge "Add LOCAL_GROUP_STATIC_LIBRARIES"
cb040fbca4a0bd431ba81ac9307c4f7271222f68 26-Apr-2011 David Turner <digit@android.com> am 57a477ff: am 6f9b7562: am d5565942: Merge "x86: Disable stack-protector until bionic is fixed"

* commit '57a477ff2e3dc853d24ca4ce490dbc50feeca3c8':
x86: Disable stack-protector until bionic is fixed
57a477ff2e3dc853d24ca4ce490dbc50feeca3c8 26-Apr-2011 David Turner <digit@android.com> am 6f9b7562: am d5565942: Merge "x86: Disable stack-protector until bionic is fixed"

* commit '6f9b7562e36483a7bf23833d99da6a50e57f7266':
x86: Disable stack-protector until bionic is fixed
6f9b7562e36483a7bf23833d99da6a50e57f7266 26-Apr-2011 David Turner <digit@android.com> am d5565942: Merge "x86: Disable stack-protector until bionic is fixed"

* commit 'd5565942437e2c0787822604921d034e9df5fc5d':
x86: Disable stack-protector until bionic is fixed
d5565942437e2c0787822604921d034e9df5fc5d 26-Apr-2011 David Turner <digit@android.com> Merge "x86: Disable stack-protector until bionic is fixed"
fcdabd4bdbb347399e77d2fd4b1aefd6281d75f8 25-Apr-2011 Ying Wang <wangying@google.com> Add LOCAL_GROUP_STATIC_LIBRARIES

Set LOCAL_GROUP_STATIC_LIBRARIES := true to group the static libraries,
in case we need gcc flags "-Wl,--start-group" and "-Wl,--end-group" to
fix circular references.

Change-Id: I03c4901670112fcdd2bb0fe660b6924e5776fcf8
inary.mk
lear_vars.mk
ombo/HOST_darwin-x86.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
efinitions.mk
86175d2fd50ef1649cc779234189d3098537fce2 09-Mar-2011 Dominic Binks <dbinks@codeaurora.org> Increase the Java heap size for droiddoc

Increasing the Java heap for droiddoc generation from 768 to 1280
megabytes reduces build times by about 2-3 minutes. For fast
build servers this can reduce build times by around 30%. For
slower workstation class machines the build is reduced with no
other obvious undesirable side effects.

Change-Id: I4ff04318ae78fc7b5a5a0499bacfc5527e966ff6
roiddoc.mk
ddbcad8c852980aabd2c7b02b909726d5c697182 18-Apr-2011 Ying Wang <wangying@google.com> Add TARGET_PROJECT_INCLUDES as system includes

And do the same to host modules.

Bug: 4279745
Change-Id: I5b0cd0e13e0e61b5051537b5834eba48e5f822f8
efinitions.mk
e480e7fd89b2c9813873be5a9ebd74a3dabe9e18 16-Apr-2011 Raphael Moll <ralf@android.com> am 009e6022: am cb6a22f5: am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."

* commit '009e602275e39fccbd6de52534621f6ceeaae001':
Allow swtmenubar module to be buildable on Windows.
009e602275e39fccbd6de52534621f6ceeaae001 16-Apr-2011 Raphael Moll <ralf@android.com> am cb6a22f5: am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."

* commit 'cb6a22f591d66443c923ad917f6d40e943b476ce':
Allow swtmenubar module to be buildable on Windows.
cb6a22f591d66443c923ad917f6d40e943b476ce 15-Apr-2011 Raphael Moll <ralf@android.com> am 2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."

* commit '2e4e3c94211fd31962e8fd1c6152932bbfdea7d5':
Allow swtmenubar module to be buildable on Windows.
59ad18fa49d930905b8aab382671a369504554f6 15-Apr-2011 Raphael Moll <ralf@android.com> Allow swtmenubar module to be buildable on Windows.

Change-Id: Ia20b8dea44f79df77ba0cb0479b99af990dc5b7b
ain.mk
8c425a9d7cfd7b6c660d1ba2df92adec32c0bee9 14-Apr-2011 Ying Wang <wangying@google.com> am 479ec682: Merge "Fix "argument list too long""

* commit '479ec68292c7ba17ab8e3d849cc1f186847f5cc5':
Fix "argument list too long"
00985df83acf4c21e0e7243d74348248b1c69e91 27-May-2010 Ying Wang <wangying@google.com> Fix "argument list too long"

Bug http://b/issue?id=2718472

Change-Id: I936e660f87ec5cfbbf95e6580bade624b277228c
efinitions.mk
c3dd0e62c05d4e27276ea25a73436799b21255c0 13-Apr-2011 Ying Wang <wangying@google.com> am bdbcc65d: am 7c1a1247: Drop using vendor/google/etc/apns-conf.xml for eng builds.

* commit 'bdbcc65d0ee98187f447bc2ae3b421dd2ffd0540':
Drop using vendor/google/etc/apns-conf.xml for eng builds.
bdbcc65d0ee98187f447bc2ae3b421dd2ffd0540 13-Apr-2011 Ying Wang <wangying@google.com> am 7c1a1247: Drop using vendor/google/etc/apns-conf.xml for eng builds.

* commit '7c1a1247f3e7110a95696671e8f71334e9b3c1b5':
Drop using vendor/google/etc/apns-conf.xml for eng builds.
7c1a1247f3e7110a95696671e8f71334e9b3c1b5 22-Mar-2011 Ying Wang <wangying@google.com> Drop using vendor/google/etc/apns-conf.xml for eng builds.

Bug: 4133493
Change-Id: I3eee2a5658620f480370d260b395e928bc395886
ain.mk
4761e56a7175db89b98b6ac07a978f54dcc78213 12-Apr-2011 Ying Wang <wangying@google.com> Pass TARGET_C_INCLUDES as system include directories to gcc

So warnings from those headers can be suppressed.
Bug: 4279745

Change-Id: Id69b253c5566de53153b87ef69eff15b8a47c832
efinitions.mk
4d9a8556ffcff525568f49fd22549991b6ec77cd 12-Apr-2011 Ying Wang <wangying@android.com> am e442c136: Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist."

* commit 'e442c1361a9066d7a394c080273d5f93d77979e4':
Add NDK crtbegin_so.o and crtend_so.o if they exist.
d2fb1cc23e33e6b6c439894566d7ecca4da76b52 09-Apr-2011 Ying Wang <wangying@google.com> Merge "Set the default app sdk verstion to LOCAL_SDK_VERSION"
2a6e052ed00d857f7db5cf6d3832e09ea9142aa5 09-Apr-2011 Joe Onorato <joeo@google.com> update to use the new apicheck

Change-Id: I47dfe29957a9a65dddae973640ff9029418ffdc5
onfig.mk
asks/apicheck.mk
bb9c230b68e9b57fe60f050e231f8437324f107a 09-Apr-2011 Ying Wang <wangying@google.com> Set the default app sdk verstion to LOCAL_SDK_VERSION

Instead of using the DEFAULT_APP_TARGET_SDK, which is the hardcoded in
the build system, ie the sdk version of the current source tree.

Change-Id: I2fae3521300cc6b2449df3659ded7f7a397609c0
efinitions.mk
ackage.mk
15ee93bf95890401d926fa7ca29b5783f63ff7a3 09-Apr-2011 Joe Onorato <joeo@google.com> Current.xml and friends are now .txt instead.

(and much much easier to read)

Change-Id: I31832069d4fd78a937802aa20d0b0861bf99768c
picheck_msg_current.txt
onfig.mk
asks/apicheck.mk
cc737a5aa322909ae31c4a016d630c68571b80b2 08-Apr-2011 Ying Wang <wangying@android.com> Add NDK crtbegin_so.o and crtend_so.o if they exist.

Change-Id: Ic088a986d3810a1d313df30361145a467ba07e06
hared_library.mk
9681379c6fb13169740b71e3a0c0454838a0c8ff 07-Apr-2011 Ying Wang <wangying@google.com> Use manifest minSdkVersion as "--target-api" in LOCAL_DX_FLAGS

Or use LOCAL_SDK_VERSION, if minSdkVersion is not available.

Change-Id: Ia1d6946867e02df953a1685079b2724236d46798
ava.mk
bb7c6d88c6dd5ee48e8b8ec85ee04c0aa7bc5979 02-Apr-2011 Brian Carlstrom <bdc@google.com> Tracking merge of dalvik-dev to master

git cherry-pick --no-commit 5fac8d8f7096d8a950acad1ad0a8b963cef72e03

git cherry-pick --no-commit 1a8210710b46a0796ff2f8e76b6beb3a54f89019

git cherry-pick --no-commit 4fe2ac9f7284b838393aec8f0f48caef2510fd46

git cherry-pick --no-commit 7beb710a8f976fc4cb1e8be780644386870c4975

Change-Id: Ib10348e5509c906c6b95fa4accd6a18900bfe748
efinitions.mk
ava_library.mk
asks/cts.mk
6ddd4ead924ac27c7e6655badeb6521dafd0a1ea 01-Apr-2011 Bruce Beare <bruce.j.beare@intel.com> x86: Disable stack-protector until bionic is fixed

Change-Id: I2862de5c1b02490197704f4578a8a91d0565eef0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ombo/TARGET_linux-x86.mk
406cc1bb6300a3d9bb0f3c2e8191ab4a35821b89 01-Apr-2011 Ying Wang <wangying@google.com> am a9be570b: resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp

* commit 'a9be570b5d5351bc13da1cbc0a5be3a6ea1113d1':
Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.
a9be570b5d5351bc13da1cbc0a5be3a6ea1113d1 01-Apr-2011 Ying Wang <wangying@google.com> resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp

Change-Id: Idddf7afb063109654664ecac252cf6be73125c20
fdc3192e6853ed92ec44653a609d386088bbb6d9 01-Apr-2011 Ying Wang <wangying@google.com> resolved conflicts for merge of bd0c91c8 to gingerbread-plus-aosp

Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1
cd4e323e0eb4c01e36233dde15500c57d7f2da4d 01-Apr-2011 Ying Wang <wangying@android.com> am ce467097: am 54aa74ef: am a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others"

* commit 'ce4670977d0367983e40ed339da793792fdb6e06':
Use my-dir in a consistent way as others
ce4670977d0367983e40ed339da793792fdb6e06 01-Apr-2011 Ying Wang <wangying@android.com> am 54aa74ef: am a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others"

* commit '54aa74ef5da0a76a0fc1afdabaa24d2fb0744cd1':
Use my-dir in a consistent way as others
54aa74ef5da0a76a0fc1afdabaa24d2fb0744cd1 01-Apr-2011 Ying Wang <wangying@android.com> am a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others"

* commit 'a9e5bb8a6b2b772b07214e4dd0004f6989285dd0':
Use my-dir in a consistent way as others
a9e5bb8a6b2b772b07214e4dd0004f6989285dd0 01-Apr-2011 Ying Wang <wangying@android.com> am f78fb1d1: Merge "Use my-dir in a consistent way as others"

* commit 'f78fb1d1516e1d7448871ad3a2a403b12ff25f1a':
Use my-dir in a consistent way as others
f78fb1d1516e1d7448871ad3a2a403b12ff25f1a 31-Mar-2011 Ying Wang <wangying@android.com> Merge "Use my-dir in a consistent way as others"
2b6435ed0e80330d01bd07e5970a99938ee704ed 31-Mar-2011 David 'Digit' Turner <digit@android.com> am 9ddea2d4: am dc620647: am c09cc904: am dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files."

* commit '9ddea2d4e9c3aeeaad8d7b59bd6db4413a5cd9d3':
build speedup: Do not use shell 'find' function to look for NOTICE files.
9ddea2d4e9c3aeeaad8d7b59bd6db4413a5cd9d3 30-Mar-2011 David 'Digit' Turner <digit@android.com> am dc620647: am c09cc904: am dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files."

* commit 'dc620647ef6c22b55b6de4992104f44c5f1c406c':
build speedup: Do not use shell 'find' function to look for NOTICE files.
dc620647ef6c22b55b6de4992104f44c5f1c406c 30-Mar-2011 David 'Digit' Turner <digit@android.com> am c09cc904: am dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files."

* commit 'c09cc904f183907111de57581d55c181df8ef47f':
build speedup: Do not use shell 'find' function to look for NOTICE files.
c09cc904f183907111de57581d55c181df8ef47f 30-Mar-2011 David 'Digit' Turner <digit@android.com> am dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files."

* commit 'dffd40587aff00c6852d64f5d7ed20d588bb993e':
build speedup: Do not use shell 'find' function to look for NOTICE files.
f4d284c159e228e315f7175bf4c856109ec0803b 29-Mar-2011 Ying Wang <wangying@google.com> am 954cc580: am fcf00d53: Support to build renderscript in unbundled apps.

* commit '954cc580253a4b7f5b3a8c60457952f69eaa42ca':
Support to build renderscript in unbundled apps.
954cc580253a4b7f5b3a8c60457952f69eaa42ca 29-Mar-2011 Ying Wang <wangying@google.com> am fcf00d53: Support to build renderscript in unbundled apps.

* commit 'fcf00d53bfdfa18fab0873be2d4d2800c621f861':
Support to build renderscript in unbundled apps.
fcf00d53bfdfa18fab0873be2d4d2800c621f861 29-Mar-2011 Ying Wang <wangying@google.com> Support to build renderscript in unbundled apps.

Change-Id: I8104be723f507df4f9673616bada11fb613651b7
ava.mk
3e0e611e766fe61fe41169dcb2dd0b42b7c5dc99 29-Mar-2011 David 'Digit' Turner <digit@android.com> build speedup: Do not use shell 'find' function to look for NOTICE files.

The GNU Make wildcard function can be used to look for a specific file and
is _much_ faster than invoking the find command through $(shell ...).

Since notice_files.mk is included by base_rules.mk for each and every module
in the build tree, this represents a considerable speed-up. For example, when
building the full-eng product from the AOSP tree, the no-op "make" goes from
21 seconds to 16 seconds with this patch applied.

Change-Id: Ideb1bb74d5bfbb650834fa4b6e151ff24dcd0150
otice_files.mk
16292ce718a05da7f28858bbd15d56df51aacbd4 29-Mar-2011 David 'Digit' Turner <digit@android.com> am 53d2a9a1: am 440d7e1e: am 9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension."

* commit '53d2a9a1acd2182a525401f3c1a82faff178a9d8':
Support target-specific sdk/build/tools.atree extension.
53d2a9a1acd2182a525401f3c1a82faff178a9d8 29-Mar-2011 David 'Digit' Turner <digit@android.com> am 440d7e1e: am 9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension."

* commit '440d7e1e5bb732ff8638af40e112e1df98e1f537':
Support target-specific sdk/build/tools.atree extension.
2396a0db9264d5b1c1243d9eb9c563d43f5e586e 26-Mar-2011 Raphael <raphael@google.com> resolved conflicts for merge of 9b4660a1 to master

Change-Id: Ide155e276c6e994ad330a5ac1c2676a7acc1efed
9b4660a1c6edae915c39261bc3d1a3f3696075c4 25-Mar-2011 Raphael <raphael@google.com> resolved conflicts for merge of db0d59d1 to honeycomb-plus-aosp

Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
507c3eac6a46ae2fa2b8b052003d5691cb7b9bfc 25-Mar-2011 Ying Wang <wangying@google.com> Merge "x86: qemu emulator is the default build target"
e4b2178329801789c0f20a97d5fde06e9da11d70 22-Mar-2011 Dianne Hackborn <hackbod@google.com> Onward and upward! And ice cream for all!

Change-Id: If4f5541e1bac283f4c2f43d6e73e37c124ba7684
ersion_defaults.mk
bd0c91c8b9d36fd3ed8d8ac7e66b3e1eee3bb0bb 16-Feb-2011 Raphael <raphael@google.com> Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.

When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I863ac8baf159432d7c95df46cba6e4f3b9122629
akefile
ain.mk
asks/sdk-addon.mk
21a8b2459f60d71ccf70f2411b63673c0e4c5757 16-Feb-2011 Raphael <raphael@google.com> Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.

When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: Id08a3a55a564938dbeb6e3dd170d4a9a7153ae6e
akefile
ain.mk
asks/sdk-addon.mk
08ee4287ccd97e421265d001439496b950e15f0d 19-Feb-2011 Bruce Beare <bruce.j.beare@intel.com> x86: qemu emulator is the default build target

Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
akefile
asks/sdk-addon.mk
7c7fbeaf1a034c9cdc4c7c86eb84cf183a1b6728 24-Mar-2011 Ying Wang <wangying@google.com> am 7bbea4b5: Disable dexpreopt for unbundled build.

* commit '7bbea4b5c1f053cbe428025e9f9dec0e50bcc551':
Disable dexpreopt for unbundled build.
bef90c0ec0fa638e5d2ef0a721e3b3c5e3d9d7f1 24-Mar-2011 Ying Wang <wangying@google.com> am 3fd580d4: Fix dependency of prebuilt target non-static Java libraries.

* commit '3fd580d4e29657b812d3ab3c459487689a5f2da6':
Fix dependency of prebuilt target non-static Java libraries.
7bbea4b5c1f053cbe428025e9f9dec0e50bcc551 12-Jan-2011 Ying Wang <wangying@google.com> Disable dexpreopt for unbundled build.

Cherry-picked from Honeycomb.

Change-Id: I1b8bf7faa3974f389a1f105b3397c4ceeea68885
ava_library.mk
ackage.mk
3fd580d4e29657b812d3ab3c459487689a5f2da6 01-Feb-2011 Ying Wang <wangying@google.com> Fix dependency of prebuilt target non-static Java libraries.

Cherry-picked from Honeycomb to fix a dependency issue when building
prebuilt shared library.

Change-Id: I0a9cd3835b50dcc130a5f211e89d6bd22478fd42
rebuilt.mk
440d7e1e5bb732ff8638af40e112e1df98e1f537 23-Mar-2011 David 'Digit' Turner <digit@android.com> am 9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension."

* commit '9fe6dc2c17ba6113ff4031feaeea7dac0ba5d5a3':
Support target-specific sdk/build/tools.atree extension.
74b0c368825d30f912e0058023b874fd62dbf3ff 23-Mar-2011 David 'Digit' Turner <digit@android.com> Support target-specific sdk/build/tools.atree extension.

The purpose of this patch is to add the ability to specify a
target-specific extension to sdk/build/tools.atree, under the
name sdk/build/tools.$(TARGET_ARCH).atree

This is needed to move x86-specific changes out of tools.atree
in order to fix the build of internal Android branches that
don't include other x86-related changes to the build system.

Another patch, following this patch, will fix the build itself
by moving the x86-stuff to sdk/build/tools.x86.atree.

NOTE: The root cause of the problem is that tools.atree
probably shouldn't be in the public AOSP repository, but
under development/build/ instead. However, fixing this
requires more drastic changes to the build system.

Change-Id: Ie365c55527bcad38e1e5248f618e2fd5a96431a1
akefile
db0d59d1b4a02816832d330c0bfa86ee67f2776e 22-Mar-2011 David Turner <digit@android.com> am b1047a99: Merge changes I00c75f37,I1fc3cb49

* commit 'b1047a99ce8b8d62ef911c5dfba7183c32e80a70':
x86: the -mbionic flag is needed for IA builds.
x86: qemu emulator is the default build target
0cafe839e079f71e4799868d03a39ec82aa277a7 17-Mar-2011 Iliyan Malchev <malchev@google.com> build: pass --strip-all, not --strip-debug to strip

Option --strip-all will remove the static symbol section in addition to debug
symbols. We do not need the static symbol table in libraries installed on the
target.

Change-Id: I7a52d22f5b45aa727f31bfd9af796b289528caef
Signed-off-by: Iliyan Malchev <malchev@google.com>
ombo/TARGET_linux-arm.mk
d37720cdf66d2fc5c074cf198bc70566e02afc12 16-Mar-2011 Doug Zongker <dougz@android.com> am 095dbffd: am 5d4808db: put extra recovery keys in the product definition

* commit '095dbffd605eb1bb602b028000aab4494288c6f6':
put extra recovery keys in the product definition
095dbffd605eb1bb602b028000aab4494288c6f6 16-Mar-2011 Doug Zongker <dougz@android.com> am 5d4808db: put extra recovery keys in the product definition

* commit '5d4808db1630048f6eb0610b75af01c9fc877412':
put extra recovery keys in the product definition
5d4808db1630048f6eb0610b75af01c9fc877412 16-Mar-2011 Doug Zongker <dougz@android.com> put extra recovery keys in the product definition

Change-Id: I71637cd578b24891c10171aa59406848649be703
akefile
roduct.mk
roduct_config.mk
5551535ffa07be4a8882cf2dcdb93da83ad6b8ce 15-Mar-2011 Xavier Ducrohet <xav@android.com> am 3509469b: am 4216a8c9: Add the host notice file to the SDK platform-tools folder.

* commit '3509469b43976cddf2ec4fc8a1020722dc214caf':
Add the host notice file to the SDK platform-tools folder.
3509469b43976cddf2ec4fc8a1020722dc214caf 15-Mar-2011 Xavier Ducrohet <xav@android.com> am 4216a8c9: Add the host notice file to the SDK platform-tools folder.

* commit '4216a8c94e320b7025acd6bf99bac4f9ae45c5c7':
Add the host notice file to the SDK platform-tools folder.
d18769c4c5ac43f5c95ecfa0831d30a74e03267d 15-Mar-2011 Ying Wang <wangying@google.com> Merge "Move screen density config from PRODUCT_LOCALES to PRODUCT_AAPT_CONFIG"
4216a8c94e320b7025acd6bf99bac4f9ae45c5c7 15-Mar-2011 Xavier Ducrohet <xav@android.com> Add the host notice file to the SDK platform-tools folder.

Change-Id: Id9e789fed635c6e5b43254f8ef6ec353302ca1be
akefile
4f1ab92aac00a73276793ed25af669d112618a32 15-Mar-2011 Ying Wang <wangying@google.com> Move screen density config from PRODUCT_LOCALES to PRODUCT_AAPT_CONFIG

With this change, PRODUCT_LOCALES will contain only locales.
Other aapt config flags, such as *dpi, small/normal/large/xlarge,
should go to PRODUCT_AAPT_CONFIGS.
Bug: 4086309

Change-Id: I922f153d79777a9522c542a3907111193b40e7b7
leanbuild.mk
efinitions.mk
ackage.mk
roduct.mk
roduct_config.mk
2e8283d9bcb3a4d92868b36f523e8dce2a851ddc 01-Feb-2011 Bruce Beare <bruce.j.beare@intel.com> x86: the -mbionic flag is needed for IA builds.

Change-Id: I00c75f37d7ea46b9f8ad3d7b2ff7094477ff0916
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ombo/TARGET_linux-x86.mk
18a130e98a654b99057d974f563a645dbb96010c 19-Feb-2011 Bruce Beare <bruce.j.beare@intel.com> x86: qemu emulator is the default build target

Change-Id: I1fc3cb491d593d3e28f90278cfc8de5d77852932
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
akefile
asks/sdk-addon.mk
8c675d22937ccee6d133a13077479d1d67193883 15-Mar-2011 David 'Digit' Turner <digit@android.com> am 16e7050c: am e9b1d0ee: am f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"

* commit '16e7050cbaa292c0f36275cdb4c56f357cbfa79a':
Allow win_sdk build with USE_CCACHE=1
16e7050cbaa292c0f36275cdb4c56f357cbfa79a 15-Mar-2011 David 'Digit' Turner <digit@android.com> am e9b1d0ee: am f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"

* commit 'e9b1d0eee715895f156c8e2601d5b1996919da6d':
Allow win_sdk build with USE_CCACHE=1
e9b1d0eee715895f156c8e2601d5b1996919da6d 15-Mar-2011 David 'Digit' Turner <digit@android.com> am f8f95fc8: Merge "Allow win_sdk build with USE_CCACHE=1"

* commit 'f8f95fc8b1a1eb19812fc55b230da3bfbe5272e5':
Allow win_sdk build with USE_CCACHE=1
f8f95fc8b1a1eb19812fc55b230da3bfbe5272e5 15-Mar-2011 David 'Digit' Turner <digit@android.com> Merge "Allow win_sdk build with USE_CCACHE=1"
55aad0866382e89a18d5cc49ce2c88c839b88cea 12-Mar-2011 David 'Digit' Turner <digit@android.com> Allow win_sdk build with USE_CCACHE=1

This patch allows the Window sdk build (lunch sdk-eng; make win_sdk)
to work properly when USE_CCACHE is defined in the environment.

There is no Windows ccache prebuilt, but since we're cross-compiling
from Linux, detect it and use the linux prebuilt binary instead.

Note: Depends on https://review.source.android.com//#change,21755
for a complete solution to the problem.

Change-Id: I0b1b59efae86ee7114225258c9ecf9f257913347
ombo/select.mk
374b3256d270f9320176330e4f836a1cb3955899 14-Mar-2011 Ying Wang <wangying@google.com> Make a copy of symbol files after prelinking is removed.

Change-Id: I1628b54fc747154d48f213c634b081e43eb41696
ynamic_binary.mk
b375e71d306f2fd356b9b356b636e568c4581fa1 09-Mar-2011 Iliyan Malchev <malchev@google.com> build: remove prelinker build build system

This patch removes support for prelinking from the build system. By now, the
prelinker has outlived its usefulness for several reasons. Firstly, the
speedup that it afforded in the early days of Android is now nullified by the
speed of hardware, as well as by the presence of Zygote. Secondly, the space
savings that come with prelinking (measued at 17MB on a recent honeycomb
stingray build) are no longer important either. Thirdly, prelinking reduces
the effectiveness of Address-Space-Layout Randomization. Finally, since it is
not part of the gcc suite, the prelinker needs to be maintained separately.

The patch deletes apriori, soslim, lsd, isprelinked, and iself from the source
tree. It also removes the prelink map.

LOCAL_PRELINK_MODULE becomes a no-op. Individual Android.mk will get cleaned
separately. Support for prelinking will have to be removed from the recovery
code and from the dynamic loader as well.

Change-Id: I5839c9c25f7772d5183eedfe20ab924f2a7cd411
lear_vars.mk
ombo/TARGET_linux-arm.mk
ombo/select.mk
onfig.mk
efinitions.mk
ynamic_binary.mk
xecutable.mk
ain.mk
relink-linux-arm.map
roduct.mk
hared_library.mk
ser_tags.mk
2cfffcb606b5f1310a0678a16367af48f564bab9 12-Mar-2011 Raphael Moll <ralf@android.com> am 8755e2b2: am e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."

* commit '8755e2b2c21dd54063fcb62c26c4a2d3575610cf':
Fix find-jdk-tools-jar to be cygwin-friendly.
e73c4bbc509f414cb8fbf487b7f44ab94af9cbb9 16-Jan-2011 Chih-Wei Huang <cwhuang@linux.org.tw> Use my-dir in a consistent way as others

Change-Id: I3fd0cc58b48d621b431d7dd05fb689c1917b530d
efinitions.mk
8755e2b2c21dd54063fcb62c26c4a2d3575610cf 10-Mar-2011 Raphael Moll <ralf@android.com> am e84739e9: Merge "Fix find-jdk-tools-jar to be cygwin-friendly."

* commit 'e84739e942d19955248e1fc1ce966d56543eaf0e':
Fix find-jdk-tools-jar to be cygwin-friendly.
e84739e942d19955248e1fc1ce966d56543eaf0e 10-Mar-2011 Raphael Moll <ralf@android.com> Merge "Fix find-jdk-tools-jar to be cygwin-friendly."
8046557f94a651373bd471780fd845c73a044017 10-Mar-2011 Dianne Hackborn <hackbod@google.com> am 59daa2bc: It\'s a new version!

* commit '59daa2bc61ff0992f792a50dd413dcedd6359cf4':
It's a new version!
59daa2bc61ff0992f792a50dd413dcedd6359cf4 10-Mar-2011 Dianne Hackborn <hackbod@google.com> It's a new version!

Change-Id: Ic0740e3250ad7805188f919cdb0cc63b6aa17423
ersion_defaults.mk
f8a7ff191af760ee01e5c31f154f0dbc7abfef7e 10-Mar-2011 Ying Wang <wangying@google.com> resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp

Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf
123995f9e1c4318b6b7469754a9d19e5c66b34c5 10-Mar-2011 Ying Wang <wangying@google.com> am be188caf: Dist build.prop in sdk builds.

* commit 'be188cafd21c7356cc33ae042661b682d0536e8b':
Dist build.prop in sdk builds.
4de32c69c718b86d5ea68421d6c3da5ee684d0ce 08-Mar-2011 Raphael Moll <ralf@android.com> Fix find-jdk-tools-jar to be cygwin-friendly.

Change-Id: I9cf2035026725fd1ba8a014b484262ed1acc1df4
ind-jdk-tools-jar.sh
be188cafd21c7356cc33ae042661b682d0536e8b 08-Mar-2011 Ying Wang <wangying@google.com> Dist build.prop in sdk builds.

Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d
ain.mk
24297cabf4cd530e4ed4dc10db5cbc68f9ac7c7c 08-Mar-2011 Ed Heyl <ed@google.com> Merge "version bump for new release (please don't merge)" into gingerbread
3c83a5aeb99284137cdb5fca2b061e2f73524046 08-Mar-2011 Ed Heyl <ed@google.com> version bump for new release (please don't merge)

Change-Id: I94081a1288da434811a1ddaa8a7b7b5da13d9341
ersion_defaults.mk
1c908fa1889d82fd58548c6f0aba0676f3d7b7c8 07-Mar-2011 David Turner <digit@android.com> am b9c627c6: am 0683a773: Merge "x86: Use GCC 4.4.3"

* commit 'b9c627c6a0c6f0af57d0912175bfc739b0eb6249':
x86: Use GCC 4.4.3
b9c627c6a0c6f0af57d0912175bfc739b0eb6249 07-Mar-2011 David Turner <digit@android.com> am 0683a773: Merge "x86: Use GCC 4.4.3"

* commit '0683a77348f2a0a529a8e2bcfdf4b6dc6b4c5f5b':
x86: Use GCC 4.4.3
70d6ec5f9b2b3ae9da0ee28667abf93c5383b991 07-Mar-2011 Ying Wang <wangying@google.com> resolved conflicts for merge of 0a1f3236 to honeycomb-plus-aosp

Change-Id: I6596f4a65a99eed98bdca2d8a6840bc378297b6d
582222190f8168bdedf6cfeb986f7e4201f6540a 05-Mar-2011 Ying Wang <wangying@google.com> am 9238d44c: Only copy once even if the first matched src:dest pair appears more than once.

* commit '9238d44c92b355bac6b7a13b23f298336338bf3d':
Only copy once even if the first matched src:dest pair appears more than once.
0a1f3236e319384bec11061a242a9ac44c785278 05-Mar-2011 Ying Wang <wangying@google.com> am a73b6561: Drop support for target files with no recovery.fstab.

* commit 'a73b6561cee39ad416f4af327dbe72ec565d2423':
Drop support for target files with no recovery.fstab.
0683a77348f2a0a529a8e2bcfdf4b6dc6b4c5f5b 05-Mar-2011 David Turner <digit@android.com> Merge "x86: Use GCC 4.4.3"
9238d44c92b355bac6b7a13b23f298336338bf3d 03-Nov-2010 Ying Wang <wangying@google.com> Only copy once even if the first matched src:dest pair appears more than once.

Change-Id: I476923007dac1174371d6e6526d72182eb6c7243
akefile
a73b6561cee39ad416f4af327dbe72ec565d2423 04-Mar-2011 Ying Wang <wangying@google.com> Drop support for target files with no recovery.fstab.

Change-Id: I099298cfffc2546975732a3bf0df60f96ccbdac4
Meanwhile don't build the ota and update zip files if no recovery.fstab
found.
akefile
7ee6c4033b2d2c0967e52425ff70f7e66bcc744d 04-Mar-2011 Ying Wang <wangying@google.com> Add NDK crtbegin_so.o and crtend_so.o if they exist.

Change-Id: I3d49d5a2d0e1b6bf26a0e1df0df2d6d7e026f85a
hared_library.mk
cce4c973e42a5a2f4256eb2792858b27ea15f375 04-Mar-2011 Ying Wang <wangying@google.com> Support stl variants when LOCAL_NDK_VERSION is set.

LOCAL_NDK_STL_VARIANT can be set to system, stlport_static, stlport_shared
or gnustl_static. It defaults to system.

Change-Id: I2840d30ff732a00bc0ea70eab8a8179aea0abbdf
inary.mk
lear_vars.mk
hared_library.mk
a67ce69e9a1ff267cb3c01bdd3214b6c68aa6f63 03-Mar-2011 Ying Wang <wangying@google.com> Handle MODULE_LICENSE_MPL the same as MODULE_LICENSE_GPL.

Change-Id: Iefc6df3f3401a591f53ec3f22202044c60acf460
ase_rules.mk
efinitions.mk
2adc50374a18197fed3d9c8181272b032e86640e 02-Mar-2011 Ying Wang <wangying@google.com> sdk.atree does not need DIST_DIR any longer.

Change-Id: I34d8f13e1ddc27f853e3f15cfe0351d780a47aa8
akefile
a17b91faa405acb3a162e9db4cf50b5addd231ae 27-Jan-2011 Bruce Beare <bruce.j.beare@intel.com> x86: Use GCC 4.4.3

Change-Id: I083c1afcbb98cfeb48d7bcb7681e5c34db52e767
Author: H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ombo/TARGET_linux-x86.mk
b48e7c400b66e5d7f8c298fd882f304d3ff1edc5 01-Mar-2011 Raphael Moll <raphael@google.com> Pass DIST_DIR to sdk.atree

Change-Id: I224781b13bfbf11de553d201b4c2214f93235a67
akefile
3e54830dc89794e17b3334190c0183faa40ac4d6 24-Feb-2011 Raphael <raphael@google.com> Fix for SDK repository.

Change-Id: Ia1245226c451ed4539a0a0cd51022a3325f4b33b
asks/sdk-addon.mk
c4e93b7e111b79666f9947977e3450bf8d0b297b 24-Feb-2011 Ying Wang <wangying@google.com> Merge "Add stl include path if LOCAL_NDK_VERSION is set"
419e19121ccd6f45b1f039e7ba87d74fc8798b79 23-Feb-2011 Doug Zongker <dougz@android.com> am 5e2afb97: am eaa464e6: am a34fa95c: force inclusion of system log tags in the event-log-tags file

* commit '5e2afb977fcec46e001ac57cc76d3b9534696afa':
force inclusion of system log tags in the event-log-tags file
5e2afb977fcec46e001ac57cc76d3b9534696afa 23-Feb-2011 Doug Zongker <dougz@android.com> am eaa464e6: am a34fa95c: force inclusion of system log tags in the event-log-tags file

* commit 'eaa464e6c4064ce8359d3e5871e0d184388457b8':
force inclusion of system log tags in the event-log-tags file
eaa464e6c4064ce8359d3e5871e0d184388457b8 23-Feb-2011 Doug Zongker <dougz@android.com> am a34fa95c: force inclusion of system log tags in the event-log-tags file

* commit 'a34fa95c164a9388ed0b84b17a63241bffd4132a':
force inclusion of system log tags in the event-log-tags file
a34fa95c164a9388ed0b84b17a63241bffd4132a 23-Feb-2011 Doug Zongker <dougz@android.com> force inclusion of system log tags in the event-log-tags file

Change-Id: I59066ff151b6cb74a70bd8a900d473a533c84de3
akefile
2f76c6d11b97507880df2c1cf84458ba34f6e634 23-Feb-2011 Ying Wang <wangying@google.com> Add stl include path if LOCAL_NDK_VERSION is set

Since NDKr5 the stl headers reside in a separate directory.

Change-Id: I98f37b593560a1a2a55418f8ba413ca842ed37ef
inary.mk
336cd7dcb0e3894fbb4807958420e0ca937854a5 22-Feb-2011 Raphael <raphael@google.com> Merge "Build SDK repository"
1b8798894c90ef5deaf4f49d468e959ea3c19131 22-Feb-2011 Kenny Root <kroot@google.com> resolved conflicts for merge of 747a9780 to honeycomb-plus-aosp

Change-Id: I06b2fba1d14343bf0489447a01bb7d0bdb675307
f24495f7daac48c2cbf001480b0c7c7452a1bdec 19-Feb-2011 Jeff Brown <jeffbrown@google.com> Remove obsolete kcm tool.

Change-Id: Ib5aa60cd9d308ce7c672c57513bdcf78e0f1080d
onfig.mk
ey_char_map.mk
ser_tags.mk
3340d2fcde748180ed1435460c3696ded8e6eb0d 19-Feb-2011 Gloria Wang <gwang@google.com> Remove libwvm.so from the prelink map

Change-Id: If6494cd3e92fef571e8ddf40f0b4c19bee7c9ae6
relink-linux-arm.map
49b2af4b99b9899eb05f6be9c4d4d38d58a70c4f 19-Feb-2011 Gloria Wang <gwang@google.com> Merge "Add libwvm.so"
9437cf2589366b5f35b425061d1b82df31a59134 19-Feb-2011 Brett Chabot <brettchabot@android.com> am a3c3bc33: am a29d7e4b: Merge "Build cts-tradefed README into cts.zip" into honeycomb

* commit 'a3c3bc336600bb30680adb920e0b17b28e250dc0':
Build cts-tradefed README into cts.zip
a3c3bc336600bb30680adb920e0b17b28e250dc0 19-Feb-2011 Brett Chabot <brettchabot@android.com> am a29d7e4b: Merge "Build cts-tradefed README into cts.zip" into honeycomb

* commit 'a29d7e4b17b6082046092ea7fce94d7aa50d96bb':
Build cts-tradefed README into cts.zip
a29d7e4b17b6082046092ea7fce94d7aa50d96bb 19-Feb-2011 Brett Chabot <brettchabot@android.com> Merge "Build cts-tradefed README into cts.zip" into honeycomb
e847a399565ad1d11f0eb3454e529a9714dd98df 19-Feb-2011 Brett Chabot <brettchabot@android.com> Build cts-tradefed README into cts.zip

Change-Id: Idd2d36a021eb706846673a1ebc417a1f4c3b9d38
asks/cts.mk
dca35796cfa0ee56fe38b028b3c6556cc8071184 18-Feb-2011 Ying Wang <wangying@google.com> Remove unused variable DONT_INSTALL_DEX_FILES

Change-Id: Ic91ba1f551e0a1a81aaac438fbd1d359a71a7bfa
ackage.mk
1b5f1dc30fb62256f9c45344a4141c72abc4d164 18-Feb-2011 Ying Wang <wangying@google.com> Use shell variable, instead of makefile var.

Change-Id: I802b145b563145437135412473704f911c8c1474
akefile
747a9780a8e6bfae5a69540e017a50aaac9c6758 17-Feb-2011 Kenny Root <kroot@android.com> am 951a3e5f: Merge "Build system tweaks for Valgrind."

* commit '951a3e5f416d9ebe84e922132c85c8696d5d74a0':
Build system tweaks for Valgrind.
df36f2ba5aab22a6af6c584d72d127e72aa45272 15-Feb-2011 Gloria Wang <gwang@google.com> Add libwvm.so

Change-Id: I4ad2ed5e2ef762f2147a8b7a27dbbd6d61ac1098
relink-linux-arm.map
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e 16-Feb-2011 Raphael <raphael@google.com> Build SDK repository

When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: Ie7e0f789bafd73d5ee2461349155a6e562e2edd9
akefile
ain.mk
asks/sdk-addon.mk
bd528a82a24e2230ea797ffc7d9a20d4d917747e 16-Feb-2011 Jeff Brown <jeffbrown@google.com> Build system tweaks for Valgrind.

Added LOCAL_NO_CRT to enable building executables that do not link
to the C runtime library.

Removed support for LOCAL_MODULE_SUBDIR since it was broken
and unused. (Was going to use it but ended up using LOCAL_MODULE_PATH
instead.)

Change-Id: Ifed4ffe17003d90370c711ea6606e2b75e841dee
ase_rules.mk
inary.mk
lear_vars.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
efinitions.mk
ynamic_binary.mk
3a398e265be95c2ffab86ac00e69d7c89d4a8ec1 16-Feb-2011 Ben Cheng <bccheng@android.com> Merge "Remove usused workaround."
5116e50705974bdf994fd46418529b6f94b61bfd 16-Feb-2011 Ben Cheng <bccheng@android.com> Remove usused workaround.

Change-Id: I1d42d0f0dee361b98403bc87296dcbc37484ebcb
ombo/TARGET_linux-arm.mk
d6b413a904fb7238299bb1217f299ddf4a692493 15-Feb-2011 David 'Digit' Turner <digit@android.com> am 3be47af9: am b3f59bde: am 86a90364: Merge "core/binary.mk: Add missing Objective-C objects to the build."

* commit '3be47af9491b7fd93b74122cb7f979f2b86c1634':
core/binary.mk: Add missing Objective-C objects to the build.
15e487a792d7c6f84f9bc84eefb966e9118229d7 15-Feb-2011 Ying Wang <wangying@google.com> Don't build everything for APKCERTS_FILE

Before this change, to build APKCERTS_FILE you have to build any modules
in the system first, which include modules that only need to be checked,
instead of being built. This can reduce the build time when "dist" is
specified.

Change-Id: I64bee67977adcaf7b7c8df3f8f6492c9c33bc69d
akefile
3be47af9491b7fd93b74122cb7f979f2b86c1634 15-Feb-2011 David 'Digit' Turner <digit@android.com> am b3f59bde: am 86a90364: Merge "core/binary.mk: Add missing Objective-C objects to the build."

* commit 'b3f59bde44fc16fa43b6a01a890c4b42cf446292':
core/binary.mk: Add missing Objective-C objects to the build.
b3f59bde44fc16fa43b6a01a890c4b42cf446292 15-Feb-2011 David 'Digit' Turner <digit@android.com> am 86a90364: Merge "core/binary.mk: Add missing Objective-C objects to the build."

* commit '86a903647f3f3df4484396ec58ba5b0454abd36e':
core/binary.mk: Add missing Objective-C objects to the build.
5ca286d58bc2f8e2445ae77d7ca8b4046a016988 11-Feb-2011 David 'Digit' Turner <digit@android.com> core/binary.mk: Add missing Objective-C objects to the build.

For some reason, all_objects was not listing objects generated from
objective-C sources. We need these for the emulator (which builds its
own version of SDL which uses Quartz on OS X).

+ Fix a typo in transform-host-m-to-o definition.

This also explains why https://review.source.android.com/#change,21074
had to be reverted, since it gets rid of the prebuilt SDL libraries when
building the emulator.

Change-Id: I173811cf11cdb5b045073aade59364236145bc77
inary.mk
efinitions.mk
4a2ecaf5dc7434dd06a1fbcf14c56e6a7c7b383b 10-Feb-2011 Ying Wang <wangying@google.com> Fix the case image-size-from-data-size returns 0.

This time with correct escaping.

Change-Id: I660887ac62425e9960e266391b52979a7dff4617
efinitions.mk
bfaf531e05b3f024dc758ab5211ef9b067f60754 10-Feb-2011 Ying Wang <wangying@google.com> Revert "Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86"

This reverts commit 279f3084bbb4781d872412f5e49c74f462f7844a.

Change-Id: I27069190503e586d3d77a933d92459a34eb55cb8
efinitions.mk
389cf7ac4edf714874f06d02d287a6350f52a47d 09-Feb-2011 Ying Wang <wangying@google.com> Merge "Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86"
279f3084bbb4781d872412f5e49c74f462f7844a 09-Feb-2011 Ying Wang <wangying@google.com> Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86

Also don't build ota package for generic_x86.

Change-Id: I7606d56b312ac2e0c3514a8f250e005e0c05a3f1
akefile
efinitions.mk
f67684b22abb12588d546c3fcfd796c5af39a225 09-Feb-2011 Jeff Brown <jeffbrown@google.com> Merge "Build system tweaks for Valgrind."
703e7c6d50a5bddf0fb057a1a26618e2f7138c31 05-Feb-2011 Jeff Brown <jeffbrown@google.com> Build system tweaks for Valgrind.

Added LOCAL_NO_CRT to enable building executables that do not link
to the C runtime library.

Removed support for LOCAL_MODULE_SUBDIR since it was broken
and unused. (Was going to use it but ended up using LOCAL_MODULE_PATH
instead.)

Change-Id: I3b6f5ab7e5ae6aaa7119899adccece2b4ab1cbb3
ase_rules.mk
inary.mk
lear_vars.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
efinitions.mk
ynamic_binary.mk
e5f114b3a577680ef0819e1739d9c2eef8d30f7a 08-Feb-2011 Glenn Kasten <gkasten@google.com> Merge "libFLAC is now a static library"
bf149351952b348883c1ed8adfe417a8e179a2bc 08-Feb-2011 Ying Wang <wangying@google.com> am d239c1bd: Fix dependency of prebuilt target non-static Java libraries.

* commit 'd239c1bd1bef3067acebcd9d87a7be68d6eb4b98':
Fix dependency of prebuilt target non-static Java libraries.
d239c1bd1bef3067acebcd9d87a7be68d6eb4b98 01-Feb-2011 Ying Wang <wangying@google.com> Fix dependency of prebuilt target non-static Java libraries.

Change-Id: Ib9a01e1d0cf1eed57de0dc7706ee12125212ba67
rebuilt.mk
59f7b629bc4709511461fb00f44364121a10f937 07-Feb-2011 Raphael <raphael@google.com> am 0a7ed4af: am 30e07075: SDK: stub the maps.jar from the google_apis addon.

* commit '0a7ed4af97bdd52be96d8c9db1eff3fa4d6dc843':
SDK: stub the maps.jar from the google_apis addon.
3e01b483708d0fc3766fa4adff2ae8b354de75dc 04-Feb-2011 Raphael <raphael@google.com> am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.

* commit '843c6e2530a0783ae1a5a4758cb5e76ad975ae72':
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
843c6e2530a0783ae1a5a4758cb5e76ad975ae72 04-Feb-2011 Raphael <raphael@google.com> merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.

Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.

Change-Id: I1ac97023570a4fc8a0b9dd50db429c55184ec88c
asks/sdk-addon.mk
0a7ed4af97bdd52be96d8c9db1eff3fa4d6dc843 04-Feb-2011 Raphael <raphael@google.com> am 30e07075: SDK: stub the maps.jar from the google_apis addon.

* commit '30e0707531268343e11dfeb51f28ccdacd7f9875':
SDK: stub the maps.jar from the google_apis addon.
043b9d4b3d7320864a3d44d0f025a729461fb6c8 04-Feb-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 3366885 Remove LVMX"
30e0707531268343e11dfeb51f28ccdacd7f9875 04-Feb-2011 Raphael <raphael@google.com> SDK: stub the maps.jar from the google_apis addon.

Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.

Change-Id: I5f4e766613576828147c97be8d38e97fe1035672
asks/sdk-addon.mk
18315876c8fc32d222764f234c1360f03c35951d 04-Feb-2011 Glenn Kasten <gkasten@google.com> Bug 3366885 Remove LVMX

Change-Id: If35e28c44a4ccc3e1a777e95f2551cf5d6552f12
relink-linux-arm.map
16166e5727cb30a4a3f2f02b23c3cee2fbd4aa36 04-Feb-2011 Raphael Moll <ralf@android.com> am 5c6069d6: am ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"

* commit '5c6069d632b3019c74de57b5d89a4e90d2b59759':
SDK: Enable "make sdk/common" under Windows
be1a946d16db8ba16f1013ff6f50a65d995ed30a 03-Feb-2011 Glenn Kasten <gkasten@google.com> libFLAC is now a static library

Change-Id: Iaf48e795607ddaeb3cc1da2fce068d4d985061da
relink-linux-arm.map
5c6069d632b3019c74de57b5d89a4e90d2b59759 03-Feb-2011 Raphael Moll <ralf@android.com> am ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"

* commit 'ed19189877a3a380074e8e76969ef23689cec8fd':
SDK: Enable "make sdk/common" under Windows
ed19189877a3a380074e8e76969ef23689cec8fd 03-Feb-2011 Raphael Moll <ralf@android.com> am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"

* commit 'a15717c9905e32f2724645e3734567c40d8d3eb0':
SDK: Enable "make sdk/common" under Windows
79e1d2cf99754f81137c0f390d0e1fd898e52277 03-Feb-2011 Raphael <raphael@google.com> am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."

* commit '6b6e8114810bb26a64e1d8d9814fdfadb90c3848':
SDK: Strip llvm-rs-cc in SDK.
ea55056f1942357a6d6bd39b64b41a46e8648b01 03-Feb-2011 Raphael <raphael@google.com> am 3e57da17: am 7a6a9c35: SDK: Strip llvm-rs-cc in SDK.

* commit '3e57da17d1bd1e61c440910fbb441ba6997314d9':
SDK: Strip llvm-rs-cc in SDK.
192d1ef6d73c50db358bb7c8be6c29e6cc7540a2 03-Feb-2011 Raphael Moll <ralf@android.com> SDK: Enable "make sdk/common" under Windows

Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
ain.mk
3e57da17d1bd1e61c440910fbb441ba6997314d9 03-Feb-2011 Raphael <raphael@google.com> am 7a6a9c35: SDK: Strip llvm-rs-cc in SDK.

* commit '7a6a9c3528d997a1cb3a03eca3c0c11b14792449':
SDK: Strip llvm-rs-cc in SDK.
678c7ac997ba5daf09664d3e9b26f1c4a493b99e 03-Feb-2011 Brian Swetland <swetland@google.com> am d7798a7e: fix TINY ANDROID yet again...

* commit 'd7798a7e1b3241c49d7c8325cf14ac608350b719':
fix TINY ANDROID yet again...
d7798a7e1b3241c49d7c8325cf14ac608350b719 03-Feb-2011 Brian Swetland <swetland@google.com> fix TINY ANDROID yet again...

Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
ain.mk
7a6a9c3528d997a1cb3a03eca3c0c11b14792449 01-Feb-2011 Raphael <raphael@google.com> SDK: Strip llvm-rs-cc in SDK.

SDK Bug: 3394374

Change-Id: I2b0e46d9f94d488611bd79193f4a11cc0f36be51
akefile
39f4b566dab9f2cca3668493747114531b67a969 01-Feb-2011 Raphael <raphael@google.com> SDK: Strip llvm-rs-cc in SDK.

SDK Bug: 3394374

Change-Id: I728112795ad40a31a1b4c476e043ef213241c617
akefile
1eda86286a41cf4be8cc75187683fa4d4983a5e4 02-Feb-2011 Ed Heyl <ed@google.com> set ID back to honeycomb (please do not merge)

Change-Id: I469ccbb2a556d3aeaedb9d0a89bda1d77aef6b90
uild_id.mk
0864d010018feff8a672790dde86a7c2a3613813 02-Feb-2011 Ying Wang <wangying@google.com> am 9bc858c4: am 9c0f3e35: Build only userdata.img.

* commit '9bc858c4fd765366a64cfe2021b8694b4aac82f8':
Build only userdata.img.
9bc858c4fd765366a64cfe2021b8694b4aac82f8 02-Feb-2011 Ying Wang <wangying@google.com> am 9c0f3e35: Build only userdata.img.

* commit '9c0f3e355194d1c43bf70f35f953d6a2babc815a':
Build only userdata.img.
e82906500b1a583a16787758186d21d79013fc12 02-Feb-2011 Doug Zongker <dougz@android.com> Merge "support TARGET_EXTRA_RECOVERY_KEYS"
9c0f3e355194d1c43bf70f35f953d6a2babc815a 01-Feb-2011 Ying Wang <wangying@google.com> Build only userdata.img.

Use build command like:
$make -j16 showcommands userdataimage dist TARGET_PRODUCT=trygon_with_data_preloaded TARGET_BUILD_VARIANT=user

Change-Id: I964490e03090c3696d1595c92363273e35cfaed7
ain.mk
e121d6acf47c3056e079ff62c82171e889cec3e0 01-Feb-2011 Doug Zongker <dougz@android.com> support TARGET_EXTRA_RECOVERY_KEYS

Specifying one or more key files (without .x509.pem extension) as
TARGET_EXTRA_RECOVERY_KEYS causes them to be included as acceptable
keys for recovery packages. They are *not* included in otacerts.zip,
so actual downloaded over-the-air packages can't use them, but they
can be used to sign sideload-only packages.

Bug: 3413359
Change-Id: I6f248ffa35f0c6b125dd8a7517493017e236c776
akefile
5b316b604d1d24352b546a32946e000d8d5457ed 01-Feb-2011 Ying Wang <wangying@google.com> Fix dependency of prebuilt target non-static Java libraries.

Change-Id: I498b96ce737e5fc9076de39108252284ee53218f
rebuilt.mk
e29ef594e6836cdeee09de51f3a4b9af11cdabff 01-Feb-2011 Jean-Baptiste Queru <jbq@google.com> Merge from open-source master

Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2
e5baeada4d7f85f49f95a29ecf80ba230fb6a4ef 01-Feb-2011 Brett Chabot <brettchabot@android.com> am 9f686c99: am 2aad7a5b: Merge "Add cts-tradefed to cts build." into honeycomb

* commit '9f686c996bb45f0d377342fadfd20f5ae7a640de':
Add cts-tradefed to cts build.
9f686c996bb45f0d377342fadfd20f5ae7a640de 31-Jan-2011 Brett Chabot <brettchabot@android.com> am 2aad7a5b: Merge "Add cts-tradefed to cts build." into honeycomb

* commit '2aad7a5beae2b308332270c27645f45674303a77':
Add cts-tradefed to cts build.
2aad7a5beae2b308332270c27645f45674303a77 31-Jan-2011 Brett Chabot <brettchabot@android.com> Merge "Add cts-tradefed to cts build." into honeycomb
83e2f942b66acb3bc887cd542c859b40e96ff40b 31-Jan-2011 Jean-Baptiste Queru <jbq@google.com> partial build fix

Change-Id: I831c4c646eca96c6513018fbc5ad88970b942775
ser_tags.mk
358b24700bbc9564a24242be2413ac95642444c0 31-Jan-2011 Brett Chabot <brettchabot@android.com> Add cts-tradefed to cts build.

Bug 3403768

Change-Id: I0ca2068f93f25b2f5f6691c5ce70573da4a12aa6
asks/cts.mk
bf041eb259100e4256467c1911175e3174f5eeb8 31-Jan-2011 Jean-Baptiste Queru <jbq@google.com> partial build fix

Change-Id: I34fe778ac366d702b9eb626feaedda05e69e8361
ser_tags.mk
3b6bf4484ec012c94bfee35f5bd5ffdd78d2c600 30-Jan-2011 The Android Open Source Project <initial-contribution@android.com> Mass merge from gingerbread - do not merge

Change-Id: Idbfeda9c0a9720d894352747c01754ed2c90c44d
e0d4dbad5a4c24ac3288e90874686442e2c74afc 29-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am a4781e86: Merge from open-source gingerbread

* commit 'a4781e867f2e9115ce5b8085576bebf6505bfd00':
CTS: pass vogar expectation location to CollectAllTests.
3a7e4ccad9c910ac798a8c324f7718d137bd7692 28-Jan-2011 Ying Wang <wangying@google.com> Unify use of $(hide).

Change-Id: Ib7e17bbb4682caecce5812e63de872b676403d64
ombo/HOST_darwin-x86.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
efinitions.mk
f5653d1cee10cd8995217e0831678a3610544b20 28-Jan-2011 Ying Wang <wangying@google.com> Regularize use of PRIVATE_CXX.

Change-Id: Ifc628c67b5fa142cec59187f89f2d39df81160b9
ombo/HOST_darwin-x86.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
a02d3d9f746a0cd267bd793fca256f355111484b 28-Jan-2011 Ying Wang <wangying@google.com> Break down the buge shell command line preparing whole static libraries.

This can fix the "@: command not found" messages, which is caused by "@"
in the middle of the shell command line.

Change-Id: I444827458045efcbc70a6e1e43bf4ee040e71b79
efinitions.mk
2039512c305c8fb21cdce1e338fd36ebeec8ec85 27-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am 61356271: am e388ac10: Merge "Extra protobuf-related support"

* commit '6135627140bd799ee56ba894b69a9455ca0af86a':
Extra protobuf-related support
c61d4c91b6b31776665be3fcc7e4733b53e6c6e8 27-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Extra protobuf-related support

Change-Id: I375d32f0bcb695ccb0603743133034941d584163
ase_rules.mk
inary.mk
lear_vars.mk
efinitions.mk
53cebd72f7bf4fcc430c42f5eb925fec4c77d209 27-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am ad3e0072: am 39f358b7: Merge "Protobuf compiler support in the build system"

* commit 'ad3e00724d62e5def2f2552533a62a800e9f3ee9':
Protobuf compiler support in the build system
5a50ecee40fa2b5e49a8467b35509651f07fb3de 27-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am f273723f: am 1e0055fb: Merge "A few more grandfathered user tags"

* commit 'f273723f7710bb127ee1026e05049e4ee5290c8a':
A few more grandfathered user tags
79ee7bf896cb03c9c05df9aac644fdb055a37898 27-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Protobuf compiler support in the build system
ase_rules.mk
inary.mk
lear_vars.mk
onfig.mk
efinitions.mk
ava.mk
2497b6109bc61b503d1c2f4ca56b04aa4f6994aa 27-Jan-2011 Jean-Baptiste Queru <jbq@google.com> A few more grandfathered user tags

Change-Id: I57309b461ec2395da068961f976c904bd3474e88
ser_tags.mk
020e2fc14a28d6fd449fa37cf8bcbd4b0675238a 27-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am 928a0304: re-merge from readonly-korg-master - do not merge

* commit '928a03043187b7c4843b2c832b589c57b7541e4a':
re-merge from readonly-korg-master - do not merge
928a03043187b7c4843b2c832b589c57b7541e4a 27-Jan-2011 Jean-Baptiste Queru <jbq@google.com> re-merge from readonly-korg-master - do not merge

Change-Id: Ifc1e39261e1fcaefc1e314d994e71115624643a2
ser_tags.mk
4fd2ef057afc7e9842b608fa54ffe40a3552f9f1 27-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Add a few more legacy modules that can have user tags - do not merge

Change-Id: I198d3eb34958e46ccba145bd05452027cba5e464
ser_tags.mk
a74f42001a142c95fcd68b5b48414de0b53ff1a9 27-Jan-2011 Brian Carlstrom <bdc@google.com> am 56c35da7: am bb219fc3: Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY

* commit '56c35da7fbc21acbf7297ffff3b7e474c4ac4198':
Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
56c35da7fbc21acbf7297ffff3b7e474c4ac4198 27-Jan-2011 Brian Carlstrom <bdc@google.com> am bb219fc3: Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY

* commit 'bb219fc3dc29e832f3cd8e435c94a894ef2ee87f':
Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
bb219fc3dc29e832f3cd8e435c94a894ef2ee87f 27-Jan-2011 Brian Carlstrom <bdc@google.com> Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY

Bug: 3086427
Change-Id: Ibe73dfa70d4c3d82968c43e74ced38cd74f60e0f
ost_java_library.mk
80e6cce93e36787be9123f9b5dc91da1a0d2f472 25-Jan-2011 Ying Wang <wangying@google.com> Correct misuse of target/host vars.

Change-Id: Ide41aeddc44ca05d85a36035c2d55ea453cfd216
ombo/HOST_darwin-x86.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
efinitions.mk
3d85bbd288cac078ae8938b8be5d243f77535a30 24-Jan-2011 Ying Wang <wangying@google.com> Merge "Add modifier goal incrementaljavac"
97f3f086224cc9bd804aa4c01d923f833d14f81c 24-Jan-2011 The Android Automerger <android-build@android.com> resolved conflicts for merge of b5952289 to master

Change-Id: I792d34aed36200b85512aadc212503a3c1da140f
b5952289e2dd0d84671881422a60df305193e964 24-Jan-2011 The Android Automerger <android-build@android.com> resolved conflicts for merge of 733ce0d0 to honeycomb-plus-aosp

Change-Id: Ic962c4e2611c31af1da96269d70216b27aa3a18d
7cc24409946e0d2f6a3d44ab44e9d2d192e945ef 24-Jan-2011 Brian Swetland <swetland@google.com> make TINY_ANDROID build without the presence of frameworks/* and development/*

Change-Id: I795e27a9ce837b193c6d8d0516e2f523c17214e2
ey_char_map.mk
ain.mk
72bf09d33313c2b9a191b549dcb5e717bff9a600 24-Jan-2011 Brian Swetland <swetland@google.com> tiny android: include su

Change-Id: Ib8162c0f8171114ffafcac48d482fd3acd5d5956
ain.mk
733ce0d0cc0431d254eea11a044210dc24b11e08 23-Jan-2011 Dianne Hackborn <hackbod@google.com> DO NOT MERGE. Hello, Android 3.0 API 11.

Change-Id: Id859b752fc87fd050005c32665f2f019e177cf95
ersion_defaults.mk
015edd2c1b4a4300ccccee4036ec2ca7e9ad798a 21-Jan-2011 Ying Wang <wangying@google.com> Add modifier goal incrementaljavac

With "incrementaljavac" on your make command line, you will recompile
only Java source files that have been changed since last build.
Nothing is changed if "incrementaljavac" is not among your make goals.

Change-Id: Iae591459827df81ac91e95292464db5e9828343a
ase_rules.mk
efinitions.mk
ain.mk
1d4e3fdeb4d31c12e0d533eb50e335691a4956dc 22-Jan-2011 Ed Heyl <edheyl@google.com> am 7e1ce27c: Merge commit \'50738779\' into gingerbread-plus-aosp

* commit '7e1ce27c08ec57032520613488ec2fe5b3795126':
DO NOT MERGE Fix issue #3373438: Update GBMR versions
43b1bb5be1e43ad8d430540e395c2216ace6c2a4 21-Jan-2011 Jean-Baptiste Queru <jbq@google.com> (Re-)Set version names for AOSP master - do not merge

Change-Id: I0973090ebf00a9e0deb8ec2beb0f39fa93bc03c1
uild_id.mk
ersion_defaults.mk
fce88928fef25777a0e409e2ed6e19fe0da0b8c6 21-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge

This reverts commit 7e1ce27c08ec57032520613488ec2fe5b3795126, reversing
changes made to 7dfc1270967c96be6dcd58fb7770c07482a7e90d.

Change-Id: I2b4c33ad56a12612f2fc05845428409d7023f683
ersion_defaults.mk
7e1ce27c08ec57032520613488ec2fe5b3795126 21-Jan-2011 Ed Heyl <edheyl@google.com> Merge commit '50738779' into gingerbread-plus-aosp

Conflicts:
core/version_defaults.mk

Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
4d9fee9e9c59d1e16ef629dbec69e186c3014cf6 21-Jan-2011 Brian Swetland <swetland@google.com> am cb6fbf88: am a7600364: fix tiny android build

* commit 'cb6fbf88db9e29f761045dbe9ece975f178ff71e':
fix tiny android build
cb6fbf88db9e29f761045dbe9ece975f178ff71e 21-Jan-2011 Brian Swetland <swetland@google.com> am a7600364: fix tiny android build

* commit 'a7600364feb0eff313374e9dd0502ea7e15085f6':
fix tiny android build
a7600364feb0eff313374e9dd0502ea7e15085f6 21-Jan-2011 Brian Swetland <swetland@google.com> fix tiny android build

Change-Id: Ifa6cda67f54969588b5c4e9f900ac2d4ba607e71
Signed-off-by: Brian Swetland <swetland@google.com>
ain.mk
50738779d90970a3e36fe40a78df724946f323db 20-Jan-2011 Dianne Hackborn <hackbod@google.com> DO NOT MERGE Fix issue #3373438: Update GBMR versions

Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
ersion_defaults.mk
ea482c78e3efbf231eaf3c9a49e07f3c42f0332b 19-Jan-2011 Ying Wang <wangying@google.com> am 4d3ac24d: am 84ed6fa2: Disable "-t" for acp.

* commit '4d3ac24dafab161a44fddb1039159b1b484f5841':
Disable "-t" for acp.
4d3ac24dafab161a44fddb1039159b1b484f5841 19-Jan-2011 Ying Wang <wangying@google.com> am 84ed6fa2: Disable "-t" for acp.

* commit '84ed6fa27b883de8ba7b41ddecaa2179e7f4b321':
Disable "-t" for acp.
84ed6fa27b883de8ba7b41ddecaa2179e7f4b321 19-Jan-2011 Ying Wang <wangying@google.com> Disable "-t" for acp.

Acp can not handle high resolution file timestamp on ext4.
We need this to fix incremental build on ext4.

Change-Id: I54e45c73ffa44c4253c7a431375d419fa4dccfd9
ase_rules.mk
efinitions.mk
ex_preopt.mk
ava.mk
49086372f7b882806b7b30676e7b4c369d1a8f36 19-Jan-2011 Ying Wang <wangying@google.com> am df3a8ab5: am 85aa5ded: Add external/clang/lib/Headers as llvm-rs-cc\'s system header search path

* commit 'df3a8ab5aa32ca470774939b0fde5111faf5320b':
Add external/clang/lib/Headers as llvm-rs-cc's system header search path
df3a8ab5aa32ca470774939b0fde5111faf5320b 19-Jan-2011 Ying Wang <wangying@google.com> am 85aa5ded: Add external/clang/lib/Headers as llvm-rs-cc\'s system header search path

* commit '85aa5ded4ca0338f7c0c8d4256143364ca2cea38':
Add external/clang/lib/Headers as llvm-rs-cc's system header search path
85aa5ded4ca0338f7c0c8d4256143364ca2cea38 19-Jan-2011 Ying Wang <wangying@google.com> Add external/clang/lib/Headers as llvm-rs-cc's system header search path

Change-Id: I30257631d484491d9a8346205e411013c76c5a91
Bug: 2943524
ava.mk
b3acbc3195a5c960b4a63cd6855caf4356fc4fe0 19-Jan-2011 Kristian Monsen <kristianm@google.com> am def863f7: am da7575bc: Making more space for libwebcore.so

* commit 'def863f719be1a6a1f4725b77f64df2f2526584b':
Making more space for libwebcore.so
def863f719be1a6a1f4725b77f64df2f2526584b 19-Jan-2011 Kristian Monsen <kristianm@google.com> am da7575bc: Making more space for libwebcore.so

* commit 'da7575bc70ace95aba75f40f79ed46b4ab1a9913':
Making more space for libwebcore.so
88005e9746602591c06de96446170d7b21448980 19-Jan-2011 Rebecca Schultz Zavin <rebecca@android.com> am 1ec15e1e: am d64f0edd: Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb

* commit '1ec15e1e837212f1e90e0b1b52b05f35a8024c94':
Include batch in legacy prebuilts with tcmd and ftmipcd.
da7575bc70ace95aba75f40f79ed46b4ab1a9913 17-Jan-2011 Kristian Monsen <kristianm@google.com> Making more space for libwebcore.so

Taking half the space of libexpat.so and libbinder.so so there
is still room to grow (webkit mergers tend to make libwebcore
larger)

Change-Id: I6d5bf385221c8e199e587c3a7c8c9425a15a5bb6
relink-linux-arm.map
1ec15e1e837212f1e90e0b1b52b05f35a8024c94 18-Jan-2011 Rebecca Schultz Zavin <rebecca@android.com> am d64f0edd: Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb

* commit 'd64f0edd649880cb7de769f0f373ddf520dd22d3':
Include batch in legacy prebuilts with tcmd and ftmipcd.
d64f0edd649880cb7de769f0f373ddf520dd22d3 18-Jan-2011 Rebecca Schultz Zavin <rebecca@android.com> Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb
4e74e30a6a03f509d36003d0ae1d6319fc3ebab9 12-Jan-2011 James Wilson <james.wilson@motorola.com> Include batch in legacy prebuilts with tcmd and ftmipcd.

Change-Id: Iad6d7974bfadd3467270033f982de0642657d472
Signed-off-by: James Wilson <james.wilson@motorola.com>
egacy_prebuilts.mk
3ed1dd8af07ea426070c52baa1234ed7fbe2eead 18-Jan-2011 Shih-wei Liao <sliao@google.com> am 500c0537: am 10aab0ef: Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb

* commit '500c053777494927929999d48df6aa5b01847ec8':
Remove libbcc and libLLVM* from the grand-fathered modules.
500c053777494927929999d48df6aa5b01847ec8 18-Jan-2011 Shih-wei Liao <sliao@google.com> am 10aab0ef: Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb

* commit '10aab0ef97efc626c5bb2b239061a38924fc6a13':
Remove libbcc and libLLVM* from the grand-fathered modules.
10aab0ef97efc626c5bb2b239061a38924fc6a13 18-Jan-2011 Shih-wei Liao <sliao@google.com> Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb
b346a7e4fddd1c3446bfa20423f580995bad2699 18-Jan-2011 Ying Wang <wangying@google.com> am fa2aca54: am 4162f45c: Merge "Don\'t increase image sizes for the release tools." into honeycomb

* commit 'fa2aca54b215c51e4d5cf21f1e16b26adbbe57d2':
Don't increase image sizes for the release tools.
fa2aca54b215c51e4d5cf21f1e16b26adbbe57d2 18-Jan-2011 Ying Wang <wangying@google.com> am 4162f45c: Merge "Don\'t increase image sizes for the release tools." into honeycomb

* commit '4162f45c90c083b55b8c8d134faad6e1817ea960':
Don't increase image sizes for the release tools.
4162f45c90c083b55b8c8d134faad6e1817ea960 18-Jan-2011 Ying Wang <wangying@google.com> Merge "Don't increase image sizes for the release tools." into honeycomb
0c71bf7ac63a78fbac606e5b4d33281ab613c149 17-Jan-2011 Shih-wei Liao <sliao@google.com> Remove libbcc and libLLVM* from the grand-fathered modules.

Change-Id: I7030cdbe6e51c42a4053d7ab8a47a705bff72be7
ser_tags.mk
1ff250d486458c35ac2fa60624ec4019f4e6d8fc 17-Jan-2011 Dianne Hackborn <hackbod@google.com> am a24ed68e: am 68404ba4: Bump API version up to 10, thus resource version up to 11.

* commit 'a24ed68eee3465565a8d1251e7339eadecc2969a':
Bump API version up to 10, thus resource version up to 11.
755bed4cc8ed20449f807feeff44e98c8b20c3ba 16-Jan-2011 David 'Digit' Turner <digit@android.com> Merge "Add support for custom Linux host toolchains when building the SDK."
a24ed68eee3465565a8d1251e7339eadecc2969a 16-Jan-2011 Dianne Hackborn <hackbod@google.com> am 68404ba4: Bump API version up to 10, thus resource version up to 11.

* commit '68404ba40ef52b7c5da5425fd51f99ae3434bfa0':
Bump API version up to 10, thus resource version up to 11.
68404ba40ef52b7c5da5425fd51f99ae3434bfa0 16-Jan-2011 Dianne Hackborn <hackbod@google.com> Bump API version up to 10, thus resource version up to 11.

Change-Id: I305999c2ff71cc5985d0fc50e496c40e789d3af0
ersion_defaults.mk
60a1e8805290267d6c8f32051f25e6f21fae909a 12-Jan-2011 David 'Digit' Turner <digit@android.com> Add support for custom Linux host toolchains when building the SDK.

This is needed in order to build Linux SDK binaries that can run
properly on Ubuntu 8.04 (Hardy). By default, the host toolchain
on 10.04 (Lucid) generates machine code that won't run on Hardy
due to GLibc ABI mistmatches.

Note that nothing happens if the new toolchain is not in the
prebuilt tree.

Change-Id: I914f5a303f16b6871759ce5a7178585ed3060870
ombo/HOST_linux-x86.mk
efinitions.mk
27016763c7c0e568fb8eb26ab3d30282f027a72d 15-Jan-2011 Jean-Baptiste Queru <jbq@google.com> merge from gingerbread

Change-Id: I05a6bed8b7275114ce545a7a45f2e13bf5469ec0
aea85c1f9ba2f1ff37a834ae30519fc06ccb4f40 15-Jan-2011 Jesse Wilson <jessewilson@google.com> Merge "Move apache-xml to external. (project 3 of 4)"
163c718228b8c1dc9a760ee91fb88a1c20d26fd3 14-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am 4125d8ee: am a4781e86: Merge from open-source gingerbread

* commit '4125d8ee68bec37fe471faeca7dfade73a7a1592':
CTS: pass vogar expectation location to CollectAllTests.
4125d8ee68bec37fe471faeca7dfade73a7a1592 14-Jan-2011 Jean-Baptiste Queru <jbq@google.com> am a4781e86: Merge from open-source gingerbread

* commit 'a4781e867f2e9115ce5b8085576bebf6505bfd00':
CTS: pass vogar expectation location to CollectAllTests.
a4781e867f2e9115ce5b8085576bebf6505bfd00 14-Jan-2011 Jean-Baptiste Queru <jbq@google.com> Merge from open-source gingerbread

Change-Id: I7dce3075bab5831b48a66ef43a32a2be82eda19a
008367111ee3429bfe33d8d8021493596d3c1d6a 14-Jan-2011 Ying Wang <wangying@google.com> Don't increase image sizes for the release tools.

So it keeps consistent with the command run in the makefile.

Change-Id: Id26fa3387aa9bbab88c4ef3fbd26aff0d039c2e1
akefile
7eff81df2ac6c6feeba02bfb9956ac45550cedbe 14-Jan-2011 Jesse Wilson <jessewilson@google.com> Move apache-xml to external. (project 3 of 4)

Change-Id: Ib65348e4203e6ac653e9fe81369b21dad06b5b58
http://b/3351604
ex_preopt.mk
d3e6fcbe6cfc531719429b7fec844565aa8089e7 12-Jan-2011 Raphael <raphael@google.com> Add llvm-rs-cc to the tools buildable under Windows.

To be able to "make llvm-rs-cc" as a Windows SDK tool, we
first need to let the build system know which folders can be
built.

Once this is done, building can be done using the mingw32
package to do cross-compiling under Linux:
$ USE_MINGW=1 make llvm-rs-cc

Change-Id: I5538f4c52c74dad18dd50b59c9bdbcd6de3fd191
ain.mk
94978cf495879120c2dadf7afb2058688546be09 12-Jan-2011 Ying Wang <wangying@google.com> Disable dexpreopt for unbundled build.

Change-Id: Iad0cc41cfad2533703a0dddad743720c43ddb667
ava_library.mk
ackage.mk
fdb400cf2040f6d336e88112295b7ec4afee9471 14-Dec-2010 Brett Chabot <brettchabot@android.com> CTS: pass vogar expectation location to CollectAllTests.

Bug 3181338

Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658
asks/cts.mk
79609e35883de164fe9630c32409a897d3a6d81a 07-Jan-2011 Ying Wang <wangying@google.com> am a712543e: Don\'t prepend ./ before the dirs to be removed

* commit 'a712543ec35bd834ad52d47375ab7ec04b8ed3f7':
Don't prepend ./ before the dirs to be removed
7e41e31038402395541a7323b1ba75faf91817c7 06-Jan-2011 Dianne Hackborn <hackbod@google.com> We. Are. Honeycomb!

Change-Id: Ife02e57541fe6be14d62619b98fddba57a8132f4
ersion_defaults.mk
ce7b1d5827df6316c433f851b95a77795e5e048c 06-Jan-2011 Raphael Moll <ralf@android.com> am e503fcd5: am 7e27c8e1: Merge "Pass OUT_DIR variable to atree."

* commit 'e503fcd52ec8bbcc9fd4ea4b242f73c6c2cae3d3':
Pass OUT_DIR variable to atree.
e503fcd52ec8bbcc9fd4ea4b242f73c6c2cae3d3 06-Jan-2011 Raphael Moll <ralf@android.com> am 7e27c8e1: Merge "Pass OUT_DIR variable to atree."

* commit '7e27c8e15507d62a0ac0b094bc7cfca15f6cc509':
Pass OUT_DIR variable to atree.
7558ad55ce34db67cc17059faade2a5908e20c8a 05-Jan-2011 Raphael Moll <ralf@android.com> Pass OUT_DIR variable to atree.

Change-Id: Iabbe905341dfe970448682a9dcbb170a04ad5222
akefile
7fcc6d6a0095be03edb781855994392d08711c8c 05-Jan-2011 Jing Yu <jingyu@google.com> Merge "Remove global inline options."
3781dcfc26fa7f42956a45f61b8829809066ea2d 05-Jan-2011 Jeff Brown <jeffbrown@google.com> Merge "Add libinput to prelink map."
096bb3dd0057ab232c3628c8cbc068ffa121c472 04-Jan-2011 Ying Wang <wangying@google.com> Don't prepend ./ before the dirs to be removed

So that installclean can be done properly when OUT_DIR is set to an
obsolute path, such as /buildbot/out_dirs/git_gingerbread.
Bug: 3321625

Change-Id: I87667355aa03f31613a8f6a5e17d7e469bf5335f
leanbuild.mk
1537529f158e39f94f7930fdc97f93be490bdbae 05-Jan-2011 Jeff Brown <jeffbrown@google.com> Add libinput to prelink map.

Change-Id: I26998d4799d26165b3f528d1cd292b212eaaab9d
relink-linux-arm.map
a712543ec35bd834ad52d47375ab7ec04b8ed3f7 04-Jan-2011 Ying Wang <wangying@google.com> Don't prepend ./ before the dirs to be removed

So that installclean can be done properly when OUT_DIR is set to an
obsolute path, such as /buildbot/out_dirs/git_gingerbread.
Bug: 3321625

Change-Id: Ibb9c86e514ebc5f1f821ca04ed9a0a83b37787df
leanbuild.mk
b1db5a9d906c99abf1d9e6e5001bf8cd0544ca60 29-Dec-2010 Ying Wang <wangying@google.com> Merge "Enhance product vars examining."
f9953b4a613d378cdb5cc18c1fa46ad3512eb0b9 29-Dec-2010 Ying Wang <wangying@google.com> Enhance product vars examining.

Change-Id: I348629aa6e63ad24d457e91af8f75712dcf91b27
roduct.mk
95e3d95280442fa146fc7ef852200bf5400ee6c2 29-Dec-2010 Mike Lockwood <lockwood@android.com> Add libmtp and libusbhost to prelink map

Change-Id: I7e81edcbb24778143a01039e9cb12f22a922e00a
Signed-off-by: Mike Lockwood <lockwood@android.com>
relink-linux-arm.map
54c5e5b18be967a46fbee8769c392cbe0dfe7530 28-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am 1b8c01db: Merge "Product-configurable sparse ext images."

* commit '1b8c01dbee93366e31b67529a26e1a7b6198c876':
Product-configurable sparse ext images.
085a14698b5d99b0b93ac70ea428c3c9e2277be2 18-Nov-2010 Ying Wang <wangying@google.com> Product-configurable sparse ext images.

Also pass extfs sparse image flag to the release tool.

Change-Id: I79a6a71873634a231aa8990cee22374259601505
akefile
onfig.mk
8b07ed87fac07337f82f96613aa4e3f6170b279b 28-Dec-2010 Ying Wang <wangying@google.com> LOCAL_AAPT_INCLUDE_ALL_RESOURCES

Set this flag to include all the resources in the given dirs.
Bug: 3313179

Change-Id: I68c02b24174bebe41a5948810cc2f49cc916e51c
lear_vars.mk
ackage.mk
a83b769566550e30b368836e77b5ac3286844768 22-Dec-2010 Jing Yu <jingyu@google.com> Remove global inline options.

The purpose of removing global inline options is to give
compiler the opportunity to do inline optimizations and inline
tunings for Android native codes.

By removing these global inline options now, the size of
almost all native libraries are reduced. And there is no
noticable performance degradation on webkit, gcstone and
skia benchmarks.

Change-Id: I31e71f51e4f29fa6286fddb89e9eab227581c7b3
ombo/TARGET_linux-arm.mk
085ff6a8ac90e989507097885eaf65c9587c2c96 20-Dec-2010 Ying Wang <wangying@google.com> am 098826bf: am 099fecd7: Use PRIVATE_CXX in HOST modules.

* commit '098826bf61cba2b14a0538100878bdb029f50790':
Use PRIVATE_CXX in HOST modules.
098826bf61cba2b14a0538100878bdb029f50790 20-Dec-2010 Ying Wang <wangying@google.com> am 099fecd7: Use PRIVATE_CXX in HOST modules.

* commit '099fecd759ce54168fe4094880d1ca748e8906b9':
Use PRIVATE_CXX in HOST modules.
099fecd759ce54168fe4094880d1ca748e8906b9 20-Dec-2010 Ying Wang <wangying@google.com> Use PRIVATE_CXX in HOST modules.

This fixes the build error:
out/host/linux-x86/obj/SHARED_LIBRARIES/libneo_util_intermediates/neo_err.o:
file not recognized: File format not recognized
See also CL #84578

Change-Id: Ib91230c7a5c9809eb1935959eaa9be8fa7c596b9
efinitions.mk
76aa8d0a8bc753b1fffa239609d4364699fec6cc 15-Dec-2010 Jean-Baptiste Queru <jbq@google.com> update API version to 9

Change-Id: Ia573996bb910e19c8f7017ca13cf9d9d77083404
ersion_defaults.mk
3463d0e1026263d9d740c3324138a346b0c9006d 15-Dec-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE

Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
c1b330818e06cf5a3dc8d342e941eba5bce0929a 14-Dec-2010 Dianne Hackborn <hackbod@google.com> (DO NOT MERGE) Issue #3255640: Need to bump GB to API 10 version name "2.4"

We are now version 2.4, API 10.

Change-Id: I5876ee7cdd1c6e4115dbe79d426f678e8d354449
ersion_defaults.mk
1214aeb75f9b506ebaa5856f2cea6bd8967ede51 14-Dec-2010 Ying Wang <wangying@google.com> Add framework includes for any aidl source.

Before this change, only aidl in apps gets the framework directories in
their include path.

Change-Id: Ieeaa162f577ea280fe71e4959cc73176b4dfd8ad
ase_rules.mk
ackage.mk
02e172e892190c1c94539594d639776c4b24efdf 14-Dec-2010 David 'Digit' Turner <digit@google.com> am efc5d814: am 15f4980d: Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread

* commit 'efc5d81428a8c7d9cf7cb7b3a5f1a8344b02a700':
Add support for custom Linux host toolchains when building the SDK.
efc5d81428a8c7d9cf7cb7b3a5f1a8344b02a700 14-Dec-2010 David 'Digit' Turner <digit@google.com> am 15f4980d: Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread

* commit '15f4980d510824113a4d2b71d70de9c67715f3dc':
Add support for custom Linux host toolchains when building the SDK.
15f4980d510824113a4d2b71d70de9c67715f3dc 14-Dec-2010 David 'Digit' Turner <digit@google.com> Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
b531c0b44c28323432c92db5dd05bce78b894041 13-Dec-2010 Brian Carlstrom <bdc@google.com> Merge "Unify target and host Java compilation"
782695112d42ea3b9992e7c5f10a76f1854343d4 10-Dec-2010 Brian Carlstrom <bdc@google.com> Unify target and host Java compilation

This changes tries to reconcile drift between
transform-java-to-classes.jar which is used to build java for the
target with transform-host-java-to-package which is used for the
host. Several packages such as libcore are built both ways and the
drift between these rules was making it hard to make common changes to
things such as warning options.

The new compile-javac definition tries to include as much as possible
from the two previous definitions. Some conflicts it sorts out:
- hardwired -g vs PRIVATE_JAVAC_DEBUG_FLAGS
- consistent order of arguments
- moving PRIVATE_JAVAC_FLAGS to end to allow override of arguments
- xlint_unchecked is always conditional based on LOCAL_WARNINGS_ENABLE

Now what differs between the two is clear in the
transform-java-to-classes and transform-host-java-to-package
definitions. Notable differences:
- the target case supplies a bootclasspath while the host case does not.
- .class files are cleaned up after jaring in the target case,
but in the cost case they are left for the sake of the vm-tests target
which expects them to be present. That should probably be fixed in the future.
- PRIVATE_EXTRA_JAR_ARGS used to package resources into the jar only
happens for the host. Its handled by add-java-resources-to-package for the
target after dxing.

Change-Id: I2fb28f688fbb632102ca63448c2ac911db0477ae
efinitions.mk
0960ca748804b772453ebe50d212a691c1a6c066 10-Dec-2010 David 'Digit' Turner <digit@google.com> Add support for custom Linux host toolchains when building the SDK.

This is needed in order to build Linux SDK binaries that can run
properly on Ubuntu 8.04 (Hardy). By default, the host toolchain
on 10.04 (Lucid) generates machine code that won't run on Hardy
due to GLibc ABI mistmatches.

Note that nothing happens if the new toolchain is not in the
prebuilt tree.

Change-Id: I45c1f68e37e15a0032f885df1c5c0f297b3d8642
ombo/HOST_linux-x86.mk
efinitions.mk
953b64f48aa601d40645897cb9d980606c2e40cc 11-Dec-2010 Ying Wang <wangying@google.com> am 1f22360f: am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread

* commit '1f22360f60455ff9a486a6c757d1b974341c1895':
Default uninstallable modules' tag to optional
1f22360f60455ff9a486a6c757d1b974341c1895 11-Dec-2010 Ying Wang <wangying@google.com> am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread

* commit 'c79736785716d56768998d64317ff90a62073868':
Default uninstallable modules' tag to optional
c79736785716d56768998d64317ff90a62073868 11-Dec-2010 Ying Wang <wangying@google.com> Merge "Default uninstallable modules' tag to optional" into gingerbread
2fd81cf11e3ebc8550f6ceee9328c5cb021b9619 10-Dec-2010 Ying Wang <wangying@google.com> Default uninstallable modules' tag to optional

Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de
ase_rules.mk
1840de544bf82ddfb1b6a23cb828fd52b0880f6c 09-Dec-2010 android-merger <android-merger@google.com> 2.3.1

Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8
ersion_defaults.mk
0c3d5d9541fd254963355af83e47ad0696115adb 09-Dec-2010 android-merger <android-merger@google.com> 2.3.1

Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486
ersion_defaults.mk
228fcef025cf827428a812a182bce0e9b7ee2b0b 09-Dec-2010 Ying Wang <wangying@google.com> Change phony target name dist_libraries to dist_files.

Any module that does not build in apps_only build should not dist for the
default goal "droid" -- they sould dist for "dist_files" instead.

Change-Id: I8696f1ea803fbd8554ec03352e0ef369f5d7be0d
ain.mk
1ee80eefc7696cd7affb1436bc351d500ba02d78 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am dbd43691: am 3ef1d674: am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."

* commit 'dbd43691870fa64d1ad79371e3d796ed8e63b3b9':
Make image-size-from-data-size not use hard coded values.
dbd43691870fa64d1ad79371e3d796ed8e63b3b9 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am 3ef1d674: am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."

* commit '3ef1d674806734c2e237a54815ea5c077ce8c344':
Make image-size-from-data-size not use hard coded values.
3ef1d674806734c2e237a54815ea5c077ce8c344 07-Dec-2010 Jean-Baptiste Queru <jbq@google.com> am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."

* commit '4985f06f4e96351c77b88b20bc9ded65daefcd3e':
Make image-size-from-data-size not use hard coded values.
1cf9e0ef16fe5033c4ec423861ce459f283237a0 06-Dec-2010 Brian Muramatsu <btmura@google.com> Change from @ to $(hide) in CTS Build

Change-Id: Ibda485105f750e971260088785904ea420cbaa03
asks/cts.mk
9cb8c2835232c8dc99cecca85a7e99bdee7109a9 06-Dec-2010 Lars Svensson <lars1.svensson@sonyericsson.com> Make image-size-from-data-size not use hard coded values.

The function image-size-from-data-size was using hard
coded values. The size of spare area and pages has become
configurable so we need to read from the variables.

Change-Id: I9461d34400ffc2cc5920860d8aa78750d559e397
akefile
efinitions.mk
696180ecda5d5dcc894e70e2583fe4ef7a2631e3 03-Dec-2010 Kenny Root <kroot@google.com> Add installd to PRODUCT_PACKAGES

Another change adds the "optional" tag to installd, so moving it here
and removing it from the grandfathered list.

Change-Id: I035ffd527d007cf104c15890509976fc9b99d216
ser_tags.mk
ff83c8593ec3fbcd916227cd4745404fc3bf1ea8 30-Nov-2010 Sriram Raman <sriramkraman@google.com> resolved conflicts for merge of 064a4562 to master

Change-Id: I795e2b6ba842541fc941c1da396734198a12ea72
064a4562a42982854116ab07e5dd4d22fbe77ce1 30-Nov-2010 Sriram Raman <sriramkraman@google.com> am c647aeca: Add mkuserimg.sh, make_ext4fs to otatools

* commit 'c647aecabb9cf03d73cfc34836e3bfc886b54c2e':
Add mkuserimg.sh, make_ext4fs to otatools
c647aecabb9cf03d73cfc34836e3bfc886b54c2e 30-Nov-2010 Sriram Raman <sriramkraman@google.com> Add mkuserimg.sh, make_ext4fs to otatools

Change-Id: Id48d6643f4579d695685fe2595bd86a80a5083c3
akefile
3f43f962807f3b6207396ca5c77914439c160416 24-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 29ead582: am d2dd8652: Merge "Added generic hook for loading vendor specific tasks."

* commit '29ead58259d47997d7caedf9080f4a2f9c9bd358':
Added generic hook for loading vendor specific tasks.
29ead58259d47997d7caedf9080f4a2f9c9bd358 24-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am d2dd8652: Merge "Added generic hook for loading vendor specific tasks."

* commit 'd2dd86529982cd05b4010248cea368fbef763ef2':
Added generic hook for loading vendor specific tasks.
e22ad6784ca5123fd0dcd6c1c18beb47bfd3ae20 12-Nov-2010 Claes Elgemark <claes.elgemark@sonyericsson.com> Added generic hook for loading vendor specific tasks.

With this change it is possible for vendors to create rules that depend on
targets defined in Android.mk files.

This makes it easier to decouple functionality from the core buildsystem.
Very much as is done within the build git for tasks like creating SDK addon,
Generating eclipse .classpath file etc can then be done for vendors as well.

You can add targets that could perform poststeps on produced modules.
E.g. Do static verification or documentation on modules of a certain type.
You can e.g. create a target that would resign and upload all apks to a
binary repository.

Change-Id: Ic0fa7b60b919ede3c59fa2885d1fd4be1e928c04
akefile
cbc0f4442e34b765551811f7873fd82a987ac1a9 24-Nov-2010 Jeff Brown <jeffbrown@google.com> Delete the tuttle keymaps.

These files have been obsolete for years.

Change-Id: I489d22799dd0fd476b6afe296e24434d437ea75b
egacy_prebuilts.mk
ser_tags.mk
493ab6449c6443760d69707fdbe574254c71e85c 23-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am ce5d7e04: am 7fbeda2b: Merge "Adding `all\' to INTERNAL_MODIFIER_TARGETS to fix `make all\'"

* commit 'ce5d7e04a8550724b3c7dc54f84e68fbcbdb3fcb':
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
ce5d7e04a8550724b3c7dc54f84e68fbcbdb3fcb 23-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 7fbeda2b: Merge "Adding `all\' to INTERNAL_MODIFIER_TARGETS to fix `make all\'"

* commit '7fbeda2b1ed2872b2e2ab2f7faf386a3755502df':
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
6ba4ebf272eccf5f98490a59d1381dde37ec1109 08-Nov-2010 Magnus Bäck <magnus.back@sonyericsson.com> Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'

Commit e334d255 added the `all' pseudo-goal (aka internal modifier
target) to have make dex all Java modules. Unfortunately the new
pseudo-goal wasn't added to INTERNAL_MODIFIER_TARGETS so no actual
phony goal was added, resulting in the obvious

make: *** No rule to make target `all'. Stop.

error message when running `make all'. This commit changes
INTERNAL_MODIFIER_TARGETS to also include `all' so that the
pseudo-goal is treated just like `showcommands' and `checkbuild'.

Change-Id: I7905c1e27d1b17bdc1b4331744bf06e18937406f
ain.mk
cdfcc058978a214b97dc041034028aba1970973b 20-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 6c7b6fb3: resolved conflicts for merge of b2028868 to gingerbread-plus-aosp

* commit '6c7b6fb3d2fda5cc5b881e01eb8bb0936ef0eeaf':
IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
1607ba1c87da6c6c9452c5d30d5c6b6944a30dcb 20-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 554eeb6c: am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"

* commit '554eeb6c7426c8c1df551516cff903d69ae94f26':
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
6c7b6fb3d2fda5cc5b881e01eb8bb0936ef0eeaf 19-Nov-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of b2028868 to gingerbread-plus-aosp

Change-Id: Ibe616c0bdf8e36aaee42279292a2dbe03c5643c2
b20288680e3708b02197b3dde107ef2c5728e60a 19-Nov-2010 Jean-Baptiste Queru <jbq@google.com> Merge "IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings"
ccec9c45d946d4a6fb3275469e39c4d7d203d9ab 14-Oct-2010 Bruce Beare <bruce.j.beare@intel.com> IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings

Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ombo/TARGET_linux-x86.mk
554eeb6c7426c8c1df551516cff903d69ae94f26 19-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"

* commit '493306f7c318d632186bebd732708d4299e66a62':
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
493306f7c318d632186bebd732708d4299e66a62 19-Nov-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
885b6b99d34fa5e6c22b4c17d3e5c78e9f74afc4 14-Oct-2010 Bruce Beare <bruce.j.beare@intel.com> Correct makefile test for stagefright build

Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
ain.mk
1804025f53148b9f04ea0437467f32a754c3a675 19-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am f41934fc: am 26d8c589: Merge "Display the TARGET_ARCH_VARIANT"

* commit 'f41934fcd42c56a02742014e8e24520a85166117':
Display the TARGET_ARCH_VARIANT
f41934fcd42c56a02742014e8e24520a85166117 19-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 26d8c589: Merge "Display the TARGET_ARCH_VARIANT"

* commit '26d8c5896e937ed677007c23d46d6759845fe91f':
Display the TARGET_ARCH_VARIANT
26d8c5896e937ed677007c23d46d6759845fe91f 19-Nov-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Display the TARGET_ARCH_VARIANT"
cc6c8cb856b408c9ac814d44ececcd1891c930f8 19-Nov-2010 Ying Wang <wangying@google.com> am 92cc4c07: am b26a65b5: Merge "Restrict make version to 3.81"

* commit '92cc4c07475bd77ffb058f430c27b04f8cc9dfef':
Restrict make version to 3.81
92cc4c07475bd77ffb058f430c27b04f8cc9dfef 19-Nov-2010 Ying Wang <wangying@google.com> am b26a65b5: Merge "Restrict make version to 3.81"

* commit 'b26a65b59ff5ed777accaf34ac06ab6a86dc37c6':
Restrict make version to 3.81
0c3909aacd9313a63c086771d437edd225635e5c 18-Nov-2010 Jeff Brown <jeffbrown@google.com> Merge "Revert change removing AVRCP.kl and cpcap-key.kl"
b96e34066ad97789603fc6c91a23c03f8ce2ffb2 18-Nov-2010 Jeff Brown <jeffbrown@google.com> Revert change removing AVRCP.kl and cpcap-key.kl

Cannot remove these legacy prebuilts yet because they are
referenced in the SDK.

Change-Id: I87b6d1145932edc9335b9a800672e7f653ce5521
egacy_prebuilts.mk
824d7b2f02f99f1661912203d530909fc242a741 18-Nov-2010 Kenny Root <kroot@google.com> Fix typo in ALL_PREBUILT error message

Change-Id: Ib59047e5c63950c84a6518a91ab6e5060c46ff21
ain.mk
fbc4018d63dca8bf97750677351ec943c7bc75f4 18-Nov-2010 Jeff Brown <jeffbrown@google.com> Merge "Use prebuilt keymaps in frameworks/base/data/keyboards."
4f9269ef7519354b3459ef510819ca5eec538b65 18-Nov-2010 Ying Wang <wangying@google.com> Restrict make version to 3.81

Bug: 3209290
It turns out that gmake 3.82 on Mac OSX crashes with segmentation fault
at some point.

Change-Id: I7b632abe1cafc5f0ff2ea45611d8ccf0aa3f976a
ain.mk
99aacc211ea62e6a143445d1809e19980f49b956 18-Nov-2010 Jeff Brown <jeffbrown@google.com> Use prebuilt keymaps in frameworks/base/data/keyboards.

Change-Id: I847167abaf5538a45f40df0ed5d69c9848284871
egacy_prebuilts.mk
c5a07ce038d7aeb62a5c02886cd2ecbf56687e9d 18-Nov-2010 Ying Wang <wangying@google.com> Pass extfs sparse image flag to the release tool.

Change-Id: Icb2a1c4fddb2b6153298ba1b849016aa3d792773
akefile
7ca5c913890ce16be32ecf3361f3b7fd995e3cbe 18-Nov-2010 Ying Wang <wangying@google.com> Merge "Product-configurable sparse ext images."
542903a27b5837ce04d57e14d888b43b06e9d82f 18-Nov-2010 Ying Wang <wangying@google.com> Product-configurable sparse ext images.

Change-Id: Ifd0ac14d7df331c9f6f1e3eee0722e07b4ab199a
akefile
onfig.mk
75220495d023cf71d4b70837b58b814c074dfd90 18-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 766a2a21: am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."

* commit '766a2a2125d41e8bfb88112601a34af08f47f7f1':
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
766a2a2125d41e8bfb88112601a34af08f47f7f1 18-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."

* commit '48ec6d6f814a70068c4632b468cd7872f34295ad':
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
a4716b26187217ce8c4ad8f021080605a39943c6 02-Aug-2010 Johnnie Birch <johnnie.l.birch.jr@intel.com> Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.

Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e
ombo/TARGET_linux-x86.mk
16e2f98395cd48fa93c23d11d55ac21db39a33c9 13-Nov-2010 Ficus Kirkpatrick <ficus@android.com> Fix a spelling error.

Change-Id: If89847fa16db4e2b30372678ab8f7117ad5fa0c6
ava.mk
8d458ab320274cbd77e2e4bc6b994d1b1d3148c2 12-Nov-2010 Xavier Ducrohet <xav@android.com> am f5f81fc7: am 01a9840b: Merge "Rename layoutlib_utils into ide_common"

* commit 'f5f81fc75e6f4ab598fab8876efc892243287def':
Rename layoutlib_utils into ide_common
f5f81fc75e6f4ab598fab8876efc892243287def 11-Nov-2010 Xavier Ducrohet <xav@android.com> am 01a9840b: Merge "Rename layoutlib_utils into ide_common"

* commit '01a9840ba7545d9175575cc3d95b2584b2dee31c':
Rename layoutlib_utils into ide_common
2e5ee27e9ed94babf291c507fee5aa2b00826e29 11-Nov-2010 Xavier Ducrohet <xav@android.com> Rename layoutlib_utils into ide_common

Change-Id: Iaa8275881dd1ee7d41c30f8b0d481253a6635271
ain.mk
e39dd6b0485cdc101c0c1e9e4ae1e85d7e53ad95 10-Nov-2010 Patrick Scott <phanna@android.com> Merge "Replace grep | head | awk | tr | tr with awk."
25939e224e1cc0522f9028d3decafa878c3b171c 09-Nov-2010 Joe Onorato <joeo@google.com> Set ro.build.characteristics to the value from PRODUCT_CHARACTERISTICS that's also passed to aapt.

Bug: 3144768
Change-Id: Ic1724c64d015de7a5c4f13709b91db51b8f10872
akefile
fa30f5b8c4bd2016cd116106cecdd360750040e2 05-Nov-2010 Patrick Scott <phanna@android.com> Replace grep | head | awk | tr | tr with awk.

Head was causing a SIGPIPE in grep that only appeared when using
distss. This wasn't causing any build problems but spewed a lot
of warnings.

However, this change trims the command from 5 proccesses to 1 which is
nice.

Change-Id: Iac846ec1d01a022976cfc5fd28091a720ab161e7
ackage.mk
c2da70dbc5fefe09cfe8842eaa83db5dd646a714 05-Nov-2010 Wink Saville <wink@google.com> Merge "Rename protoc to aprotoc."
33c0d952fcba713f00c1cafc8213274e642aee4c 05-Nov-2010 Ying Wang <wangying@google.com> Allow module-specific protoc flags.

You can add local protoc flags via LOCAL_PROTOC_FLAGS.

Change-Id: If246a4edafe1edcec6a7f193bde8ce3c83de745b
ase_rules.mk
inary.mk
lear_vars.mk
efinitions.mk
e789083c06e93ac2055be1789a749b45de522828 05-Nov-2010 Wink Saville <wink@google.com> Rename protoc to aprotoc.

With gLucid protoc is installed in the base system, by renaming
our version there will be no confusion about which compiler is
being used.

Change-Id: Id6900baacc7d57abee5dc5f694b013d7a42b35c6
onfig.mk
60293914c19681fcb6c933d53561f40af032bbda 05-Nov-2010 Ying Wang <wangying@google.com> Set the correct proto intermediate dir for native modules.

Change-Id: I008778de2b81ed0c029979a7865827a96bf44b51
ase_rules.mk
3d6bf975bd105b397956f9009ca6b7e5e5f2711d 05-Nov-2010 Ying Wang <wangying@google.com> Merge "Integrate protocol buffer compiler into the build system."
5cf0b2cf834dac6cc5263af30373a469dd3c60b0 04-Nov-2010 Ying Wang <wangying@google.com> Merge "'make dump-products' to dump products."
9e5d44b796e87b28950e0590c54e9db21e206eed 04-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 57723b52: Merge 7b393fd1 from open-source master

* commit '57723b52cdb446c751ba8e65fa060e7a4faf4907':
Add version_defaults.mk to be a prerequisite of build.prop
57723b52cdb446c751ba8e65fa060e7a4faf4907 04-Nov-2010 Jean-Baptiste Queru <jbq@google.com> Merge 7b393fd1 from open-source master

Change-Id: I5fee3ccbf7845d087e72848b4cec0198cd4afc26
2042cabf71d3528128f8b9f342833a0731785b51 03-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 6be29424: am 892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"

* commit '6be29424c60cb5e17ce0aacb026c1cb88a62428b':
build: Add spare size flag to mkyaffs2image
75947ef5efe12b6664bcec6528f528c6ee261b0b 03-Nov-2010 Chih-Wei Huang <cwhuang@linux.org.tw> Add version_defaults.mk to be a prerequisite of build.prop

The version_defaults.mk defines variables that may affect
the content of build.prop.

Change-Id: Iabb82459949bb6e7a91829c5b485aad331c50b72
akefile
cae4d12fd114babec4249123c56110b8e247fda1 03-Nov-2010 Ying Wang <wangying@google.com> 'make dump-products' to dump products.

Change-Id: I6a1e7ce5d54f47898199bfc9d29245c2598f733c
roduct_config.mk
462d26bd322ff934ed685da8939e4b63277a8987 03-Nov-2010 Ying Wang <wangying@google.com> Only copy once even if the first matched src:dest pair appears more than once.

Change-Id: I9bef6172a1123518e97e04190fb857f9ee2c7582
akefile
a5fc87a93713b1976c5bfdd602d1c6bd285e7533 03-Nov-2010 Ying Wang <wangying@google.com> Integrate protocol buffer compiler into the build system.

Bug: 3152546
Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
ase_rules.mk
inary.mk
lear_vars.mk
onfig.mk
efinitions.mk
ava.mk
6be29424c60cb5e17ce0aacb026c1cb88a62428b 02-Nov-2010 Jean-Baptiste Queru <jbq@google.com> am 892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"

* commit '892ea1eaadfa5b57948bb66bd3432e06c58188e1':
build: Add spare size flag to mkyaffs2image
53871886bd5d3ab286f822b92b2a1c39fc9b4959 06-Aug-2010 Naseer Ahmed <naseer@codeaurora.org> build: Add spare size flag to mkyaffs2image

Change-Id: Ib3a915ba5296d31f88cdc81e13da02f281dbdb9f
akefile
49b21018a618d1ba060f2aac4ddb9df7793c7a1e 28-Oct-2010 Daniel Sandler <dsandler@google.com> Merge "make help: prints a handy list of useful targets"
9566122c9d6b0c4844563f3af9185adf082c6155 28-Oct-2010 Daniel Sandler <dsandler@google.com> make help: prints a handy list of useful targets

A small step to making the platform build environment more
self-documenting.

Change-Id: I8f6cebe6cbd4cf89736da23e9d0d2a257ea422ee
elp.mk
ain.mk
3bab7f036c151f8fd8ff3e1ff058d8f07f01b647 28-Oct-2010 Brett Chabot <brettchabot@android.com> am 6e644e14: am ebf4b519: cherry pick \'CTS vm-tests depend on hostestlib\' into GB.
6e644e14cbe5e90ca869817bf91fa531403394f0 28-Oct-2010 Brett Chabot <brettchabot@android.com> am ebf4b519: cherry pick \'CTS vm-tests depend on hostestlib\' into GB.
ebf4b5190a83d4cd602f9ad21d89244bea0908aa 28-Oct-2010 Brett Chabot <brettchabot@android.com> cherry pick 'CTS vm-tests depend on hostestlib' into GB.

Original description:
CTS vm-tests now depend on hosttestlib.

Bug 3125713

Conflicts:

core/tasks/cts.mk

Change-Id: I9e364a9d9d2cae396691921424ca591beca05468
asks/cts.mk
c656030f7d97ef86b4b99ab860cf70a283df7924 23-Oct-2010 Shih-wei Liao <sliao@google.com> Turn off llvm-rs-link to make launch time go faster.

Change-Id: Idbbb5e24a269e3c9a1911b47b4fbb1616cef5803
efinitions.mk
6c75cb3752d51adfd3c7b72672f5abacdc4cf2bd 22-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 0332f0ac: Truly default to the full config.
0332f0ac1ec69082d337e9990b964b883e5cf689 22-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Truly default to the full config.

It is much better than generic for emulator-based work.

Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
nvsetup.mk
a1729fc593bbed525184e4fee14c18bf20100795 22-Oct-2010 Ben Cheng <bccheng@android.com> Merge "Insert directives to work around a CPU bug."
efd2489b39a840a66baa06a2f333e7c15d4ba383 22-Oct-2010 Ben Cheng <bccheng@android.com> Insert directives to work around a CPU bug.

Bug: 3117632
Change-Id: I2fb58e7093984d18d2d2d21edf687206f4ddab31
ombo/TARGET_linux-arm.mk
2923c45d393bfc84b02fbb7caf2df34320bd14dc 21-Oct-2010 Ying Wang <wangying@google.com> am 4038bbc4: am 09a00a67: Don\'t build update zip package if there is no kernel, or it\'s generic device.

Merge commit '4038bbc426776d8adc57d7c3c8123357b50b1615'

* commit '4038bbc426776d8adc57d7c3c8123357b50b1615':
Don't build update zip package if there is no kernel, or it's generic device.
894bf9c0a4c78f0fe6ffec90f59651712705e4c0 21-Oct-2010 Dianne Hackborn <hackbod@google.com> Merge "We are API 9 compatible."
2ea6527e7bc80620bf4038aabf89dface71976d3 21-Oct-2010 Jean-Baptiste Queru <jbq@google.com> am 5a98ec04: resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp

Merge commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d'

* commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d':
Explicitly declare assembly only __ASSEMBLY__ macro for assembly source
311c267e150203543fe8eab41e0dceef88c331de 21-Oct-2010 Dianne Hackborn <hackbod@google.com> We are API 9 compatible.

Change-Id: Ice1c07993fb66c12cafeaefa874a7adbb19caf21
ersion_defaults.mk
4038bbc426776d8adc57d7c3c8123357b50b1615 20-Oct-2010 Ying Wang <wangying@google.com> am 09a00a67: Don\'t build update zip package if there is no kernel, or it\'s generic device.

Merge commit '09a00a672bb18dccc97af6090739ea275c39d8a3' into gingerbread-plus-aosp

* commit '09a00a672bb18dccc97af6090739ea275c39d8a3':
Don't build update zip package if there is no kernel, or it's generic device.
09a00a672bb18dccc97af6090739ea275c39d8a3 20-Oct-2010 Ying Wang <wangying@google.com> Don't build update zip package if there is no kernel, or it's generic device.

Move the update package code block forward to be side by side with the ota package code,
so that they are built under the same condition.
Bug: 3116070

Change-Id: I8055909cc614bfbeee215d1b770a80f728e326ee
akefile
5a98ec046c555b02d2f306efc117f7dafd32fc7d 20-Oct-2010 Jean-Baptiste Queru <jbq@google.com> resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp

Change-Id: I336f9e6859dce3bb18224b3340837474319c809c
8cd383837143a9140605301898c87d5c0817b308 18-Oct-2010 Dianne Hackborn <hackbod@google.com> Gingerbread becomes real.

Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac
ersion_defaults.mk
9af2da0d947a8376358f5acd03b522a30d602c9f 15-Oct-2010 Ying Wang <wangying@google.com> Merge "Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only."
f1582e549926e75a4edb194c4ff724df633299d4 14-Oct-2010 Bruce Beare <bruce.j.beare@intel.com> Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures

Change-Id: I5c1010d9caaa8d9ffaf65999fa3649c3c2be8caa
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
onfig.mk
nvsetup.mk
8ee0dfdd43984e42c269fd44bd62d07fbc4ce237 14-Oct-2010 Bruce Beare <bruce.j.beare@intel.com> Display the TARGET_ARCH_VARIANT

Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
umpvar.mk
20d1ba602b8f56cc396a213f6beecac500af02e2 14-Oct-2010 Jim Huang <jserv@0xlab.org> Explicitly declare assembly only __ASSEMBLY__ macro for assembly source

To isolate the assembly-only macros in header files, such as
<machine/cpu-features.h>, this patch attempts to declare assembly
only __ASSEMBLY__ macro in build system.

Change-Id: I081c3e46258a9256b20995e4d0b473c64745444c
inary.mk
98582b28e8315f9d9960aeb78143d360500bdfff 13-Oct-2010 Doug Zongker <dougz@android.com> radio files aren't modules, prebuilt or otherwise

Change-Id: Ic21cf9f7d9657819e40c6700c98e61971dab24b4
efinitions.mk
4a5bd245ff3228ce30ca58bad3ab526806bd1801 12-Oct-2010 Ying Wang <wangying@google.com> Fix typo.

Change-Id: Iabdc6ec1ead4f37294f01ebebc1e71e188455533
efinitions.mk
7522f04a4b0327cf493dfe6c501634b2b1e1367a 12-Oct-2010 Ying Wang <wangying@google.com> Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only.

Bug: 3076955
Change-Id: I7ddcc5b9d6325d3a3c63f952f97034ddf223630a
ain.mk
roduct.mk
16697b70002286ebba91f0ebbd533457e0bbb7f0 11-Oct-2010 Ying Wang <wangying@google.com> Hook up the dependency.

Now llvm-rs-link is directly called by the build system.

Change-Id: I281cc6fd9e21ee7d120ddea390f802b57c894fd6
ava.mk
f7b32bfe41406daf0785b7451efdbbb9b7bbba7a 11-Oct-2010 Shih-wei Liao <sliao@google.com> Enable LLVM_RS_LINK. No longer forking an LLVM linker inside llvm-rs-cc.

Change-Id: I2ebc6ec759daf36d1e77fa8e30147ab8e40b44fc
onfig.mk
efinitions.mk
0dd458e65ab537a7a961e54257dcb77628ec3789 10-Oct-2010 Brian Muramatsu <btmura@google.com> am 99185c2a: am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread

Merge commit '99185c2a462d563855e4bc0c1e5649a21b2e186b'

* commit '99185c2a462d563855e4bc0c1e5649a21b2e186b':
Support Additional CTS Host Jars
c8241ca100cb2f806bab594bbb8c3120dc49e30e 10-Oct-2010 Shih-wei Liao <sliao@google.com> Merge "Make naming consistent: llvm-rs-cc and llvm-rs-link."
0ce72c458c5aa7f08e601ff7c33d8a2bc398a7bf 10-Oct-2010 Ying Wang <wangying@google.com> am 3b008f36: am 83f69eb5: Prepend ccache to CC/CXX if necessary.

Merge commit '3b008f36956c35f58d510ad3da5090cf21a08349'

* commit '3b008f36956c35f58d510ad3da5090cf21a08349':
Prepend ccache to CC/CXX if necessary.
d01fadb6bc8d72966bf00e0cc375f9fa59479f81 09-Oct-2010 Shih-wei Liao <sliao@google.com> Make naming consistent: llvm-rs-cc and llvm-rs-link.

Change-Id: I8e8ae27548131b47fbbd037d55b472d095d7bb8f
onfig.mk
efinitions.mk
ava.mk
ser_tags.mk
e814ad495055bc226c9fb453d6e786875f33a102 08-Oct-2010 Joe Onorato <joeo@google.com> am 5c41c178: am 700b88e1: Pass device characteristic information through to aapt.

Merge commit '5c41c17868865d1f2e9e2ff4680b528da61d16af'

* commit '5c41c17868865d1f2e9e2ff4680b528da61d16af':
Pass device characteristic information through to aapt.
64cf5aa66769287147a6d0d54a85460d3727eedd 08-Oct-2010 Joe Onorato <joeo@google.com> Revert "Enforce that PRODUCT_ variables aren't modified by module makefiles"

This reverts commit 95e743a6c02c9f9844cab95635b4954ecd82e7ff.
ain.mk
24e1c018ba83ce6465aa9faf0347071f271d2425 08-Oct-2010 Ying Wang <wangying@google.com> Integrate the slang "-MD" into the build system.

So that the header dependency can be included.
Bug: 2932230

Change-Id: I4d69870049157206ce2ab637ec6d673467db0c64
efinitions.mk
ava.mk
a5a684c32b2e41d5eccb8bef0e2531dc04ba7bed 08-Oct-2010 Ying Wang <wangying@google.com> Merge ""Slang" no longer needs "--allow-rs-prefix" option. "Slang" now knows if a function is in a system header file. If so, the function can be prefixed by "rs". Otherwise, "rs" prefix is rightly disallowed. So, no more "allow-rs-prefix" hacking."
c59777b35c44b3c5309cc29c179b3fc8ff7f9115 26-Sep-2010 Jean-Baptiste Queru <jbq@google.com> ip-up-vpn doesn't need to be grandfathered any more

Change-Id: I8fb7f98ec253f95d5eccb2603c4e09db19be2742
ser_tags.mk
c95899f46d66bf35a4da5cb20cd3c9fd107be472 08-Oct-2010 Shih-wei Liao <sliao@google.com> "Slang" no longer needs "--allow-rs-prefix" option. "Slang" now knows if a function
is in a system header file. If so, the function can be prefixed by "rs". Otherwise,
"rs" prefix is rightly disallowed. So, no more "allow-rs-prefix" hacking.

Change-Id: I8d5982cd6a75d465ffa6f98ca96941ae761117a2
efinitions.mk
95e743a6c02c9f9844cab95635b4954ecd82e7ff 08-Oct-2010 Jean-Baptiste Queru <jbq@google.com> Enforce that PRODUCT_ variables aren't modified by module makefiles

This eliminates one of the way a module could insert itself into
a build without going through a product definition file.

Change-Id: I1d537764d73c52ceaec96b64b6b6925e2f6a8d8e
ain.mk
99185c2a462d563855e4bc0c1e5649a21b2e186b 08-Oct-2010 Brian Muramatsu <btmura@google.com> am cd7170d7: resolved conflicts for merge of 0f8fcbe2 to gingerbread

Merge commit 'cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959' into gingerbread-plus-aosp

* commit 'cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959':
Support Additional CTS Host Jars
cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959 07-Oct-2010 Brian Muramatsu <btmura@google.com> resolved conflicts for merge of 0f8fcbe2 to gingerbread

Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
3b008f36956c35f58d510ad3da5090cf21a08349 07-Oct-2010 Ying Wang <wangying@google.com> am 83f69eb5: Prepend ccache to CC/CXX if necessary.

Merge commit '83f69eb5f905d47581bed141b7f5103362390339' into gingerbread-plus-aosp

* commit '83f69eb5f905d47581bed141b7f5103362390339':
Prepend ccache to CC/CXX if necessary.
21773134b44f8d7c7177a60ca94181f2f51ac9c8 07-Oct-2010 Dima Zavin <dima@android.com> am 4477db78: CHERRY-PICK: propogate module tags for prebuilts

Merge commit '4477db7883dfa21aa423f29057511fdb804c46af' into gingerbread-plus-aosp

* commit '4477db7883dfa21aa423f29057511fdb804c46af':
CHERRY-PICK: propogate module tags for prebuilts
83f69eb5f905d47581bed141b7f5103362390339 07-Oct-2010 Ying Wang <wangying@google.com> Prepend ccache to CC/CXX if necessary.

In case TARGET_CC is assigned with HOST_CC (eg, simulator build),
ccache will be prepended twice before this CL.
Bug: 3069576

Change-Id: I2ee44faea3a2795cf389ad6f80e4066a02b43be9
ombo/select.mk
4477db7883dfa21aa423f29057511fdb804c46af 16-Sep-2010 Dima Zavin <dima@android.com> CHERRY-PICK: propogate module tags for prebuilts

Change-Id: I08f1ae2ae4bb47a393cf5de1ed616d76fcd961c9
Signed-off-by: Dima Zavin <dima@android.com>
ulti_prebuilt.mk
5c41c17868865d1f2e9e2ff4680b528da61d16af 07-Oct-2010 Joe Onorato <joeo@google.com> am 700b88e1: Pass device characteristic information through to aapt.

Merge commit '700b88e1451f216d137d8a356496bf51712512c6' into gingerbread-plus-aosp

* commit '700b88e1451f216d137d8a356496bf51712512c6':
Pass device characteristic information through to aapt.
3be1cf92ad09d96152cbc5e1a0a44c929825b402 06-Oct-2010 Stephen Hines <srhines@google.com> Remove libclang* from user_tags.mk.

Change-Id: I428908bc6142b4c4c2e20bf7dbb86e61ff84734f
ser_tags.mk
700b88e1451f216d137d8a356496bf51712512c6 05-Oct-2010 Joe Onorato <joeo@google.com> Pass device characteristic information through to aapt.

A build configuration can define PRODUCT_CHARACTERISTICS, which is
a comma-separated list of device characteristics, for example
"nosdcard,grayscale". This will be passed through to aapt with
the --product flag.

Change-Id: I902c034b2f2824dbd2d33449308ee08beeb09551
efinitions.mk
roduct.mk
roduct_config.mk
45a971d961426cfecc0b2a73a3060a554eda8a59 02-Sep-2010 Brian Muramatsu <btmura@android.com> Support Additional CTS Host Jars

Include another optional Makefile from the CTS project that
specifies additional JARs that the CTS host may need. This
will make it easier to create modules in the CTS project
that can be built for the host and device and shared between
the host and test cases.

The first such library will include annotations like
"RequiresFeature" and "SupportsProfile" that will be needed
to support multiple device profiles in CTS.

Another planned libraries could include defining the CTS
version number in a central spot and sharing code used to
probe for certain properties like the OpenGL version and
other system properties.

Can be checked in after this other change without causing
breakage: https://review.source.android.com/#change,16740

Change-Id: I3c488247b66522dc86277ab43198c34f790e0618
asks/cts.mk
25a04dadf62311b7a267f6f77bfe20690801d73d 03-Oct-2010 Ying Wang <wangying@google.com> am b7019e21: am a9c381ed: Any intermediate targets between Progaurd and the built_dex should be differently named.

Merge commit 'b7019e2147173a962febeab0e0693cdec9f80789'

* commit 'b7019e2147173a962febeab0e0693cdec9f80789':
Any intermediate targets between Progaurd and the built_dex should be differently named.
b7019e2147173a962febeab0e0693cdec9f80789 03-Oct-2010 Ying Wang <wangying@google.com> am a9c381ed: Any intermediate targets between Progaurd and the built_dex should be differently named.

Merge commit 'a9c381ed4517993175a5bb6741ecf2aac3e8040c' into gingerbread-plus-aosp

* commit 'a9c381ed4517993175a5bb6741ecf2aac3e8040c':
Any intermediate targets between Progaurd and the built_dex should be differently named.
a9c381ed4517993175a5bb6741ecf2aac3e8040c 03-Oct-2010 Ying Wang <wangying@google.com> Any intermediate targets between Progaurd and the built_dex should be differently named.

Change-Id: Ifb01b1fcf24ba0c5b98aa02dd604cd81918e1841

To do that, we have to move classes.jar step before proguard, so classes.jar is always with the full names.
ase_rules.mk
ava.mk
1406613b636da52863de9acc2b5de73fb27c602d 02-Oct-2010 Ying Wang <wangying@google.com> am bf2ed191: am a83940fa: Move odex related files to product-specific dir.

Merge commit 'bf2ed191fe229b6a83684c19a57e11e7b50c8637'

* commit 'bf2ed191fe229b6a83684c19a57e11e7b50c8637':
Move odex related files to product-specific dir.
bf2ed191fe229b6a83684c19a57e11e7b50c8637 02-Oct-2010 Ying Wang <wangying@google.com> am a83940fa: Move odex related files to product-specific dir.

Merge commit 'a83940fa7851b35712e559be2246b56b5666b805' into gingerbread-plus-aosp

* commit 'a83940fa7851b35712e559be2246b56b5666b805':
Move odex related files to product-specific dir.
a83940fa7851b35712e559be2246b56b5666b805 25-Sep-2010 Ying Wang <wangying@google.com> Move odex related files to product-specific dir.

For target Java libraries, now the LOCAL_BUILT_MODULE includes both javalib.jar
and the .odex file, if dexpreopt is enabled.
These 2 files are moved to a product-specific dir in this change.
For target Java Libraries, $(intermediates) now points to the product-specific dir.
There is still a javalib.jar in the $(intermediates.COMMON) dir, which is used as dependency.
Nothing is changed for host Java libraries.

Change-Id: I2546dbb940c74537864ca002d1acb49bb731fbbc
ase_rules.mk
leanbuild.mk
efinitions.mk
ex_preopt.mk
nvsetup.mk
ava_library.mk
rebuilt.mk
6d6511bec5eca19514740096f94d16e5f2cf4cf7 01-Oct-2010 Brian Carlstrom <bdc@google.com> am bdb2e9f3: am 46fc2341: Merge "Allow \'export WITH_HOST_DALVIK=false\' to override Makefile defaulting" into gingerbread

Merge commit 'bdb2e9f3c203655648bd0a4e5ea64e9bb2cb2a13'

* commit 'bdb2e9f3c203655648bd0a4e5ea64e9bb2cb2a13':
Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
bdb2e9f3c203655648bd0a4e5ea64e9bb2cb2a13 01-Oct-2010 Brian Carlstrom <bdc@google.com> am 46fc2341: Merge "Allow \'export WITH_HOST_DALVIK=false\' to override Makefile defaulting" into gingerbread

Merge commit '46fc2341c535ba624fd2dceec9399ce681a80866' into gingerbread-plus-aosp

* commit '46fc2341c535ba624fd2dceec9399ce681a80866':
Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
46fc2341c535ba624fd2dceec9399ce681a80866 01-Oct-2010 Brian Carlstrom <bdc@google.com> Merge "Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting" into gingerbread
e947865041c3e8b32ea43e74d95c33e2153152ee 30-Sep-2010 Brian Carlstrom <bdc@google.com> Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting

Change-Id: I8915bc1c9f52a3b6ab1a82b404ab61cd0726198d
nvsetup.mk
f51f24a6ea5d972dcaf60f882c26a0a08c9014fc 28-Sep-2010 Xavier Ducrohet <xav@android.com> Use the new sdk/build/tools.atree.

As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.

Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.

Change-Id: I9158501cd68783d593e49e5fdea7f17d19b0120f
akefile
ed7211848a93e19e6e6b2e6ad403798046ab951c 30-Sep-2010 Ying Wang <wangying@google.com> am 3c3bf677: am 0b9382c7: Separate out Proguard flag files to fix dependency.

Merge commit '3c3bf6773ac7e2324c1d06282c625b81f799e427'

* commit '3c3bf6773ac7e2324c1d06282c625b81f799e427':
Separate out Proguard flag files to fix dependency.
4b89f657ee89eaed19a7f14c439be242331e62fd 30-Sep-2010 Xavier Ducrohet <xav@android.com> am cbbab0d5: am ffd5087e: Use the new sdk/build/tools.atree.

Merge commit 'cbbab0d57dfd297233b7fb52b30e0a95f3b0129e'

* commit 'cbbab0d57dfd297233b7fb52b30e0a95f3b0129e':
Use the new sdk/build/tools.atree.
f45f708531599e54799f519d094010b9128e4209 30-Sep-2010 Dan Bornstein <danfuzz@android.com> am a38198a5: am c8c09e28: Inform dex-preopt when the target device is a uniprocessor.

Merge commit 'a38198a5f47d2679b476d29dce71d3f1ba17c892'

* commit 'a38198a5f47d2679b476d29dce71d3f1ba17c892':
Inform dex-preopt when the target device is a uniprocessor.
3c3bf6773ac7e2324c1d06282c625b81f799e427 30-Sep-2010 Ying Wang <wangying@google.com> am 0b9382c7: Separate out Proguard flag files to fix dependency.

Merge commit '0b9382c792c303a93f5805adf4eba377dac01950' into gingerbread-plus-aosp

* commit '0b9382c792c303a93f5805adf4eba377dac01950':
Separate out Proguard flag files to fix dependency.
cbbab0d57dfd297233b7fb52b30e0a95f3b0129e 30-Sep-2010 Xavier Ducrohet <xav@android.com> am ffd5087e: Use the new sdk/build/tools.atree.

Merge commit 'ffd5087ec81a281b1299048b4282dad593ccd703' into gingerbread-plus-aosp

* commit 'ffd5087ec81a281b1299048b4282dad593ccd703':
Use the new sdk/build/tools.atree.
0b9382c792c303a93f5805adf4eba377dac01950 29-Sep-2010 Ying Wang <wangying@google.com> Separate out Proguard flag files to fix dependency.

Bug: 3048005
Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
lear_vars.mk
ava.mk
a38198a5f47d2679b476d29dce71d3f1ba17c892 29-Sep-2010 Dan Bornstein <danfuzz@android.com> am c8c09e28: Inform dex-preopt when the target device is a uniprocessor.

Merge commit 'c8c09e285d59f73334267deb9502c0927c616837' into gingerbread-plus-aosp

* commit 'c8c09e285d59f73334267deb9502c0927c616837':
Inform dex-preopt when the target device is a uniprocessor.
c8c09e285d59f73334267deb9502c0927c616837 29-Sep-2010 Dan Bornstein <danfuzz@android.com> Inform dex-preopt when the target device is a uniprocessor.

By default, dex-preopt optimizes for an SMP target.

Change-Id: Ib92552e55f5426b9b035ce862233752af090bb43
ex_preopt.mk
b5425fdfc8e37c6381152ae68566715b917b81eb 29-Sep-2010 Ying Wang <wangying@google.com> am e52fddec: am 879779a5: Merge "framework-res is not used as regular Java library now." into gingerbread

Merge commit 'e52fddec86a808b98bcdd033704b43a83cf569ea'

* commit 'e52fddec86a808b98bcdd033704b43a83cf569ea':
framework-res is not used as regular Java library now.
d46905b787ca77d10ab4e8cc309683651e69146e 29-Sep-2010 Ying Wang <wangying@google.com> am c292927f: am e1926260: Treat prebuilt SDKs and the stub as normal java libraries.

Merge commit 'c292927f05ff6955b1e5ffe40b8b9777328eba55'

* commit 'c292927f05ff6955b1e5ffe40b8b9777328eba55':
Treat prebuilt SDKs and the stub as normal java libraries.
e52fddec86a808b98bcdd033704b43a83cf569ea 29-Sep-2010 Ying Wang <wangying@google.com> am 879779a5: Merge "framework-res is not used as regular Java library now." into gingerbread

Merge commit '879779a5806d6e09d1c852a93dd4e1793bbd96cd' into gingerbread-plus-aosp

* commit '879779a5806d6e09d1c852a93dd4e1793bbd96cd':
framework-res is not used as regular Java library now.
912f8286056586da76f1dd03ccfca2990ea5d258 29-Sep-2010 Ying Wang <wangying@google.com> framework-res is not used as regular Java library now.

Change-Id: Ic2b8f7d7bceab3be7884eb4a7dbe721c14bd1ccb
efinitions.mk
c292927f05ff6955b1e5ffe40b8b9777328eba55 29-Sep-2010 Ying Wang <wangying@google.com> am e1926260: Treat prebuilt SDKs and the stub as normal java libraries.

Merge commit 'e1926260486707b3941b5488e97307f7904d1c99' into gingerbread-plus-aosp

* commit 'e1926260486707b3941b5488e97307f7904d1c99':
Treat prebuilt SDKs and the stub as normal java libraries.
e1926260486707b3941b5488e97307f7904d1c99 29-Sep-2010 Ying Wang <wangying@google.com> Treat prebuilt SDKs and the stub as normal java libraries.

Change-Id: Ic5512b952d8218e63e40aeb07966de21391ef42d
ase_rules.mk
421b46e0cb301019563c7ba1c797aa752fc318df 28-Sep-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 18c00c5c to master

Change-Id: I7f6870b654e24a268a14b9c47eb8d384993273f2
7e93b36b17b7377053bb31c587e34499e9744fc0 28-Sep-2010 Ying Wang <wangying@google.com> am b09173e7: am 30090e41: Set the intermediate dirs before using them.

Merge commit 'b09173e78936f65a7f128fda2383f9ed5abce2e0'

* commit 'b09173e78936f65a7f128fda2383f9ed5abce2e0':
Set the intermediate dirs before using them.
b01763862952225de4d79641048bd8b078d206d2 28-Sep-2010 Ying Wang <wangying@google.com> am 5cb94751: am 9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS

Merge commit '5cb94751d7b3b6b92d07680bc0e7703f931e385b'

* commit '5cb94751d7b3b6b92d07680bc0e7703f931e385b':
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
18c00c5c6abc9a3d781995ddd0225c7488f14ef4 28-Sep-2010 Ying Wang <wangying@google.com> am bb2b82bd: Merge "Fix userdata partition\'s ext4 mount point to data." into gingerbread

Merge commit 'bb2b82bd557b157fea5e280ef50ee782d15ac032' into gingerbread-plus-aosp

* commit 'bb2b82bd557b157fea5e280ef50ee782d15ac032':
Fix userdata partition's ext4 mount point to data.
bb2b82bd557b157fea5e280ef50ee782d15ac032 28-Sep-2010 Ying Wang <wangying@google.com> Merge "Fix userdata partition's ext4 mount point to data." into gingerbread
026f1451ce0c92c4630ca2d2d95f2fb9d68e9568 28-Sep-2010 Ying Wang <wangying@google.com> Fix userdata partition's ext4 mount point to data.

Bug: 3041475
Change-Id: I07306cd9c90072626dfc132d6655618ae70e64be
akefile
ef5fd0e18fd81b094b2a64a04a2333b136c6c0c2 28-Sep-2010 Brett Chabot <brettchabot@google.com> Merge "Package ddmlib-prebuilt with CTS." into gingerbread
531f524256c049fb3763b5c82808f315ea83d3bb 28-Sep-2010 Dima Zavin <dima@android.com> core: Make fake packages have real installed files for proper dependencies

Change-Id: I3145440eea0fbbd8ba22a2b3b0511f4c18f90eca
Signed-off-by: Dima Zavin <dima@android.com>
nvsetup.mk
ain.mk
hony_package.mk
2daa77ee0140da66d14388cbc7f6189e9a1e1f8e 28-Jul-2010 Xavier Ducrohet <xav@android.com> Package ddmlib-prebuilt with CTS.

This ensures that CTS is using a compatible ddmlib.
asks/cts.mk
ffd5087ec81a281b1299048b4282dad593ccd703 28-Sep-2010 Xavier Ducrohet <xav@android.com> Use the new sdk/build/tools.atree.

As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.

Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.

Change-Id: Ia0b0ea37f8a4904b3a7f7805a552eeb499a2c0ee
akefile
b09173e78936f65a7f128fda2383f9ed5abce2e0 27-Sep-2010 Ying Wang <wangying@google.com> am 30090e41: Set the intermediate dirs before using them.

Merge commit '30090e41e31e7db34a1092d8173c1413c036b49d' into gingerbread-plus-aosp

* commit '30090e41e31e7db34a1092d8173c1413c036b49d':
Set the intermediate dirs before using them.
30090e41e31e7db34a1092d8173c1413c036b49d 27-Sep-2010 Ying Wang <wangying@google.com> Set the intermediate dirs before using them.

Change-Id: Ibdab1234ca8c5a86c5226ed71e84374c3fcd7a90
ava_library.mk
5cb94751d7b3b6b92d07680bc0e7703f931e385b 27-Sep-2010 Ying Wang <wangying@google.com> am 9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS

Merge commit '9049e321aec53cfb23b63bbee7c21878a087350f' into gingerbread-plus-aosp

* commit '9049e321aec53cfb23b63bbee7c21878a087350f':
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
9049e321aec53cfb23b63bbee7c21878a087350f 27-Sep-2010 Ying Wang <wangying@google.com> Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS

So the its target-specific PRIVATE vars can be set properly.

Change-Id: I83b60bd56ee8523b0ba97092010c76c270b60c02
ava_library.mk
e874e23a3ce6a53170bdbc91b1baf6eb9c354f4e 27-Sep-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of dc45f86a to master

Change-Id: Icb49e58c1275c160715ba26d238337213e3877fe
dc45f86af8d5c2cdc743bee8878fe005cf8222d8 27-Sep-2010 Ying Wang <wangying@google.com> am 02352378: Remove emulator-based dexpreopt logic from the build system.

Merge commit '0235237805991b48831dc8add072a50c478b2fcb' into gingerbread-plus-aosp

* commit '0235237805991b48831dc8add072a50c478b2fcb':
Remove emulator-based dexpreopt logic from the build system.
0235237805991b48831dc8add072a50c478b2fcb 27-Sep-2010 Ying Wang <wangying@google.com> Remove emulator-based dexpreopt logic from the build system.

Change-Id: Ic96cbd1ebb9fa65aa85bf77f18a31913625d7e1c
akefile
ain.mk
364049490ea9964113f37e84dfd388acf220bc14 27-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Add some grandfathered prebuilts that were missed during the first pass

Change-Id: Ie812ad31c76d299c63ebe5c89c656866859425ed
egacy_prebuilts.mk
49ce545ad5cf9928b68758c14e69de0e0062e9ec 26-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Disable this check that was submitted by mistake.

There's still one device that doesn't build with this check enabled.

Change-Id: I962afe9c739df15e77ead30311c34be411674f53
ain.mk
f625bf277c88e0a21fab0a1e19de619dc0faec24 16-Sep-2010 Dima Zavin <dima@android.com> core: Add a phony package definition

This allows one to declare a meta-package that depends on a list
of modules. This is extremely useful for vendor provided prebulit
libraries where there is a big list of libraries/binaries to include.
Specifying that list in multiple places would be error prone and
eventually lead to very annoying bug hunts.

With a fake package, one does:

LOCAL_MODULE := my_fake_package
LOCAL_REQUIRED_MODULES := <list of required module names>
LOCAL_MODULE_TAGS := optional
include $(BUILD_PHONY_PACKAGE)

Change-Id: Idcfe91f6f2d6d886aba094981a70690e5a808bfc
Signed-off-by: Dima Zavin <dima@android.com>
onfig.mk
hony_package.mk
c2901aa5134a11d6594af573f98ab6b08c793f71 24-Sep-2010 Dima Zavin <dima@android.com> core: don't add file deps for modules without any installed files

Change-Id: I0acadb2ce287a1657d29dc787bd9b1c2f95aa918
Signed-off-by: Dima Zavin <dima@android.com>
ain.mk
0944771fb0de7510046e252b59f4afa7d24b212f 26-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Issue an error when unknown files are added to ALL_PREBUILT

Change-Id: I72b086ed7a3ad04227ce429f4d367b726d573432
egacy_prebuilts.mk
ain.mk
509d28b2b3cb3eb4d8bbd36a365457cb7b14f658 25-Sep-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 3453d5f3 to master

Change-Id: If23d2817b4d74d48632776923805c2141da82257
3453d5f3a22e7a293de9b8c6853f89e6411c8dd9 25-Sep-2010 Ying Wang <wangying@google.com> am d56d69b6: Merge "Fix dependency when switching between build variants with and without Proguard." into gingerbread

Merge commit 'd56d69b621bf41b478d59b6f987b6f796a9d8652' into gingerbread-plus-aosp

* commit 'd56d69b621bf41b478d59b6f987b6f796a9d8652':
Fix dependency when switching between build variants with and without Proguard.
d56d69b621bf41b478d59b6f987b6f796a9d8652 25-Sep-2010 Ying Wang <wangying@google.com> Merge "Fix dependency when switching between build variants with and without Proguard." into gingerbread
afd9652f6de5e98520ff0bf11ee5596412907fdc 25-Sep-2010 Ying Wang <wangying@google.com> am d60ab565: am 19f9c1c2: Fix nothing-to-do build.

Merge commit 'd60ab565964cfdcf70301ecf1091d3ca3dd30088'

* commit 'd60ab565964cfdcf70301ecf1091d3ca3dd30088':
Fix nothing-to-do build.
9cd6150cf5833ac84df0381d32ffddfc1caf1858 25-Sep-2010 Andy McFadden <fadden@android.com> am 12165990: am 6474811d: Fix sim-eng build.

Merge commit '12165990162ac3c41aed96d5afd5e228daa16877'

* commit '12165990162ac3c41aed96d5afd5e228daa16877':
Fix sim-eng build.
d60ab565964cfdcf70301ecf1091d3ca3dd30088 24-Sep-2010 Ying Wang <wangying@google.com> am 19f9c1c2: Fix nothing-to-do build.

Merge commit '19f9c1c243262aa3c16cba026a82ad53aa2818ac' into gingerbread-plus-aosp

* commit '19f9c1c243262aa3c16cba026a82ad53aa2818ac':
Fix nothing-to-do build.
19f9c1c243262aa3c16cba026a82ad53aa2818ac 24-Sep-2010 Ying Wang <wangying@google.com> Fix nothing-to-do build.

Because .odex is always newer than the .jar file, so we should use "|" depdendency here.

Change-Id: Ied4c5ec4ee3294862c0a232f96c15cca2c748e11
ase_rules.mk
12165990162ac3c41aed96d5afd5e228daa16877 24-Sep-2010 Andy McFadden <fadden@android.com> am 6474811d: Fix sim-eng build.

Merge commit '6474811d646153aeab111c1c0586b6ee53dcb0d2' into gingerbread-plus-aosp

* commit '6474811d646153aeab111c1c0586b6ee53dcb0d2':
Fix sim-eng build.
6474811d646153aeab111c1c0586b6ee53dcb0d2 24-Sep-2010 Andy McFadden <fadden@android.com> Fix sim-eng build.

Don't try to do the host build if we're configured for sim-eng. They
seem to be clashing, and it's redundant anyway.

Change-Id: I8e1a24b6e07d28701b32b6559ba39337b211264d
nvsetup.mk
7b3bb9461a08e582c07bfcc6e1711d938297fdbe 24-Sep-2010 Ying Wang <wangying@google.com> am bbbed9e1: am 02c9813a: Prebuilt NDKs are merged for linux and darwin.

Merge commit 'bbbed9e1f1be3cd8327ba89f47e9bd628d92cbe2'

* commit 'bbbed9e1f1be3cd8327ba89f47e9bd628d92cbe2':
Prebuilt NDKs are merged for linux and darwin.
5a2dee87865268134e1987106b63ed2dfc3abf46 24-Sep-2010 Ying Wang <wangying@google.com> am 4f9c4f4d: am 50d7d7a0: Fix private vars for host-dex rules.

Merge commit '4f9c4f4dbbd6ddedc7f8c61c35ea80953aa9d113'

* commit '4f9c4f4dbbd6ddedc7f8c61c35ea80953aa9d113':
Fix private vars for host-dex rules.
bbbed9e1f1be3cd8327ba89f47e9bd628d92cbe2 24-Sep-2010 Ying Wang <wangying@google.com> am 02c9813a: Prebuilt NDKs are merged for linux and darwin.

Merge commit '02c9813a726803e1c406b19f6b9dc4e411326e66' into gingerbread-plus-aosp

* commit '02c9813a726803e1c406b19f6b9dc4e411326e66':
Prebuilt NDKs are merged for linux and darwin.
02c9813a726803e1c406b19f6b9dc4e411326e66 24-Sep-2010 Ying Wang <wangying@google.com> Prebuilt NDKs are merged for linux and darwin.

Change-Id: I0b632d7ba4df5b27dda36280b22dfd0b37e116b7
inary.mk
957fea52f3f617299309b6f119a7c99fb869bab3 23-Sep-2010 Ying Wang <wangying@google.com> Fix dependency when switching between build variants with and without Proguard.

With this change, in a user build the dependency looks like:
package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar
While in an eng build:
package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar

Because package.apk is product-specific and removed when switching between
user and eng builds, it can always be built with the correct and up-to-date .dex file.

Bug: 3022484

Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
efinitions.mk
ava.mk
4f9c4f4dbbd6ddedc7f8c61c35ea80953aa9d113 24-Sep-2010 Ying Wang <wangying@google.com> am 50d7d7a0: Fix private vars for host-dex rules.

Merge commit '50d7d7a0a68378d1b02b5d2a2514592ba0d65f84' into gingerbread-plus-aosp

* commit '50d7d7a0a68378d1b02b5d2a2514592ba0d65f84':
Fix private vars for host-dex rules.
50d7d7a0a68378d1b02b5d2a2514592ba0d65f84 24-Sep-2010 Ying Wang <wangying@google.com> Fix private vars for host-dex rules.

Change-Id: Ie374d3abf4c261b9c5e8b80ed464b4c6b1b52b42
ost_java_library.mk
56de6843674898f72c87e4dc50156b9e9a26aee7 23-Sep-2010 Dmitry Shmidt <dimitrysh@google.com> am fb148d31: Merge "user_tags: Remove 01-test target" into gingerbread

Merge commit 'fb148d31eaab585c377e3b6be7a5c94380d623e0' into gingerbread-plus-aosp

* commit 'fb148d31eaab585c377e3b6be7a5c94380d623e0':
user_tags: Remove 01-test target
9a7bebc6a97ad2684cc98e4e7b9d09c9b3496084 23-Sep-2010 Dmitry Shmidt <dimitrysh@google.com> Merge "user_tags: Remove 01-test target"
fb148d31eaab585c377e3b6be7a5c94380d623e0 23-Sep-2010 Dmitry Shmidt <dimitrysh@google.com> Merge "user_tags: Remove 01-test target" into gingerbread
31a957076bc0e9e031462d765ca3eb4bf3607d73 23-Sep-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 67e0c2a6 to master

Change-Id: I7940c7ae3dd1900180e4767f1c86957db4cf3a1f
67e0c2a6bdcc72026a7c3e7263ce2cbe48d18215 23-Sep-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of b368bba4 to gingerbread-plus-aosp

Change-Id: I50e3e45d2cd1d0a2c01f256e8f53ea4c8b2668c8
3efd768a0d78ae4aeddb0e3e0a788dbb47c2cda3 23-Sep-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 9f28f0d7 to master

Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
9f28f0d76e31c9cce0aecb06091cf0e40b44fd0e 23-Sep-2010 Ying Wang <wangying@google.com> am e7874c43: Integrate dexpreopt into the build system.

Merge commit 'e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp

* commit 'e7874c430895b9a4e631c89f1e7729da9264d167':
Integrate dexpreopt into the build system.
e7874c430895b9a4e631c89f1e7729da9264d167 18-Sep-2010 Ying Wang <wangying@google.com> Integrate dexpreopt into the build system.

Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
akefile
ase_rules.mk
leanbuild.mk
lear_vars.mk
onfig.mk
ex_preopt.mk
ava_library.mk
ain.mk
ackage.mk
093766beb4d5191a28beea32be1782ba39c06ea3 23-Sep-2010 Dmitry Shmidt <dimitrysh@google.com> user_tags: Remove 01-test target

Auto-merge: no

Change-Id: I5e573660cdb4696951bcf62b611cfa71bb8395db
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ser_tags.mk
0bce270587185661598bf6f5f2ec0dfa2010ebe0 23-Sep-2010 Dmitry Shmidt <dimitrysh@google.com> user_tags: Remove 01-test target

Change-Id: I3a523cdd8c79a4428077e01d6f6b7bbcc6fe29ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
ser_tags.mk
1613f4ff1ee432a01fcce70a9020f19929e7290a 22-Sep-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 554402f7 to master

Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
fed45d859aaecd8b34fb65eeaad678e1a1c71aa9 22-Sep-2010 Jesse Wilson <jessewilson@google.com> am 77070aa7: am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.

Merge commit '77070aa757806d1617d707db4d2bd7931b2353fc'

* commit '77070aa757806d1617d707db4d2bd7931b2353fc':
Turn dalvikvm host builds on by default when linux is the host OS.
554402f76d8720dc3784b133d95f4aba2da4aa91 22-Sep-2010 Ying Wang <wangying@google.com> am 38a3161d: String literal change.

Merge commit '38a3161dc7f5fec81df9412bc202c3962c74535d' into gingerbread-plus-aosp

* commit '38a3161dc7f5fec81df9412bc202c3962c74535d':
String literal change.
38a3161dc7f5fec81df9412bc202c3962c74535d 22-Sep-2010 Ying Wang <wangying@google.com> String literal change.

Change-Id: Ic1289ee3abb184b4617aa42c28e6eca812600463
ind-jdk-tools-jar.sh
ain.mk
77070aa757806d1617d707db4d2bd7931b2353fc 22-Sep-2010 Jesse Wilson <jessewilson@google.com> am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.

Merge commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e' into gingerbread-plus-aosp

* commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e':
Turn dalvikvm host builds on by default when linux is the host OS.
ce7d5023c3df4c16ae395d64d51dd8345e40a39e 22-Sep-2010 Jesse Wilson <jessewilson@google.com> Turn dalvikvm host builds on by default when linux is the host OS.

Previously host builds were only enabled under user and user-debug
builds. This will make it easier for Androids to find out if they've
inadvertently broken host compatibility in native code.

Change-Id: Id1f2d5e189c4c1b6462fe03bab1b0f75e98a599c
nvsetup.mk
ain.mk
b368bba41c4fb9b5c76a56cb1bd850517ef9df53 08-Jul-2010 Ying Wang <wangying@google.com> Enforce 64-bit build environment

We will only support 64-bit build environment beyond froyo/2.2 .

Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
ind-jdk-tools-jar.sh
ain.mk
714633b13f00d07afb78838a2d27c95cdd78973f 21-Sep-2010 Doug Zongker <dougz@android.com> am c0434ac8: add recovery.fstab as dependency so it triggers rebuild (do not merge)

Merge commit 'c0434ac8b504df8a2f2a2828dc9b3f804c3dda72' into gingerbread-plus-aosp

* commit 'c0434ac8b504df8a2f2a2828dc9b3f804c3dda72':
add recovery.fstab as dependency so it triggers rebuild (do not merge)
c0434ac8b504df8a2f2a2828dc9b3f804c3dda72 21-Sep-2010 Doug Zongker <dougz@android.com> add recovery.fstab as dependency so it triggers rebuild (do not merge)

Make recovery image depend on the fstab file so it gets rebuilt when
fstab changes. Add support for "emmc" fstab partition type to
edify_generator.

Change-Id: Ic5df4e86c24321bf7d82a644e3e4770352e4f64b
akefile
9ce0fb6e59415669074896cfa01e1f0cf97979b7 21-Sep-2010 Doug Zongker <dougz@android.com> support for per-partition fs_type

Include the recovery.fstab file in the recovery image. Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.

(Cherrypicked from gingerbread w/some edits to resolve conflicts.)

Change-Id: Ic3ed85ac5672d8fe20280dacf43d5b82053311bb
akefile
ed2d3f42d1a9a058f0eee5b20f7b6b2982a2a7be 21-Sep-2010 Doug Zongker <dougz@android.com> am 258bf46e: support for per-partition fs_type (do not merge)

Merge commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4' into gingerbread-plus-aosp

* commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4':
support for per-partition fs_type (do not merge)
258bf46ea6bb4f25d01fab1b783238589e5bbec4 21-Sep-2010 Doug Zongker <dougz@android.com> support for per-partition fs_type (do not merge)

Include the recovery.fstab file in the recovery image. Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.

Change-Id: I35ee2dd0989441dc2a704b63c1b32e598049acb5
akefile
e4227106f4c570bf941d2e2fb77e361d6dc92d2c 19-Sep-2010 Joe Onorato <joeo@google.com> am bf17772c: am ad05677b: Brian\'s vendor/ change requires a clean build.

Merge commit 'bf17772cae2a11cf4039e8652aee3b96af7a739f'

* commit 'bf17772cae2a11cf4039e8652aee3b96af7a739f':
Brian's vendor/ change requires a clean build.
bf17772cae2a11cf4039e8652aee3b96af7a739f 19-Sep-2010 Joe Onorato <joeo@google.com> am ad05677b: Brian\'s vendor/ change requires a clean build.

Merge commit 'ad05677b0d02a54af34370e8b237aa86f0d627f4' into gingerbread-plus-aosp

* commit 'ad05677b0d02a54af34370e8b237aa86f0d627f4':
Brian's vendor/ change requires a clean build.
ad05677b0d02a54af34370e8b237aa86f0d627f4 19-Sep-2010 Joe Onorato <joeo@google.com> Brian's vendor/ change requires a clean build.

Change-Id: I074fe1ec176dc005adcd79eaf7c91cc3b8d3f54c
leanspec.mk
b984ae51e578a16d7313d67328336547fa0fe6fe 17-Sep-2010 Doug Zongker <dougz@android.com> resolved conflicts for merge of 813ad17a to master

Change-Id: I3fc84babbbcab712c5e38a0c8b815115ba89375f
813ad17ad3086c44332d3ee5e96a219994f632b0 17-Sep-2010 Doug Zongker <dougz@android.com> am 918ccff3: Merge "consolidate target_files metadata into one key-value file" into gingerbread

Merge commit '918ccff37260270d0eef3a3a7bfc2410c46d931a' into gingerbread-plus-aosp

* commit '918ccff37260270d0eef3a3a7bfc2410c46d931a':
consolidate target_files metadata into one key-value file
918ccff37260270d0eef3a3a7bfc2410c46d931a 17-Sep-2010 Doug Zongker <dougz@android.com> Merge "consolidate target_files metadata into one key-value file" into gingerbread
8caaeddcc006d03a647510904d03e87994eb470d 17-Sep-2010 Jesse Wilson <jessewilson@google.com> resolved conflicts for merge of d9de6588 to master

Change-Id: I3d7d6744b4f0d7c10bf001c87c0abbb4cb6885ef
d9de65886807e700bcfcc583670844109422780d 17-Sep-2010 Jesse Wilson <jessewilson@google.com> am 852f43bd: Include dalvik+libcore dependencies in core product definitions.

Merge commit '852f43bd29da34ff15799b88c3db166428cea6d8' into gingerbread-plus-aosp

* commit '852f43bd29da34ff15799b88c3db166428cea6d8':
Include dalvik+libcore dependencies in core product definitions.
37974731fcb4e32b1de5f213d34bd832ca889869 17-Sep-2010 Doug Zongker <dougz@android.com> consolidate target_files metadata into one key-value file

Instead of separate files for recovery api version, tool extensions,
and mkyaffs2 options, put those all in the generic key-value file.

Change-Id: Ib642311632844d52e4895fd4747093fc7e86232d
akefile
852f43bd29da34ff15799b88c3db166428cea6d8 16-Sep-2010 Jesse Wilson <jessewilson@google.com> Include dalvik+libcore dependencies in core product definitions.

Also conditionally include host-only dependencies when the host is
being built.

Change-Id: I0e8c9c1bef5ee60d4c1ce1c158f41b7642f9a8f2
ser_tags.mk
f127eb709b9a9fb9b04cda0cb7ef96ca65768ec8 16-Sep-2010 Doug Zongker <dougz@android.com> resolved conflicts for merge of 2cb8d5eb to master

Change-Id: I3b1aec1aee7c6bfcee2e978b4755b2bae9e480c4
2cb8d5ebb2a5bc45704108958ba94f85106c0209 16-Sep-2010 Doug Zongker <dougz@android.com> am c77a9ad4: store user-visible image sizes in target-files

Merge commit 'c77a9ad444d49e2ad777678cf5671f0a94f44ffb' into gingerbread-plus-aosp

* commit 'c77a9ad444d49e2ad777678cf5671f0a94f44ffb':
store user-visible image sizes in target-files
c77a9ad444d49e2ad777678cf5671f0a94f44ffb 16-Sep-2010 Doug Zongker <dougz@android.com> store user-visible image sizes in target-files

Do the yaffs-specific adjustments to image sizes in common.CheckSize,
instead of baking it into the image size stored in the target-files
package. Remove the special fs_type flag and fold it into the
"info_dict" we have for saving key-value pairs from the build system.

Change-Id: I6e63f3330f6277d9a946b22e66cadeb51203ba14
akefile
2e8730e341479dd658810bdbd46df2314129437b 16-Sep-2010 Dima Zavin <dima@android.com> Merge "core: propogate module tags for prebuilts"
df69250b75c38e726ea7392c39349d9ef654fac6 16-Sep-2010 Doug Zongker <dougz@android.com> am 8e8ff4ca: Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread

Merge commit '8e8ff4cad905a5b4eed7659152f075f9a5c038b1' into gingerbread-plus-aosp

* commit '8e8ff4cad905a5b4eed7659152f075f9a5c038b1':
support for ext4/EMMC in target_files and OTA generation
c19a8d5590a4ffd42b37ceaca2d779b48e481f99 02-Jul-2010 Doug Zongker <dougz@android.com> support for ext4/EMMC in target_files and OTA generation

Move the image sizes into a more generic key-value file. Make them
optional. Add additional key/value pairs describing what kind of
filesystem the device uses. Pass new fs-type-related arguments in
edify scripts when mounting and reformatting partitions.

Don't include all the init.*.rc files from the regular system in
recovery -- they aren't needed, and break recovery on some devices.

Change-Id: Ic1c651f754ed00ba1cffe8cf56c43f7f3b0ebfd7
akefile
acff3464f84d0eaca8d167c4a9daddf4fc7ca8d2 16-Sep-2010 Ying Wang <wangying@google.com> am 671f5fb0: Don\'t increase partition size for ext4 user images. [DO NOT MERGE]

Merge commit '671f5fb09f3510c16f73049cad9d8d6d652eaad8' into gingerbread-plus-aosp

* commit '671f5fb09f3510c16f73049cad9d8d6d652eaad8':
Don't increase partition size for ext4 user images. [DO NOT MERGE]
671f5fb09f3510c16f73049cad9d8d6d652eaad8 16-Sep-2010 Ying Wang <wangying@google.com> Don't increase partition size for ext4 user images. [DO NOT MERGE]

Change-Id: I5b82e6f7bd1c25ce3b1a4c16409b61aa1be7f71f
akefile
8b566d137d56371d2d568c645b74cb5814cbe241 16-Sep-2010 Joe Onorato <joeo@google.com> am d68519af: am 9e59ec29: Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread

Merge commit 'd68519af91198164d6f302ea53656649f23cdca9'

* commit 'd68519af91198164d6f302ea53656649f23cdca9':
Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
d68519af91198164d6f302ea53656649f23cdca9 16-Sep-2010 Joe Onorato <joeo@google.com> am 9e59ec29: Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread

Merge commit '9e59ec29933a4e6e9ee740fd180e4e31ff687fae' into gingerbread-plus-aosp

* commit '9e59ec29933a4e6e9ee740fd180e4e31ff687fae':
Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
9e59ec29933a4e6e9ee740fd180e4e31ff687fae 16-Sep-2010 Joe Onorato <joeo@google.com> Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread
f58df74f6afdac727aa059824adc688ef08b602c 16-Sep-2010 Joe Onorato <joeo@google.com> Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.

Change-Id: I568b416efe5ccefac6b5e6e99ddccc23600b1f74
roiddoc.mk
d2ebc1869885d91a8196929cfc1e90c1f60fbc96 16-Sep-2010 Dima Zavin <dima@android.com> core: propogate module tags for prebuilts

Change-Id: If46558dc783b72a1baf3e8e1df167cb75c67e944
Signed-off-by: Dima Zavin <dima@android.com>
ulti_prebuilt.mk
9090c4c1d77d574a7213724314a64f65a458e84c 16-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am da21ccf8: Grandfather the simulator-specific modules. do not merge.

Merge commit 'da21ccf86c31fb060b5a259342fb0bfbb0362f8b' into gingerbread-plus-aosp

* commit 'da21ccf86c31fb060b5a259342fb0bfbb0362f8b':
Grandfather the simulator-specific modules. do not merge.
da21ccf86c31fb060b5a259342fb0bfbb0362f8b 16-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Grandfather the simulator-specific modules. do not merge.

Those aren't new modules that were added recently, they just never got
considered when generating the original list of grandfathered modules

Change-Id: I0e6ff940936454048b59c0fc38e24e533e8598ae
ser_tags.mk
a2959d5eec9b5d42b648436f79400eab7d3cdd08 16-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Grandfather the simulator-specific modules.

Those aren't new modules that were added recently, they just never got
considered when generating the original list of grandfathered modules

Change-Id: I01c63f57be71146671cd3a7445baa774163262d8
ser_tags.mk
88a873a8c59a6da2be8fdbad7c666cd814bc980c 16-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 05ad00ea: am 5890600d: Add a better explanation about how to deal with user modules

Merge commit '05ad00eac9edda58c5cd3110853a6b93d6cc4e89'

* commit '05ad00eac9edda58c5cd3110853a6b93d6cc4e89':
Add a better explanation about how to deal with user modules
fbb920ad91c6ab9b466e4e46bc201467bc9fd420 16-Sep-2010 Doug Zongker <dougz@android.com> am bc843297: am 135a120e: remove the system board name from the build fingerprint

Merge commit 'bc84329757c6b79e1f10c418057e599ee106135c'

* commit 'bc84329757c6b79e1f10c418057e599ee106135c':
remove the system board name from the build fingerprint
0153446b798f2ead1b6a9a9a704374fbbcc66ba0 16-Sep-2010 Ying Wang <wangying@google.com> am 6674ec30: am 659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread

Merge commit '6674ec30bb92337e3bccb67bca53555a798a493f'

* commit '6674ec30bb92337e3bccb67bca53555a798a493f':
Change "make PRODUCT-XXX-tests" to build only tests-build-target
05ad00eac9edda58c5cd3110853a6b93d6cc4e89 15-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 5890600d: Add a better explanation about how to deal with user modules

Merge commit '5890600dac385941b6a4c6b6d0b230c1f13d54fa' into gingerbread-plus-aosp

* commit '5890600dac385941b6a4c6b6d0b230c1f13d54fa':
Add a better explanation about how to deal with user modules
5890600dac385941b6a4c6b6d0b230c1f13d54fa 15-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Add a better explanation about how to deal with user modules

Change-Id: Ib79cc0f4b47648daa18db97aa949cd167c8d44a9
ase_rules.mk
868391e565a90d18f59b528ba125239ca4112825 15-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Manual merge into master

Change-Id: Ib71bf36e1205e0bbf1f375cee4a28bceaba60c97
bc84329757c6b79e1f10c418057e599ee106135c 15-Sep-2010 Doug Zongker <dougz@android.com> am 135a120e: remove the system board name from the build fingerprint

Merge commit '135a120e3904d782623e4a3fc958ed098e8de384' into gingerbread-plus-aosp

* commit '135a120e3904d782623e4a3fc958ed098e8de384':
remove the system board name from the build fingerprint
135a120e3904d782623e4a3fc958ed098e8de384 15-Sep-2010 Doug Zongker <dougz@android.com> remove the system board name from the build fingerprint

Change-Id: I4cbbd03084b6ac24184b7475be3d34130094667d
akefile
6674ec30bb92337e3bccb67bca53555a798a493f 15-Sep-2010 Ying Wang <wangying@google.com> am 659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread

Merge commit '659adc0b54e40b3b194c84ad4ac8d2e775276e60' into gingerbread-plus-aosp

* commit '659adc0b54e40b3b194c84ad4ac8d2e775276e60':
Change "make PRODUCT-XXX-tests" to build only tests-build-target
659adc0b54e40b3b194c84ad4ac8d2e775276e60 15-Sep-2010 Ying Wang <wangying@google.com> Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
d64e5a2eef874cea6f34e3b3f1a763022805a70d 14-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Fail the build when using a user tag on a non-legacy module.

The supported mechanism is to explicitly add the module
name to the PRODUCT_PACKAGES of the relevant product definitions.

Change-Id: Ic754446e15965d468d1bbe85864275e2cda9b3aa
ase_rules.mk
f9a6571c341c6355cb2c29d235b2b509f8ca390f 15-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Grandfather in a few more modules"
0973350a3a1a01689d4cd245d50f7b6816c8679a 15-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Grandfather in a few more modules

Change-Id: Ib8fe72fd91e432219323523f6c242cb6210145cc
ser_tags.mk
42c3ac6e04dee915d95ad5dd1263d89f5491781a 15-Sep-2010 Joe Onorato <joeo@google.com> Merge "Add option to fail when Android.mk files change PRODUCT_* variables."
4555fb9c2ef9552fbcc19510e88b6367e1434bcb 15-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 78c5ff6d: another module that needs to be grandfathered in

Merge commit '78c5ff6d376afc6a1a5fab8a7a24be00211c2d35' into gingerbread-plus-aosp

* commit '78c5ff6d376afc6a1a5fab8a7a24be00211c2d35':
another module that needs to be grandfathered in
78c5ff6d376afc6a1a5fab8a7a24be00211c2d35 15-Sep-2010 Jean-Baptiste Queru <jbq@google.com> another module that needs to be grandfathered in

Change-Id: I37e0e0ae0056a2315e1102f79fd923143928f6fe
ser_tags.mk
81503a1fd756f28227b922670c009ae0fb0b82a8 15-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 0dfcdcb8: another module that needs to be grandfathered in

Merge commit '0dfcdcb8b4e76ab1ae3f9086e59b5d30e42b8394' into gingerbread-plus-aosp

* commit '0dfcdcb8b4e76ab1ae3f9086e59b5d30e42b8394':
another module that needs to be grandfathered in
0dfcdcb8b4e76ab1ae3f9086e59b5d30e42b8394 15-Sep-2010 Jean-Baptiste Queru <jbq@google.com> another module that needs to be grandfathered in

Change-Id: Ibf24b4507b0c367117c33476a07d7189aeb3dff7
ser_tags.mk
e3dccb5f6207589a69e4c3264c8150b669e728ed 15-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 6dc2a832: another module that needs to be grandfathered in

Merge commit '6dc2a832508c08c12cb30a6bc2beb8101107cc68' into gingerbread-plus-aosp

* commit '6dc2a832508c08c12cb30a6bc2beb8101107cc68':
another module that needs to be grandfathered in
6dc2a832508c08c12cb30a6bc2beb8101107cc68 15-Sep-2010 Jean-Baptiste Queru <jbq@google.com> another module that needs to be grandfathered in

Change-Id: I024ba177e6ca4745e38feb2395e57c46354c2eea
ser_tags.mk
db2cb63612af2bc9e8bd7ea6d33da2218a33de2d 15-Sep-2010 Ying Wang <wangying@google.com> Change "make PRODUCT-XXX-tests" to build only tests-build-target

Change-Id: Ib1a1a7b09ea6f1c3eea84394dcd6e3ebcda81e1a
akefile
ain.mk
roduct_config.mk
2b3b26f5b13e1b21b66e846a87b844309782d089 14-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 32afccc7: Revert "Default host module tag to optional."

Merge commit '32afccc732a6d7c631d2ba4d8a818fcbe2162903' into gingerbread-plus-aosp

* commit '32afccc732a6d7c631d2ba4d8a818fcbe2162903':
Revert "Default host module tag to optional."
423c15c25b5a5934a4cd9c0147b81dd8c173a6aa 14-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Revert "Default host module tag to optional."

This reverts commit 528362f07460cfee42190e68ee2ffde4f08f0af4.
ase_rules.mk
32afccc732a6d7c631d2ba4d8a818fcbe2162903 14-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Revert "Default host module tag to optional."

This reverts commit 528362f07460cfee42190e68ee2ffde4f08f0af4.
ase_rules.mk
8dc8faaaeadf83353b8144cc0db58972f19f5c7e 14-Sep-2010 Joe Onorato <joeo@google.com> Add option to fail when Android.mk files change PRODUCT_* variables.

It's turned off for now.

Change-Id: I0b5a3ce5fdc7693c8ebd870312f0c2e13fdb8b22
efinitions.mk
ain.mk
roduct.mk
e893cd2d5e2c4433536649c7f2aa7b97bb5b8171 14-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 6e8b268d: Fail the build when using a user tag on a non-legacy module. do not merge

Merge commit '6e8b268dec3cc38151dfd0514621219b79a30fa9' into gingerbread-plus-aosp

* commit '6e8b268dec3cc38151dfd0514621219b79a30fa9':
Fail the build when using a user tag on a non-legacy module. do not merge
6e8b268dec3cc38151dfd0514621219b79a30fa9 14-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Fail the build when using a user tag on a non-legacy module. do not merge

The supported mechanism is to explicitly add the module
name to the PRODUCT_PACKAGES of the relevant product definitions.

Change-Id: I67bef9a967576b77a5d6c298178f03c66722eb37
ase_rules.mk
744e6460320e6ac2d1b7050a80d8d70eb8321eeb 14-Sep-2010 Ying Wang <wangying@google.com> am 74005c3c: am 528362f0: Default host module tag to optional.

Merge commit '74005c3c2df04e035000426909a060f6149fd1d6'

* commit '74005c3c2df04e035000426909a060f6149fd1d6':
Default host module tag to optional.
74005c3c2df04e035000426909a060f6149fd1d6 14-Sep-2010 Ying Wang <wangying@google.com> am 528362f0: Default host module tag to optional.

Merge commit '528362f07460cfee42190e68ee2ffde4f08f0af4' into gingerbread-plus-aosp

* commit '528362f07460cfee42190e68ee2ffde4f08f0af4':
Default host module tag to optional.
528362f07460cfee42190e68ee2ffde4f08f0af4 13-Sep-2010 Ying Wang <wangying@google.com> Default host module tag to optional.

Change-Id: I8ae572b368e7ecdcc8e5bb257bb2f6084b5fb508
ase_rules.mk
3e642c463e24e7da5f94dad61bc3353bf7f38e79 11-Sep-2010 Ying Wang <wangying@google.com> am 796a2df1: am 73ca57f5: Fix host-dexed libraries.

Merge commit '796a2df1f49f8c69b22c0a37c730b994a68cacb6'

* commit '796a2df1f49f8c69b22c0a37c730b994a68cacb6':
Fix host-dexed libraries.
796a2df1f49f8c69b22c0a37c730b994a68cacb6 11-Sep-2010 Ying Wang <wangying@google.com> am 73ca57f5: Fix host-dexed libraries.

Merge commit '73ca57f5e688280599f507c10ebaf702506cc799' into gingerbread-plus-aosp

* commit '73ca57f5e688280599f507c10ebaf702506cc799':
Fix host-dexed libraries.
73ca57f5e688280599f507c10ebaf702506cc799 11-Sep-2010 Ying Wang <wangying@google.com> Fix host-dexed libraries.

With this change, host-dexed library A can have host-dexed library B in its LOCAL_JAVA_LIBRARIES.
Bug: 2992136

Change-Id: I794613d3230d4eb471a0566c325078da8fa38b86
ase_rules.mk
6d76cad5fecf45fda2cefc3710eae84cd45bfc28 11-Sep-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 31d4f53b to master

Change-Id: I87eff140bf68908d009e45687aff26f447a9b9b4
31d4f53b96247b4628af687c75393c6473ff0388 11-Sep-2010 Ying Wang <wangying@google.com> am f7912e4e: Support to build host dex.

Merge commit 'f7912e4ee0ceb014117c66369485f0aa9ea7cf08' into gingerbread-plus-aosp

* commit 'f7912e4ee0ceb014117c66369485f0aa9ea7cf08':
Support to build host dex.
f4bf5f3022a8a14bf54bd615dc9bf32b9683f9ba 11-Sep-2010 Gary King <gking@nvidia.com> am 1c4f64b5: am 1e80c294: [build] move dumpvar.mk include after select.mk include

Merge commit '1c4f64b59491eb8f3f7cb7b992a9fb06f2c475a1'

* commit '1c4f64b59491eb8f3f7cb7b992a9fb06f2c475a1':
[build] move dumpvar.mk include after select.mk include
f7912e4ee0ceb014117c66369485f0aa9ea7cf08 11-Sep-2010 Ying Wang <wangying@google.com> Support to build host dex.

Change-Id: I55df5e4051dbeb89a70d6d7b89fb6110f133d9d7
lear_vars.mk
ost_java_library.mk
9c76255031d4ecf7f587eec96eb5d9bf37ef19d5 10-Sep-2010 Ying Wang <wangying@google.com> Dist userdataimg and tests-zip-package for tests builds

So that the build server can run the following command to build and dist only the two packages:
make -j16 tests-zip-package userdataimage-nodeps dist showcommands TARGET_BUILD_VARIANT=tests TARGET_PRODUCT=passion

Change-Id: I03d7049582ec8537a389e80b7ecdcae6625222ea
akefile
1c4f64b59491eb8f3f7cb7b992a9fb06f2c475a1 11-Sep-2010 Gary King <gking@nvidia.com> am 1e80c294: [build] move dumpvar.mk include after select.mk include

Merge commit '1e80c294ffef26a6a7fe435411cd7557003b1d3f' into gingerbread-plus-aosp

* commit '1e80c294ffef26a6a7fe435411cd7557003b1d3f':
[build] move dumpvar.mk include after select.mk include
f09f80d182c2cdbd1285fc374aa3b882faa07ab9 10-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 93847f53: am cc84526b: Merge "Add atom optimization flags"

Merge commit '93847f5355204635648d791098dd0210e22d53ab'

* commit '93847f5355204635648d791098dd0210e22d53ab':
Add atom optimization flags
bcd1e1c8580213838b8ba415168065291019dcd4 10-Sep-2010 Ying Wang <wangying@google.com> am 570a0eef: Dist userdataimg and tests-zip-package for tests builds

Merge commit '570a0eeffb4c06084f21a058efb25271bb0cd1f6' into gingerbread-plus-aosp

* commit '570a0eeffb4c06084f21a058efb25271bb0cd1f6':
Dist userdataimg and tests-zip-package for tests builds
570a0eeffb4c06084f21a058efb25271bb0cd1f6 10-Sep-2010 Ying Wang <wangying@google.com> Dist userdataimg and tests-zip-package for tests builds

So that the build server can run the following command to build and dist only the two packages:
make -j16 tests-zip-package userdataimage-nodeps dist showcommands TARGET_BUILD_VARIANT=tests TARGET_PRODUCT=passion

Change-Id: I03d7049582ec8537a389e80b7ecdcae6625222ea
akefile
1e80c294ffef26a6a7fe435411cd7557003b1d3f 09-Mar-2010 Gary King <gking@nvidia.com> [build] move dumpvar.mk include after select.mk include

because the dumpvar target was included early in envsetup.mk, it was
not possible to use it to dump variables that were defined by makefiles
included later (like the toolchain variables in combo/select.mk).

move dumpvar.mk to after select.mk and javac.mk, so that shell functions
can be created using the toolchain build variables

Change-Id: I1c22025a8981fa91c183846fb28be26fb562adfb
Signed-off-by: Gary King <gking@nvidia.com>
onfig.mk
93847f5355204635648d791098dd0210e22d53ab 10-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am cc84526b: Merge "Add atom optimization flags"

Merge commit 'cc84526bcef5ffd7ed9abf73dc3bfc9e29784b22' into gingerbread-plus-aosp

* commit 'cc84526bcef5ffd7ed9abf73dc3bfc9e29784b22':
Add atom optimization flags
cc84526bcef5ffd7ed9abf73dc3bfc9e29784b22 09-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Add atom optimization flags"
c320e634973d69c8d4f893153c37d126f14b5e22 09-Sep-2010 Jean-Baptiste Queru <jbq@google.com> more modules with user tags that need to br grandfathered in

Change-Id: Iad72076094d028499bac516271fd422c4b15cb92
ser_tags.mk
ea08763d5eef5f3ead94d20494472020bbed650f 09-Sep-2010 Jean-Baptiste Queru <jbq@google.com> one more module grandfathered with a user tag

Change-Id: I22d60c33df06cfe0bfd2041a611c762e6e662c94
ser_tags.mk
ccc10925b7da2200c6a5ddfa17bf31c517e9da7a 09-Sep-2010 Jean-Baptiste Queru <jbq@google.com> fix typo

Change-Id: If4acf972380a94b160a656f849c4106025d3e6b2
ser_tags.mk
ba3ed0c7d0be642ca84b71a1a53fa1cfe6df4409 08-Sep-2010 Jean-Baptiste Queru <jbq@google.com> a few more existing user modules to be grandfathered in - DO NOT MERGE

Change-Id: I6a2337bb557735276c93c306caac43a59abff47c
ser_tags.mk
0dda5a191df021a13c91d42109d55f4434b2c5da 08-Sep-2010 Jean-Baptiste Queru <jbq@google.com> a few more existing user modules to be grandfathered in - DO NOT MERGE

Change-Id: Ie50faf26b5db9ac3c46f50da8c48c6132d4f2d1b
ser_tags.mk
29ff8c85c1760891eb371c308e6e15d83ecd790e 08-Sep-2010 Dan Bornstein <danfuzz@android.com> am 3177afa8: am ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread

Merge commit '3177afa8177d8b31dd6bd160816a11fedeec7e07'

* commit '3177afa8177d8b31dd6bd160816a11fedeec7e07':
Enable WITH_HOST_DALVIK for "user" builds on Linux.
b81c3989cbb7c94e28d05434c434a62fbf029cb8 08-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 22e620c4: a few more existing user modules to be grandfathered in - DO NOT MERGE

Merge commit '22e620c4bed8c60361c02820cda4dfaafe83ebe5' into gingerbread-plus-aosp

* commit '22e620c4bed8c60361c02820cda4dfaafe83ebe5':
a few more existing user modules to be grandfathered in - DO NOT MERGE
3177afa8177d8b31dd6bd160816a11fedeec7e07 08-Sep-2010 Dan Bornstein <danfuzz@android.com> am ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread

Merge commit 'ca917dc2b2140b9fc4e331f94907cd27c8b6a91f' into gingerbread-plus-aosp

* commit 'ca917dc2b2140b9fc4e331f94907cd27c8b6a91f':
Enable WITH_HOST_DALVIK for "user" builds on Linux.
22e620c4bed8c60361c02820cda4dfaafe83ebe5 08-Sep-2010 Jean-Baptiste Queru <jbq@google.com> a few more existing user modules to be grandfathered in - DO NOT MERGE

Change-Id: I5f4c9f9ac948c2ba6865eae7dca2c0ed4d10702b
ser_tags.mk
4074f2377c21ee102916c2f954978fc5eba341cd 04-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Warn when new modules are found that use user tags

Change-Id: I49369cc1596f269e0964f0a6a88bcc7152209bde
ase_rules.mk
efinitions.mk
ser_tags.mk
ca917dc2b2140b9fc4e331f94907cd27c8b6a91f 08-Sep-2010 Dan Bornstein <danfuzz@android.com> Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread
130b539bfdda612dd3858b407c503c3e80d9aa72 08-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 890ef4b0: a few more existing user modules to be grandfathered in - DO NOT MERGE

Merge commit '890ef4b0aaa602b3f7bcee87bb4d89e6aaa53b48' into gingerbread-plus-aosp

* commit '890ef4b0aaa602b3f7bcee87bb4d89e6aaa53b48':
a few more existing user modules to be grandfathered in - DO NOT MERGE
890ef4b0aaa602b3f7bcee87bb4d89e6aaa53b48 08-Sep-2010 Jean-Baptiste Queru <jbq@google.com> a few more existing user modules to be grandfathered in - DO NOT MERGE

Change-Id: I7526ad40f27853a2f83bc0c4c4f80ff709fcaf40
ser_tags.mk
78a59022f89a65f5e7107d57f4995c1eb70e1fb2 08-Sep-2010 Jean-Baptiste Queru <jbq@google.com> a few more grandfathered user tags - DO NOT MERGE

Change-Id: Ia625817d3f332f8760835b3fa20e56c00c305166
ser_tags.mk
f13bdd94dc4d4f261d7a4850d7f4cd34b88e2cab 08-Sep-2010 Dan Bornstein <danfuzz@android.com> Enable WITH_HOST_DALVIK for "user" builds on Linux.

Bug: 2497274
Change-Id: I636895b52c82f301f8c288ae670b34e1dbf32cc5
ain.mk
roduct_config.mk
6b747cfb21e270598c0d1bf1923c4da768a676a8 08-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am a90f9d2c: Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread

Merge commit 'a90f9d2c299d7833b37f8a0e244a2893054d9ea5' into gingerbread-plus-aosp

* commit 'a90f9d2c299d7833b37f8a0e244a2893054d9ea5':
Warn when new modules are found that use user tags - DO NOT MERGE
a90f9d2c299d7833b37f8a0e244a2893054d9ea5 08-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread
fff865f06fd3e8aa7bc719e77f65834bc6ae9b9e 07-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 8f731bb2: am 0545c916: Revert "Allow properties with spaces in their values"

Merge commit '8f731bb2720475f652cc8c5849d564246b234bef'

* commit '8f731bb2720475f652cc8c5849d564246b234bef':
Revert "Allow properties with spaces in their values"
8f731bb2720475f652cc8c5849d564246b234bef 07-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 0545c916: Revert "Allow properties with spaces in their values"

Merge commit '0545c9160d0d3dde4675184609cc7656de5558b0' into gingerbread-plus-aosp

* commit '0545c9160d0d3dde4675184609cc7656de5558b0':
Revert "Allow properties with spaces in their values"
0545c9160d0d3dde4675184609cc7656de5558b0 07-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Revert "Allow properties with spaces in their values"

This reverts commit de3bfade571033b01fbaccac2f0fdf7193e8d3ee.
akefile
30d68a3b9df5657ca0eefb063551202490a836fb 07-Sep-2010 Ying Wang <wangying@google.com> am 817f07ae: Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE

Merge commit '817f07aef008dd3f32fed3603382123917fdec64' into gingerbread-plus-aosp

* commit '817f07aef008dd3f32fed3603382123917fdec64':
Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
817f07aef008dd3f32fed3603382123917fdec64 07-Sep-2010 Ying Wang <wangying@google.com> Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE

Cherry-pick from master.

Change-Id: I0a56e3e91efd53ad2671136b6fe00ee675f56230
ynamic_binary.mk
39de4328972fd1cd5cb621fb5b393415fdad54fb 04-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Warn when new modules are found that use user tags - DO NOT MERGE

Change-Id: Ia563765f3d0161d7c851a0162d65c2a249b4dd38
ase_rules.mk
efinitions.mk
ser_tags.mk
90ca11a2d3ae2f6b17080a68d0ee91036ab4341a 04-Sep-2010 Ying Wang <wangying@google.com> Fix the unstripped path if LOCAL_MODULE_PATH is set.

Bug: 2953067

Change-Id: I12a0bdb1f3df4fa98bea70f60e0ce26bf863c924
ynamic_binary.mk
a4a50996acce7aaefc268e702eebdbacb0bbf561 03-Sep-2010 Doug Zongker <dougz@android.com> am c637db16: remove remaining amend support

Merge commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c' into gingerbread-plus-aosp

* commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c':
remove remaining amend support
c637db16d83b2c248b1cf0122e2ba558ed95762c 21-Apr-2010 Doug Zongker <dougz@android.com> remove remaining amend support

Remove the remaining (unused and untested) support for generating
amend scripts. This means that you won't be able to OTA directly from
cupcake to gingerbread.

Change-Id: Iaf5295db92a42b336960d05295f48b67cb729337
akefile
f06675e2a47d0e9322f8a619e84f72882cec039d 03-Sep-2010 Joe Onorato <joeo@google.com> am 4b1e2245: am c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread

Merge commit '4b1e2245857d696aa0dfcd7a163c6d04025c74f6'

* commit '4b1e2245857d696aa0dfcd7a163c6d04025c74f6':
The old clean target had bit rotted.
54b634dce81e65a1a76e9e9693aa93ed15eb42d1 03-Sep-2010 Ying Wang <wangying@google.com> am a79db6e4: am 3dae0ee4: Fix inherited dependency when instrmentation.

Merge commit 'a79db6e47a378cb089021a56637a9c6925f14261'

* commit 'a79db6e47a378cb089021a56637a9c6925f14261':
Fix inherited dependency when instrmentation.
4b1e2245857d696aa0dfcd7a163c6d04025c74f6 03-Sep-2010 Joe Onorato <joeo@google.com> am c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread

Merge commit 'c5b8d4ceb63909e5f0811fa80dca205996fd8644' into gingerbread-plus-aosp

* commit 'c5b8d4ceb63909e5f0811fa80dca205996fd8644':
The old clean target had bit rotted.
c5b8d4ceb63909e5f0811fa80dca205996fd8644 03-Sep-2010 Joe Onorato <joeo@google.com> Merge "The old clean target had bit rotted." into gingerbread
dfc5e0cb7b32c172cc6f88c890c1e6e6ef1ff2fe 03-Sep-2010 Joe Onorato <joeo@google.com> The old clean target had bit rotted.

Clean and clobber are now the same thing.

Change-Id: I4873d40496b16e13689e22c48cff1fecdffb8b40
ain.mk
a79db6e47a378cb089021a56637a9c6925f14261 03-Sep-2010 Ying Wang <wangying@google.com> am 3dae0ee4: Fix inherited dependency when instrmentation.

Merge commit '3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671' into gingerbread-plus-aosp

* commit '3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671':
Fix inherited dependency when instrmentation.
3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671 03-Sep-2010 Ying Wang <wangying@google.com> Fix inherited dependency when instrmentation.

It turns out we should also LOCAL_INSTRUMENTATION_FOR.
To disambiguate LOCAL_INSTRUMENTATION_FOR_PACKAGE_NAME is renamed to LOCAL_MANIFEST_INSTRUMENTATION_FOR.

Bug: 2902591
Change-Id: I6cb893c135736fc4170aa2259105b4c5eea798a1
ase_rules.mk
lear_vars.mk
efinitions.mk
e0b19f60c0342d0fd51d716860364d3b6f339716 03-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am 54b8b436: am de3bfade: Allow properties with spaces in their values

Merge commit '54b8b436a380b053772110796642c7e5e6ba8e64'

* commit '54b8b436a380b053772110796642c7e5e6ba8e64':
Allow properties with spaces in their values
54b8b436a380b053772110796642c7e5e6ba8e64 03-Sep-2010 Jean-Baptiste Queru <jbq@google.com> am de3bfade: Allow properties with spaces in their values

Merge commit 'de3bfade571033b01fbaccac2f0fdf7193e8d3ee' into gingerbread-plus-aosp

* commit 'de3bfade571033b01fbaccac2f0fdf7193e8d3ee':
Allow properties with spaces in their values
de3bfade571033b01fbaccac2f0fdf7193e8d3ee 02-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Allow properties with spaces in their values

This way, such properties can be set in product definition files
instead of having to live in system.prop, which eliminates the need
for system.prop

Change-Id: I25d9665f65436df8215940e46380deb31b8161ba
akefile
ac628ed792946099ecd374cf9d17db6e43789104 02-Sep-2010 Ying Wang <wangying@google.com> am 2e1347c6: am fb644881: Disable new longjmp in glibc 2.11 and later.

Merge commit '2e1347c6a010c51c9ec80fd312465c1c23666ab2'

* commit '2e1347c6a010c51c9ec80fd312465c1c23666ab2':
Disable new longjmp in glibc 2.11 and later.
2e1347c6a010c51c9ec80fd312465c1c23666ab2 02-Sep-2010 Ying Wang <wangying@google.com> am fb644881: Disable new longjmp in glibc 2.11 and later.

Merge commit 'fb644881b6083aa0d9d15e7aad8bfa5a429b1c37' into gingerbread-plus-aosp

* commit 'fb644881b6083aa0d9d15e7aad8bfa5a429b1c37':
Disable new longjmp in glibc 2.11 and later.
163fa35fe3d49f0178b0173d662cf899989b7bcb 02-Sep-2010 Ying Wang <wangying@android.com> Disable new longjmp in glibc 2.11 and later.

Bug: 2967937
Change-Id: I7a5ef082502192f41c26a48632edfe775dea7648
ombo/HOST_linux-x86.mk
fb644881b6083aa0d9d15e7aad8bfa5a429b1c37 02-Sep-2010 Ying Wang <wangying@google.com> Disable new longjmp in glibc 2.11 and later.

Bug: 2967937
Change-Id: I4e2a5f806ad45a01ca7f8c4d032cd29fce1d794d
ombo/HOST_linux-x86.mk
7c15ef0eae8536271a8cf6d9465d1f75346de705 01-Sep-2010 Ying Wang <wangying@google.com> Merge "Now slang supports "-I" options."
512802772a2516b817ab463659b62c2e6fa7442c 01-Sep-2010 Ying Wang <wangying@google.com> Now slang supports "-I" options.

Change-Id: I32aef6c913d9d30f9982a593397145f1562aecf9
lear_vars.mk
efinitions.mk
ava.mk
aaa5d11cb3c67a345572496197c688c3e48cd670 01-Sep-2010 Joe Onorato <joeo@android.com> Make it so if you say LOCAL_UNINSTALLABLE_MODULE := true for a docs build, it won't try to dist it.

Change-Id: Iff8a7b6438d392c5b4c425337b84cfa9bc90f282
roiddoc.mk
d77248ac7e1c05d7e5c16dd6df7e2067a2791e7b 26-Aug-2010 Dirk Dougherty <ddougherty@google.com> Remove droiddoc/templates dir in favor of templates-sdk, move Android-specific assets to templates-sdk, add copies to templates-pdk as workaround.

Change-Id: Iad7d0f1955e5731ee9cebb8828a45bf3c297417b
roiddoc.mk
3e8f9878895d9c7b0978e9f26bc069ce9b0bdc7b 30-Aug-2010 Andreas Huber <andih@google.com> am aeb2bbc1: am 200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.

Merge commit 'aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486'

* commit 'aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486 30-Aug-2010 Andreas Huber <andih@google.com> am 200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.

Merge commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410' into gingerbread-plus-aosp

* commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
200f25984ccc8a9e5fc13bfbcde22c17bc80d410 30-Aug-2010 Andreas Huber <andih@google.com> Build without OpenCore by default, remove obsolete opt-in to stagefright.

Change-Id: I6e08d2136147f4e279f8a5b2b3837e4317faf27c
related-to-bug: 2941153
ain.mk
9a8732fb6c6a569495e3695fc1e2b638de209beb 25-Aug-2010 Ying Wang <wangying@google.com> Link against Mac OSX 10.5 SDK if building on 10.6.

So that tools built on Snow Leopard (10.6) can be used on Leopard (10.5).

Change-Id: I99745ecbe2ad11feaae31d5be31c34c2e0ad7cc5
ombo/HOST_darwin-x86.mk
f3e7e04f70f10025f43cb9f0380b02eb6b7f07b3 29-Aug-2010 Raphael Moll <ralf@android.com> am 2a1873b0: am 6ba4b59c: SDK: add hierarchyviewer2 to windows target list.

Merge commit '2a1873b09c73700d4339f379f4389b26beb81173'

* commit '2a1873b09c73700d4339f379f4389b26beb81173':
SDK: add hierarchyviewer2 to windows target list.
2a1873b09c73700d4339f379f4389b26beb81173 29-Aug-2010 Raphael Moll <ralf@android.com> am 6ba4b59c: SDK: add hierarchyviewer2 to windows target list.

Merge commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3' into gingerbread-plus-aosp

* commit '6ba4b59c9067b747ab2a4c85621e656c4d4614e3':
SDK: add hierarchyviewer2 to windows target list.
6ba4b59c9067b747ab2a4c85621e656c4d4614e3 29-Aug-2010 Raphael Moll <ralf@android.com> SDK: add hierarchyviewer2 to windows target list.

Change-Id: I282173ab10930a716861f3774804d3d8484a71f3
ain.mk
9a0e98ac478d8ca61011556e22af13e05d94f8e0 27-Aug-2010 Bill Napier <napier@google.com> Revert "Fix MonkeyRunner SDK documentation generation."

This reverts commit b47386bb270ec8f8f007d4fc9f7823530b74fdac.
roiddoc.mk
2de097f7aebcc70f66df1cd9bdb2767b01ba37a8 27-Aug-2010 Bill Napier <napier@google.com> Merge "Fix MonkeyRunner SDK documentation generation."
f5127dfc3dce86e0e5fd04f6011debdea125cf1f 26-Aug-2010 Ying Wang <wangying@google.com> am 485bd44d: am d421f57d: Fix mkyaffs2image extra flags in the release tools.

Merge commit '485bd44d0d78f9f612075e17db1adb281741c84f'

* commit '485bd44d0d78f9f612075e17db1adb281741c84f':
Fix mkyaffs2image extra flags in the release tools.
485bd44d0d78f9f612075e17db1adb281741c84f 26-Aug-2010 Ying Wang <wangying@google.com> am d421f57d: Fix mkyaffs2image extra flags in the release tools.

Merge commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d' into gingerbread-plus-aosp

* commit 'd421f57d22009e4d9ce71298c2f93636ff9e7d9d':
Fix mkyaffs2image extra flags in the release tools.
d421f57d22009e4d9ce71298c2f93636ff9e7d9d 26-Aug-2010 Ying Wang <wangying@google.com> Fix mkyaffs2image extra flags in the release tools.

Change-Id: I806e3e85ef89941edf04352331e25730c491c470
akefile
b47386bb270ec8f8f007d4fc9f7823530b74fdac 26-Aug-2010 Bill Napier <napier@google.com> Fix MonkeyRunner SDK documentation generation.

Turns out that find doesn't like being passed paths that don't exist, so
don't do that.

Change-Id: I155cf48625513d1bcbd29329f1949967889dc9cc
roiddoc.mk
1c19026961796a9af817a6b8ad04d03c2ed8bf1c 26-Aug-2010 Ying Wang <wangying@google.com> am f11fc5f0: am fb0a347b: Disable building OTA package if there is no kernel.

Merge commit 'f11fc5f098ab8481887cbbbbb4246f63837b61c9'

* commit 'f11fc5f098ab8481887cbbbbb4246f63837b61c9':
Disable building OTA package if there is no kernel.
f11fc5f098ab8481887cbbbbb4246f63837b61c9 26-Aug-2010 Ying Wang <wangying@google.com> am fb0a347b: Disable building OTA package if there is no kernel.

Merge commit 'fb0a347b747a91173c8a9f845a0362e3f8a9701f' into gingerbread-plus-aosp

* commit 'fb0a347b747a91173c8a9f845a0362e3f8a9701f':
Disable building OTA package if there is no kernel.
fb0a347b747a91173c8a9f845a0362e3f8a9701f 26-Aug-2010 Ying Wang <wangying@google.com> Disable building OTA package if there is no kernel.

Change-Id: I9a10cba92dd7f9cccd8cca58a5fa2d3a8b4620eb
akefile
3c3f69a1235f742b92cd3248396bcc505603220b 26-Aug-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 480250d3 to master

Change-Id: Ic55950f4b92c7029fd2ff62976cba0d4d738fc23
480250d3ae62552a38f45129741ef8658b7d04cb 26-Aug-2010 Ying Wang <wangying@google.com> am 68bb6517: Show command lines run by releasetools.

Merge commit '68bb65177cc6839e985c0a54343f44494de61d62' into gingerbread-plus-aosp

* commit '68bb65177cc6839e985c0a54343f44494de61d62':
Show command lines run by releasetools.
68bb65177cc6839e985c0a54343f44494de61d62 26-Aug-2010 Ying Wang <wangying@google.com> Show command lines run by releasetools.

Change-Id: Ic204e6738781c191cd6cefefdb351f8a156b2309
akefile
eb85d8d78ef4e334eccfc78dd72a82d0cf65d103 26-Aug-2010 Ying Wang <wangying@google.com> am eed6860d: am 4de6b5bf: Fix mkbootimg parameters for releasetools.

Merge commit 'eed6860d388f1761405d7165cb4d72e1f038b8a6'

* commit 'eed6860d388f1761405d7165cb4d72e1f038b8a6':
Fix mkbootimg parameters for releasetools.
eed6860d388f1761405d7165cb4d72e1f038b8a6 26-Aug-2010 Ying Wang <wangying@google.com> am 4de6b5bf: Fix mkbootimg parameters for releasetools.

Merge commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd' into gingerbread-plus-aosp

* commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd':
Fix mkbootimg parameters for releasetools.
4de6b5bfc89de95b18514e75329a2ec7491bebbd 25-Aug-2010 Ying Wang <wangying@google.com> Fix mkbootimg parameters for releasetools.

Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
akefile
30ac7bce5418d15842897a7218c3cd4585383224 25-Aug-2010 Ying Wang <wangying@google.com> am f3a142b8: am 7eaa4dc2: Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread

Merge commit 'f3a142b8d5b4db7299b706653f4fd2952f4e5d8c'

* commit 'f3a142b8d5b4db7299b706653f4fd2952f4e5d8c':
Link against Mac OSX 10.5 SDK if building on 10.6.
f3a142b8d5b4db7299b706653f4fd2952f4e5d8c 25-Aug-2010 Ying Wang <wangying@google.com> am 7eaa4dc2: Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread

Merge commit '7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8' into gingerbread-plus-aosp

* commit '7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8':
Link against Mac OSX 10.5 SDK if building on 10.6.
b139a445d6813843b934b0ec7dd0495fe11ea77d 25-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 5f0df7a9: Manual merge

Merge commit '5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1'

* commit '5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1':
Add new variable TARGET_SHELL := ash (default; or mksh)
5f0df7a95bb6b7bbbd6fb0062bef915873f9e5a1 25-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Manual merge

Change-Id: I81dd98ba150e936b675ff2323994a1e381512332
7eaa4dc2fbc3d7b3d8a0a2576a6fc14507e176a8 25-Aug-2010 Ying Wang <wangying@google.com> Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread
cdc1d6f45711bdfa5b71513c6d4e63cf5804bc56 25-Aug-2010 Rohit Mungee <rohitm@google.com> am cb92616f: Merge "Add support for multiple html directories to droiddoc." into gingerbread

Merge commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd' into gingerbread-plus-aosp

* commit 'cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd':
Add support for multiple html directories to droiddoc.
cb92616f11f4eb07e9f11924c5ad8a78e6ab5bdd 25-Aug-2010 Rohit Mungee <rohitm@google.com> Merge "Add support for multiple html directories to droiddoc." into gingerbread
0e143c0ed90e0c11eaa3e278b98d00622fc57184 25-Aug-2010 Bill Napier <napier@google.com> Add support for multiple html directories to droiddoc.

The goal for adding this support is to allow droiddoc to pull html
files both from the static content and from content generated at
build time.

Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
roiddoc.mk
d6683f08c9ad0a924db663621844a6527164b99f 25-Aug-2010 Ying Wang <wangying@google.com> Link against Mac OSX 10.5 SDK if building on 10.6.

So that tools built on Snow Leopard (10.6) can be used on Leopard (10.5).

Change-Id: I99745ecbe2ad11feaae31d5be31c34c2e0ad7cc5
ombo/HOST_darwin-x86.mk
2213aab8b9043d939752baa61910f970338a1e6b 03-Jun-2010 Thorsten Glaser <tg@mirbsd.org> Add new variable TARGET_SHELL := ash (default; or mksh)

Besides that, add enough magic to build everything tagged
as "shell_$(TARGET_SHELL)" and permit ash/mksh as not unusual

Change-Id: I36c0590ba49f45251d24dc179cb27c8368c3662a
ase_rules.mk
uild-system.html
onfig.mk
ain.mk
5177fcd308787e6c710bf28e3c36f88581f29942 24-Aug-2010 Ying Wang <wangying@google.com> am 2eed660c: am ffff0028: Pass pagesize to makebootimage.

Merge commit '2eed660c667550f1b810303b13ee0c7e84455bf0'

* commit '2eed660c667550f1b810303b13ee0c7e84455bf0':
Pass pagesize to makebootimage.
2eed660c667550f1b810303b13ee0c7e84455bf0 23-Aug-2010 Ying Wang <wangying@google.com> am ffff0028: Pass pagesize to makebootimage.

Merge commit 'ffff0028ae9a83893f71efa370d283e2247bcdd4' into gingerbread-plus-aosp

* commit 'ffff0028ae9a83893f71efa370d283e2247bcdd4':
Pass pagesize to makebootimage.
ffff0028ae9a83893f71efa370d283e2247bcdd4 23-Aug-2010 Ying Wang <wangying@google.com> Pass pagesize to makebootimage.

Change-Id: I719d765245469921de105430fdd92d478ea48e82
akefile
d3b973d8970bcbeab3fd27a070e7373b2fa36072 23-Aug-2010 Ying Wang <wangying@google.com> am 065521be: Backport ext4 support from master [DO NOT MERGE]

Merge commit '065521be4fd6965058fbd599bb43fe13101fee7c' into gingerbread-plus-aosp

* commit '065521be4fd6965058fbd599bb43fe13101fee7c':
Backport ext4 support from master [DO NOT MERGE]
065521be4fd6965058fbd599bb43fe13101fee7c 23-Aug-2010 Ying Wang <wangying@google.com> Backport ext4 support from master [DO NOT MERGE]

ext4 support is needed by crespo.

Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9
akefile
onfig.mk
d4ee2de1c3b5163926d40879277e6e35ea40924c 22-Aug-2010 Ying Wang <wangying@google.com> am ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE]

Merge commit 'ad3cf5f868fc36de0a4fa501f074d35a94496b27' into gingerbread-plus-aosp

* commit 'ad3cf5f868fc36de0a4fa501f074d35a94496b27':
Restore OTA for crespo. [DO NOT MERGE]
ad3cf5f868fc36de0a4fa501f074d35a94496b27 22-Aug-2010 Ying Wang <wangying@google.com> Restore OTA for crespo. [DO NOT MERGE]

Change-Id: I2472942741bdb2e4fa5037883f6acbe6c4ca36c3
akefile
ed91928a6ca817a9a133ee81cfb2e9745acec21d 21-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE

Merge commit '60d1ee3e539e02ba701b9ff647fd23aca18f890d' into gingerbread-plus-aosp

* commit '60d1ee3e539e02ba701b9ff647fd23aca18f890d':
Better way to disable OTAs for crespo - DO NOT MERGE
60d1ee3e539e02ba701b9ff647fd23aca18f890d 21-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Better way to disable OTAs for crespo - DO NOT MERGE

OTAs need to be disabled for all products using crespo
hardware, not just a single one.

Change-Id: I961462e5e87bec8c59dafa13dbf0fdc96bab29ab
akefile
13a019fe32e6a0eb3289ad6142173631ac601391 21-Aug-2010 Ying Wang <wangying@google.com> am 7daa9132: Disable OTA for crespo [DO NOT MERGE]

Merge commit '7daa91323139fa7c0435a07b0e3fad6056d0954b' into gingerbread-plus-aosp

* commit '7daa91323139fa7c0435a07b0e3fad6056d0954b':
Disable OTA for crespo [DO NOT MERGE]
7daa91323139fa7c0435a07b0e3fad6056d0954b 21-Aug-2010 Ying Wang <wangying@google.com> Disable OTA for crespo [DO NOT MERGE]

Change-Id: I22c29226bb783fed34766e91d43edcf6e61a837f
akefile
e90cb7dda7818321f630b484e1e2d19c35436110 19-Aug-2010 Ying Wang <wangying@google.com> Merge "Fix dependency."
035ef0652248f66843ad7141a27a9a3a96d7a32d 19-Aug-2010 Ying Wang <wangying@google.com> Fix dependency.

Compile renderscript before building the package-export.apk.

Change-Id: Ibb7a6f940816f5839b27af94ca9b3895a84ef2ed
ackage.mk
9361404081d0d6f8171888191a4f341b8aa2b5d0 19-Aug-2010 Danica Chang <danicachang@google.com> Merge "adding network to prelink"
817a8ac99392228f894d18ea40b0fb4c1b6ca8fe 18-Aug-2010 android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> bump version from 2.2 to 2.2.1 for next froyo release

Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
ersion_defaults.mk
839c058dd062be0771ec656ee85b1128638b161d 17-Aug-2010 Raphael Moll <ralf@android.com> am ddf08caa: am ddeb150d: Add easymock for list of Windows SDK targets.

Merge commit 'ddf08caafa9644a502c0804450b9b6572010eb0d'

* commit 'ddf08caafa9644a502c0804450b9b6572010eb0d':
Add easymock for list of Windows SDK targets.
ddf08caafa9644a502c0804450b9b6572010eb0d 17-Aug-2010 Raphael Moll <ralf@android.com> am ddeb150d: Add easymock for list of Windows SDK targets.

Merge commit 'ddeb150d8d300806de576430444bf1a84ff35e96' into gingerbread-plus-aosp

* commit 'ddeb150d8d300806de576430444bf1a84ff35e96':
Add easymock for list of Windows SDK targets.
f4a956bfb63222b81d069615528d11e9809ac17c 17-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 4a6e7d7c: am 43d406e5: Merge "add drm/ directory to include it as part of frameworks"

Merge commit '4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f'

* commit '4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f':
add drm/ directory to include it as part of frameworks
ddeb150d8d300806de576430444bf1a84ff35e96 16-Aug-2010 Raphael Moll <ralf@android.com> Add easymock for list of Windows SDK targets.

Also correctly sorted the windows sdk target list.

Change-Id: I4742a0b98ece8e0693a6f346a1f09595253d65c1
ain.mk
4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f 16-Aug-2010 Jean-Baptiste Queru <jbq@google.com> am 43d406e5: Merge "add drm/ directory to include it as part of frameworks"

Merge commit '43d406e5c633af505de0e05e44fda9cfe781c184' into gingerbread-plus-aosp

* commit '43d406e5c633af505de0e05e44fda9cfe781c184':
add drm/ directory to include it as part of frameworks
43d406e5c633af505de0e05e44fda9cfe781c184 16-Aug-2010 Jean-Baptiste Queru <jbq@google.com> Merge "add drm/ directory to include it as part of frameworks"
d1d3f299fe2decc76c058bdcac638e2ad1e9df3a 13-Aug-2010 Danica Chang <danicachang@google.com> adding network to prelink

Change-Id: I8b18689d17a5b0070392238e5c78954c1f38df5c
relink-linux-arm.map
70748bb17f750a526277486acc4bcfb67589d82e 11-Aug-2010 Ben Dodson <bjdodson@google.com> Fix for heap size in apicheck

Change-Id: Id2efffef3e81464994c3788d1d0bc69c60bc6456
asks/apicheck.mk
6629a4a08e9d44b9c0afd231cd10c11262edcb59 11-Aug-2010 Ben Dodson <bjdodson@google.com> Merge "Use doclava for apicheck"
9904ec2429ec9a4c705ec07df1a33ac45bc30062 11-Aug-2010 Hung-ying Tyan <tyanh@google.com> am d81e9f88: am ddefdef5: Make ProGuard keep necessary members for serializable classes

Merge commit 'd81e9f88f4576dd8b18143f0a0d5f50c3758202b'

* commit 'd81e9f88f4576dd8b18143f0a0d5f50c3758202b':
Make ProGuard keep necessary members for serializable classes
d81e9f88f4576dd8b18143f0a0d5f50c3758202b 11-Aug-2010 Hung-ying Tyan <tyanh@google.com> am ddefdef5: Make ProGuard keep necessary members for serializable classes

Merge commit 'ddefdef5bc560d95f799993759c22ddc02e61b49' into gingerbread-plus-aosp

* commit 'ddefdef5bc560d95f799993759c22ddc02e61b49':
Make ProGuard keep necessary members for serializable classes
ddefdef5bc560d95f799993759c22ddc02e61b49 10-Aug-2010 Hung-ying Tyan <tyanh@google.com> Make ProGuard keep necessary members for serializable classes

Change-Id: I845eb8280d0cab7e426b17c94d74bc409e66c193
roguard.flags
83019ba39c6c55586c987fd0988ece5050b005db 11-Aug-2010 Ben Dodson <bjdodson@google.com> Use doclava for apicheck

Change-Id: I6a84717cf645e2a27cea9271c444d159c82439c5
asks/apicheck.mk
78a24ab2a5afd583ee5033c15e68ee31faa4f54e 06-Aug-2010 Ben Dodson <bjdodson@google.com> Merge "Migrating to Doclava for documentation generation; 60% speed improvement when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See http://code.google.com/p/doclava"
2d9798cf883e09a5972070542e79e87768f0f9b7 06-Aug-2010 Chung-yih Wang <cywang@google.com> resolved conflicts for merge of 9b7ebf5d to master

Change-Id: I0dfbc70b4b52a69ba43f14def4203ece8d9c9090
9b7ebf5dbd34634a0ea6815c0738df767045224d 06-Aug-2010 Chung-yih Wang <cywang@google.com> am 1a2649f0: Merge "Add voip(SIP related codes) into framework." into gingerbread

Merge commit '1a2649f0da35218748db5aa02c9969246a714b8f' into gingerbread-plus-aosp

* commit '1a2649f0da35218748db5aa02c9969246a714b8f':
Add voip(SIP related codes) into framework.
1a2649f0da35218748db5aa02c9969246a714b8f 06-Aug-2010 Chung-yih Wang <cywang@google.com> Merge "Add voip(SIP related codes) into framework." into gingerbread
6d98f5f4d6a25b03c7322ed596ab377ef65cf1fd 06-Aug-2010 Dima Zavin <dima@android.com> core: fix paths to libm arch-specific include dirs

Change-Id: I17a1ed13af6d4955a636ad429917b683ac59a947
Signed-off-by: Dima Zavin <dima@android.com>
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
1034455a245bf4d6f0c5d8b32f754a686d46af83 06-Aug-2010 Ben Dodson <bjdodson@google.com> Migrating to Doclava for documentation generation; 60% speed improvement when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See http://code.google.com/p/doclava

Change-Id: If317bd108043b152d28babc88a7c949db5127a93
roiddoc.mk
ebfddaa55bfcc981c767ea9e3ddbf2f30b6046d1 31-Jul-2010 Ying Wang <wangying@google.com> Now slang supports multiple rs files in a single run.

Change-Id: I26be766614ee3542d76471e3fc55f485ac65bdee
efinitions.mk
f9be43305a74fc1c8123cb4eb5c74347acce8a13 05-Aug-2010 Brian Carlstrom <bdc@google.com> am 7dc35a3b: Tracking merge of dalvik-dev to gingerbread

Merge commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0' into gingerbread-plus-aosp

* commit '7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0':
Tracking merge of dalvik-dev to gingerbread
7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0 05-Aug-2010 Brian Carlstrom <bdc@google.com> Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd36b12054ac73992a2737ea294387116
git cherry-pick --no-commit d05d74b2d6f717ee25ca14c913ea7610c030ecd1
git cherry-pick --no-commit 5479d77e320420ef0cd7250d1a6729839ef907ce

Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
ava.mk
asks/cts.mk
ab8ed58c63a08a820345214ae94fe39bd8cae6ee 05-Aug-2010 Chung-yih Wang <cywang@google.com> Add voip(SIP related codes) into framework.

Change-Id: I12bbeb3dacd51b0234872529479e61bdd8536629
athmap.mk
f735129d08fa2bb54dba05630e1a129b8bd4bd7a 04-Aug-2010 Colin Cross <ccross@android.com> Merge changes I81e84ca0,I6e3a6ba3

* changes:
Pass partition sizes to make_ext4fs
Add dependencies on make_ext4fs
e0a40217df12c274f591da212d30bf66c923524c 03-Aug-2010 Colin Cross <ccross@android.com> Pass partition sizes to make_ext4fs

Change-Id: I81e84ca02e4326989d25f7d43306c56cdc39348c
akefile
9dd4ba88eeb54966d9952c71b6fd78cbac8db3ba 03-Aug-2010 Colin Cross <ccross@android.com> Add dependencies on make_ext4fs

Change-Id: I6e3a6ba33fd9e0ce35137f6e2f60d01521af4cb9
akefile
onfig.mk
9d396e37ac695916671614ab89797652ed02538c 30-Jul-2010 Jing Yu <jingyu@google.com> Make arm-linux-androideabi toolchain the default for Android build.

androideabi target is already in upstream GCC. The arm-linux-
androideabi toolchain can be built directly from upstream GCC.
Switching from old special tailored arm-eabi toolchain to the new
arm-linux-androideabi toolchain make us closer to the opensource
community and friendly to all toolchain developers.

kernel still uses arm-eabi toolchain. So we add arm-eabi toolchain
path to PATH.

The arm-linux-androideabi-4.4.x toolchain is built with the same
source as the latest arm-eabi-4.4.3 toolchain except for the
target change patches.

Change-Id: I1e5f2fe2faeee08f913f37e0ba93e84d2654a8ff
ombo/TARGET_linux-arm.mk
umpvar.mk
relink-linux-arm.map
778c2b690025a91b55b2e841921605c55baf652c 29-Jul-2010 Ying Wang <wangying@google.com> am 33c11ac3: am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo

Merge commit '33c11ac3f150a388ebf2df80a42b577c136282de'

* commit '33c11ac3f150a388ebf2df80a42b577c136282de':
Dist apkcerts.txt for unbundled builds
33c11ac3f150a388ebf2df80a42b577c136282de 29-Jul-2010 Ying Wang <wangying@google.com> am e1f37ba0: am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo

Merge commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4' into gingerbread-plus-aosp

* commit 'e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4':
Dist apkcerts.txt for unbundled builds
e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4 29-Jul-2010 Ying Wang <wangying@google.com> am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo

Merge commit '55edb20e246e88afd841f63725c647132d9aca17' into gingerbread

* commit '55edb20e246e88afd841f63725c647132d9aca17':
Dist apkcerts.txt for unbundled builds
55edb20e246e88afd841f63725c647132d9aca17 29-Jul-2010 Ying Wang <wangying@google.com> Merge "Dist apkcerts.txt for unbundled builds" into froyo
c350a6680718c2c24ee496dfd942f6854f6799bd 29-Jul-2010 Xavier Ducrohet <xav@android.com> am 45270759: am e743c53b: Package ddmlib-prebuilt with CTS.

Merge commit '45270759642c03bdbe39ae261e22160d2c64ecec'

* commit '45270759642c03bdbe39ae261e22160d2c64ecec':
Package ddmlib-prebuilt with CTS.
45270759642c03bdbe39ae261e22160d2c64ecec 29-Jul-2010 Xavier Ducrohet <xav@android.com> am e743c53b: Package ddmlib-prebuilt with CTS.

Merge commit 'e743c53b88faf35be47667b0252c881c7b32f856' into gingerbread-plus-aosp

* commit 'e743c53b88faf35be47667b0252c881c7b32f856':
Package ddmlib-prebuilt with CTS.
8e06aa9bd68dbae05f6f545061a7175bf8654f76 28-Jul-2010 Jing Yu <jingyu@google.com> Merge "Group needed libraries together to solve the cyclic dependence between libc, libc_nomalloc and libgcc. When building with upcoming arm-linux-androideabi toolchain, Symbol raise is needed by libgcc.a and defined by libc.a or libc_nomalloc.a.which."
e743c53b88faf35be47667b0252c881c7b32f856 28-Jul-2010 Xavier Ducrohet <xav@android.com> Package ddmlib-prebuilt with CTS.

This ensures that CTS is using a compatible ddmlib.

Change-Id: Iff6d2bfec873949dfd07ccf758bf257350f11298
asks/cts.mk
79b4be961b3f1d099033e37d2185c245d80210fc 25-Jul-2010 Dianne Hackborn <hackbod@google.com> Change version codename.

Change-Id: I0bee8d54cf50448f53133eaae64bc0e57781d4ed
ersion_defaults.mk
2bdf2653dc685d9e473f122804f98f2bf3b9c619 27-Jul-2010 aimitakeshi <aimitakeshi@gmail.com> add drm/ directory to include it as part of frameworks

Change-Id: I62a6ab77587d88ea960f9ece17dcb75726e7e5a9
athmap.mk
f671d9ae46939b12d1ee02cb7034d36476771caa 27-Jul-2010 Ying Wang <wangying@google.com> Add $(LOCAL_MODULE) as part of the installed path.

Change-Id: If691e263f157aa0d123c0e3fe3c9698bbbf58c96
ative_test.mk
83ef704944038de48f7a31e4c54dec065667f0af 26-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 4e8e998e: am 989fade3: am af44485f: merge from open-source froyo

Merge commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4'

* commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4':
Include Test Case List from CTS Project
4e8e998ecc2bf8b3971d62963c09b558ca6d5da4 26-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 989fade3: am af44485f: merge from open-source froyo

Merge commit '989fade304ef5253b5b401f347e26f768d75f35f' into gingerbread-plus-aosp

* commit '989fade304ef5253b5b401f347e26f768d75f35f':
Include Test Case List from CTS Project
989fade304ef5253b5b401f347e26f768d75f35f 26-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am af44485f: merge from open-source froyo

Merge commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread

* commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10':
Include Test Case List from CTS Project
af44485fe83bb36a9d55fb54a8f5362854dd7b10 26-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source froyo

Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa
9b6865f8264a1d83955aba869827b11c29ab0b43 26-Jul-2010 Evan Charlton <evanc@google.com> am 606540b7: resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp

Merge commit '606540b739599c8f079baa2a03b5f0501b148eb2'

* commit '606540b739599c8f079baa2a03b5f0501b148eb2':
Packages can specify where to find AndroidManifest.xml
606540b739599c8f079baa2a03b5f0501b148eb2 26-Jul-2010 Evan Charlton <evanc@google.com> resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp

Change-Id: I67b9af3ef344cfa7502f780d82c1a3d8a1a33f6d
2467fe24f0c447fcd59831ea1faecdf526889dea 26-Jul-2010 Chih-Wei Huang <cwhuang@linux.org.tw> Add atom optimization flags

To enable the optimization, set TARGET_ARCH_VARIANT := x86-atom.

Change-Id: I6b7798944bb8262bd83a76712419d8a77d3c34e9
ombo/TARGET_linux-x86.mk
efb21682668cfcd924560cb03a747d07d73892aa 24-Jul-2010 Ying Wang <wangying@google.com> Dist apkcerts.txt for unbundled builds

Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7
akefile
f2bfa76cf8937cb98b0205da1ed7f8267bd5714b 23-Jul-2010 Evan Charlton <evanc@google.com> resolved conflicts for merge of 121a7873 to gingerbread

Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e
121a78733a9ff105efabbff3314548f973a9105b 23-Jul-2010 Evan Charlton <evanc@google.com> Packages can specify where to find AndroidManifest.xml

By overriding LOCAL_MANIFEST_FILE, a package can now specify which
AndroidManifest.xml file to use. This also allows for AndroidManifest.xml to
be in a non-standard location, though that's not recommended.

Change-Id: Ib6d1baeef7601e5a93d4ce64d18883d45373fc12
lear_vars.mk
ackage.mk
de3bbf0e61ed171e60e7cb3b56a2f60ce8c53a01 23-Jul-2010 Ying Wang <wangying@google.com> am 3986feae: am ef5bf469: am bce4b75f: Add JNI_H_INCLUDE as default header search path

Merge commit '3986feae3266a86f0eb4d20fe97588868608b4c1'

* commit '3986feae3266a86f0eb4d20fe97588868608b4c1':
Add JNI_H_INCLUDE as default header search path
3986feae3266a86f0eb4d20fe97588868608b4c1 23-Jul-2010 Ying Wang <wangying@google.com> am ef5bf469: am bce4b75f: Add JNI_H_INCLUDE as default header search path

Merge commit 'ef5bf469fab7166373b10db6c88e6c3cf0e64217' into gingerbread-plus-aosp

* commit 'ef5bf469fab7166373b10db6c88e6c3cf0e64217':
Add JNI_H_INCLUDE as default header search path
ef5bf469fab7166373b10db6c88e6c3cf0e64217 23-Jul-2010 Ying Wang <wangying@google.com> am bce4b75f: Add JNI_H_INCLUDE as default header search path

Merge commit 'bce4b75fa7801fcb88c6a9ade9465806fe18d441' into gingerbread

* commit 'bce4b75fa7801fcb88c6a9ade9465806fe18d441':
Add JNI_H_INCLUDE as default header search path
bce4b75fa7801fcb88c6a9ade9465806fe18d441 23-Jul-2010 Ying Wang <wangying@google.com> Add JNI_H_INCLUDE as default header search path

So that module Android.mk does not need to include it manually.
Also with this change, CL like https://android-git.corp.google.com/g/57887 is not needed.

Change-Id: I68fa73a00c76eb37a8142f35d7eeef79cf53c09b
inary.mk
fa3d88f8845b1db42da4886faff93db2b53cfcf1 22-Jul-2010 Brian Muramatsu <btmura@android.com> Include Test Case List from CTS Project

Bug 2732160

Have the cts.mk include the test case list from CTS rather
than defining it in cts.mk. This permits CTS developers to
add new packages and applications without having to submit
multiple project changes to both the CTS and build projects
everytime.

Change-Id: I63d90ac4f5d9fc9a9aa0ff79a8bf9dfb1a79c822
asks/cts.mk
87208510abfc29683687a5902683f852ee19ad96 22-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 85581a1b: merge from open-source master

Merge commit '85581a1ba81105740cc1e87bfad040bbac4662ec'

* commit '85581a1ba81105740cc1e87bfad040bbac4662ec':
Allow explicit warnings for projects
85581a1ba81105740cc1e87bfad040bbac4662ec 22-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ide7fbe06d7f9c1a06827365f006ddc7a01ba4dab
84a5ba03b469a28f3678eb58ecd9aada5b416493 22-Jul-2010 Ying Wang <wangying@google.com> am b96e8a8c: am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo

Merge commit 'b96e8a8cc629c3e3a196263cc548bd55824e4ade'

* commit 'b96e8a8cc629c3e3a196263cc548bd55824e4ade':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
1a631273eb1178198a83150672a15114706bf74f 22-Jul-2010 Ying Wang <wangying@google.com> am 163ce0f6: am ebf93bb5: am 75b28573: Fix sim build for unbundling native code

Merge commit '163ce0f62f7992d2c79257965919fcc1d975a6ec'

* commit '163ce0f62f7992d2c79257965919fcc1d975a6ec':
Fix sim build for unbundling native code
b96e8a8cc629c3e3a196263cc548bd55824e4ade 22-Jul-2010 Ying Wang <wangying@google.com> am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo

Merge commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7' into gingerbread-plus-aosp

* commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
163ce0f62f7992d2c79257965919fcc1d975a6ec 22-Jul-2010 Ying Wang <wangying@google.com> am ebf93bb5: am 75b28573: Fix sim build for unbundling native code

Merge commit 'ebf93bb5c4585e783813ed5fcc54fc02b80ea460' into gingerbread-plus-aosp

* commit 'ebf93bb5c4585e783813ed5fcc54fc02b80ea460':
Fix sim build for unbundling native code
d9dea715e5841028b1a30aa3f357b05c9de3e8c7 22-Jul-2010 Ying Wang <wangying@google.com> am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo

Merge commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d' into gingerbread

* commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
ebf93bb5c4585e783813ed5fcc54fc02b80ea460 22-Jul-2010 Ying Wang <wangying@google.com> am 75b28573: Fix sim build for unbundling native code

Merge commit '75b28573fe739a10f0f91fab1ef916ddd1c0b91c' into gingerbread

* commit '75b28573fe739a10f0f91fab1ef916ddd1c0b91c':
Fix sim build for unbundling native code
d5c217aca18726f0ed9f2ea034f750620d4bdf7d 22-Jul-2010 Ying Wang <wangying@google.com> Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
e3feba8ba176251298808c2660c056de6c5ed32b 22-Jul-2010 Ying Wang <wangying@google.com> Merge "Fix native test static lib."
475d8e95888a7c77c146fee172f3a3572a3fb261 22-Jul-2010 Ying Wang <wangying@google.com> Fix native test static lib.

Change-Id: I2ef5a4c913732a9a3211556493926f4883b4160e
ative_test.mk
38d7f02c50aae9b1578b575cf6dd12d73249368a 21-Jul-2010 Ying Wang <wangying@google.com> Trim spaces.

Change-Id: Ic3c592ca9457748acf7f2c5e99dccd3ed62f5ee4
akefile
584f5b7a84b6187a3d72d42aa5af2f0bda2eb874 20-May-2010 Jing Yu <jingyu@google.com> Group needed libraries together to solve the cyclic dependence
between libc, libc_nomalloc and libgcc. When building with upcoming
arm-linux-androideabi toolchain, Symbol raise is needed by libgcc.a
and defined by libc.a or libc_nomalloc.a.which.

This patch groups libgc.a, libc_nomalloc.a and libgcc.a together, which is
a minimal group to solve this problem.

Change-Id: I27ed78c495dc53c1db7b302da8704f5e478ad893
ombo/TARGET_linux-arm.mk
c2bc4f968211ef7d44dc0fa065f97600cb84ab45 21-Jul-2010 Ying Wang <wangying@google.com> Merge "Allow PRODUCT_PROPERTY_OVERRIDES to override default locale."
4c681745e622cc2887c114d963b62869a9ef93af 20-Jul-2010 Ying Wang <wangying@google.com> Flags common for native tests

With the CL, "include $(BUILD_NATIVE_TEST)" to build native test;
"include $(BUILD_HOST_NATIVE_TEST)" to build a host native test.

Change-Id: Icdbbcf906cd4c5c35e65962897490052cd051102
onfig.mk
nvsetup.mk
ost_native_test.mk
ative_test.mk
77c882ff88686d3cd312e7ed752ddcd7ad93a169 28-Apr-2010 Ying Wang <wangying@google.com> Allow PRODUCT_PROPERTY_OVERRIDES to override default locale.

Change-Id: I5147d687750a50cfc186e99a9a8c88d3b2eb1692
If PRODUCT_PROPERTY_OVERRIDES has set default locale, buildinfo.sh skips setting them.
http://b/issue?id=2243115
akefile
c06243d1953c6e62238066c60486db70aa3a3b30 27-Apr-2010 Ying Wang <wangying@google.com> Fix jar dependency on the local manifest file.

Change-Id: I1a868885e72c94c4b065723a8d6e890fce5ba1e0
http://b/issue?id=1444634
ase_rules.mk
ost_java_library.mk
ava.mk
ec5e729fcf692a17285eb66f8f28ed9b236216dd 27-Apr-2010 Ying Wang <wangying@google.com> Make build/core/find-jdk-tools-jar.sh fail more explicitly

http://b/issue?id=1505957
Before this change, if tools.jar can not be found, make reports error like:
make: *** No rule to make target `Please-install-JDK-5.0,-update-12-or-higher,-which-you-can-download-from-java.sun.com'...
With this change, the error message is much nicer:
build/core/config.mk:264: *** Error: could not find jdk tools.jar, please install JDK-5.0, update 12 or higher, which you can download from java.sun.com. Stop.

Change-Id: Id33cfb6ee7676d66f00d0a41d07c1f27abc6a402
onfig.mk
ind-jdk-tools-jar.sh
0188414bc634798fa429be627cdb697daee68966 21-Jul-2010 Ying Wang <wangying@google.com> add phony target "all_modules" and use it as make goal for "mm"/"mmm"

So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=2811503

Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd
ain.mk
7adbf97d110ebe137579e1078e3846aa4f3c6c2c 07-Jul-2010 Jeffrey Chyan <jeffrey.chyan@garmin.com> Allow explicit warnings for projects

Enabled compiler warnings by default and then modified javac
command to include warnings only if a project's warning flag,
LOCAL_WARNINGS_ENABLE, is set to true.

Change-Id: I5111d16a862f3afaaf1dcba2f2c2b7fc072613f1
lear_vars.mk
efinitions.mk
0bd59a0a58f9891926ff6faf74a78307230d705b 16-Jul-2010 Ying Wang <wangying@google.com> Build system support for RenderScript

With this change, you can add your .rs files to LOCAL_SRC_FILES.
The .rs files will be compiled by slang and the output .java files
will be compiled into the jar, while the generated .bc files will
be put into the final apk as raw resources.

Change-Id: Icde3d6139951d6d039b4b37376e72e1fc5c8b0d4
onfig.mk
efinitions.mk
ava.mk
ackage.mk
75b28573fe739a10f0f91fab1ef916ddd1c0b91c 16-Jul-2010 Ying Wang <wangying@google.com> Fix sim build for unbundling native code

NDK does not support sim build.

Change-Id: I57a09c0083126c57a99cf33c055edef3390d1c28
inary.mk
9582d2c572e1d80d7423ec6b45ba6c872aa2a607 16-Jul-2010 Joe Onorato <joeo@android.com> am c8ae417b: am b1c272a6: Do a full clean build because of the installclean improvement steps

Merge commit 'c8ae417bdce7e49e08de7046beccf8a31276d715'

* commit 'c8ae417bdce7e49e08de7046beccf8a31276d715':
Do a full clean build because of the installclean improvement steps
c8ae417bdce7e49e08de7046beccf8a31276d715 16-Jul-2010 Joe Onorato <joeo@android.com> am b1c272a6: Do a full clean build because of the installclean improvement steps

Merge commit 'b1c272a670936322db5200d888ea8558eb266d6e' into gingerbread-plus-aosp

* commit 'b1c272a670936322db5200d888ea8558eb266d6e':
Do a full clean build because of the installclean improvement steps
b1c272a670936322db5200d888ea8558eb266d6e 16-Jul-2010 Joe Onorato <joeo@android.com> Do a full clean build because of the installclean improvement steps

Change-Id: I8f8ec00667374cd1f5adad6ea4d737dac79be47f
leanspec.mk
f0be6c08b34de458ccb5356aa63cacdea5ca9ee8 15-Jul-2010 Joe Onorato <joeo@android.com> am 90ef224f: am e2c62252: Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread

Merge commit '90ef224f8ff2b0cec58f49306d333b7489ec37e8'

* commit '90ef224f8ff2b0cec58f49306d333b7489ec37e8':
Instrumentation links against the jar file for its app, so use that at the dependency.
c236f78c980a292e880fdd5dca18382442ee80c9 15-Jul-2010 Joe Onorato <joeo@android.com> am 84843e68: am d7324cc3: Merge "Fix event-log-tags so we don\'t rebuild framework.jar because of an installclean." into gingerbread

Merge commit '84843e6843f0429f0729deb5670c22da0dcc5507'

* commit '84843e6843f0429f0729deb5670c22da0dcc5507':
Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
7e01d1469bb8738058ce3516af5ac3baa6529430 15-Jul-2010 Joe Onorato <joeo@android.com> am a3b31fba: am 2198ff81: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread

Merge commit 'a3b31fba91da41ad12d4ed3272942b4208979d7d'

* commit 'a3b31fba91da41ad12d4ed3272942b4208979d7d':
The ICU data is no longer compiled directly into the shared library.
90ef224f8ff2b0cec58f49306d333b7489ec37e8 15-Jul-2010 Joe Onorato <joeo@android.com> am e2c62252: Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread

Merge commit 'e2c622524116b49d5817fedf1d88e2bb1521a9ec' into gingerbread-plus-aosp

* commit 'e2c622524116b49d5817fedf1d88e2bb1521a9ec':
Instrumentation links against the jar file for its app, so use that at the dependency.
84843e6843f0429f0729deb5670c22da0dcc5507 15-Jul-2010 Joe Onorato <joeo@android.com> am d7324cc3: Merge "Fix event-log-tags so we don\'t rebuild framework.jar because of an installclean." into gingerbread

Merge commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5' into gingerbread-plus-aosp

* commit 'd7324cc356e9c67d878d156ca81928ab2ef220f5':
Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
a3b31fba91da41ad12d4ed3272942b4208979d7d 15-Jul-2010 Joe Onorato <joeo@android.com> am 2198ff81: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread

Merge commit '2198ff81b98941e905f7e39616f5ca15effb5704' into gingerbread-plus-aosp

* commit '2198ff81b98941e905f7e39616f5ca15effb5704':
The ICU data is no longer compiled directly into the shared library.
e2c622524116b49d5817fedf1d88e2bb1521a9ec 15-Jul-2010 Joe Onorato <joeo@android.com> Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread
d7324cc356e9c67d878d156ca81928ab2ef220f5 15-Jul-2010 Joe Onorato <joeo@android.com> Merge "Fix event-log-tags so we don't rebuild framework.jar because of an installclean." into gingerbread
2198ff81b98941e905f7e39616f5ca15effb5704 15-Jul-2010 Joe Onorato <joeo@android.com> Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
14d9515363aa82e2c29346c41921d8d6ed07b1ca 15-Jul-2010 Joe Onorato <joeo@android.com> Instrumentation links against the jar file for its app, so use that at the dependency.

I don't remember exactly, but I think the dependencies for apps
were broken, and you couldn't reliably cause the java to be rebuilt
by depending just on the jar file-- you needed to depend on the
apk. That isn't the case anymore, and relying on the apk means
that something built in out/target/common was depending on something
that's deleted by installclean.

With this change (and others), on my mac, the build after
installclean for passion-eng takes 2 minutes instead of 11.

Change-Id: Ib490f88292d591254013e07958961fc50ec2e3dc
ase_rules.mk
0b181946435f5d27b8fd42aed9ce1194a13fc921 15-Jul-2010 Mathias Agopian <mathias@google.com> am e80545f0: am 9967e9db: Merge "add an entry for the new libgui" into gingerbread

Merge commit 'e80545f00d819f0ef300e3146b404d382288fb4e'

* commit 'e80545f00d819f0ef300e3146b404d382288fb4e':
add an entry for the new libgui
e80545f00d819f0ef300e3146b404d382288fb4e 15-Jul-2010 Mathias Agopian <mathias@google.com> am 9967e9db: Merge "add an entry for the new libgui" into gingerbread

Merge commit '9967e9dbb82e982db67fcfc5412055f26b8721b4' into gingerbread-plus-aosp

* commit '9967e9dbb82e982db67fcfc5412055f26b8721b4':
add an entry for the new libgui
9967e9dbb82e982db67fcfc5412055f26b8721b4 15-Jul-2010 Mathias Agopian <mathias@google.com> Merge "add an entry for the new libgui" into gingerbread
c70574add569a80872b8b00c0a9627b3e94c04f5 14-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 07523a19: am a0cb4666: Merge "merge from open-source froyo" into froyo

Merge commit '07523a191de568aba9753d4d12d1fe392feea497' into gingerbread-plus-aosp

* commit '07523a191de568aba9753d4d12d1fe392feea497':
Build Accessibility Tests and APK
07523a191de568aba9753d4d12d1fe392feea497 14-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am a0cb4666: Merge "merge from open-source froyo" into froyo

Merge commit 'a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a' into gingerbread

* commit 'a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a':
Build Accessibility Tests and APK
a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a 14-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "merge from open-source froyo" into froyo
b75105315187ec2719bdc8adfdea6fc4f6b296ef 14-Jul-2010 Joe Onorato <joeo@android.com> Fix event-log-tags so we don't rebuild framework.jar because of an installclean.

Produce an event logs tag file for everything we know about, in order
to properly allocate numbers. Then produce a file that's filtered
for what's going to be installed.

Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5
akefile
ase_rules.mk
b46f2c747c36b73bc1e72a5a3672d4e92542e622 14-Jul-2010 Mathias Agopian <mathias@google.com> add an entry for the new libgui

libgui is for high level C++ frameworks, it can depend on the
binder (unlike libui).

Change-Id: I4a1ebc69284919c85dce03e1395578af2fd08aa8
relink-linux-arm.map
ad8aec94faa3c08b990110bbe12484eadc897839 14-Jul-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 6c56dd64 to master

Change-Id: If806a737c5cc46cd4545788dfa991cdeab488213
53b3cadbba793af3b1d22be9b70b1519d10f5ca7 14-Jul-2010 Joe Onorato <joeo@android.com> The ICU data is no longer compiled directly into the shared library.

Change-Id: I79accedc16d6e62a95c0ec6f08ad2538013cd0b3
leanbuild.mk
6c56dd64b25eaba741b41888e98ea31bd34202b2 14-Jul-2010 Ying Wang <wangying@google.com> am a9b02f0b: resolved conflicts for merge of a6bed2f7 to gingerbread

Merge commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13' into gingerbread-plus-aosp

* commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13':
Add phony target dist_libraries
a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13 14-Jul-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of a6bed2f7 to gingerbread

Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03
a6bed2f723cce6e684102890b4e6cb224412a1ce 14-Jul-2010 Ying Wang <wangying@google.com> Merge "Add phony target dist_libraries" into froyo
95318832bea604b9cb70bb0722a8fff0d3a691ba 14-Jul-2010 Ying Wang <wangying@google.com> am 4a1addef: am 90b1d3dc: am b6a1c180: Keep the crt start/end var name of sh consistent with other archs

Merge commit '4a1addef83d6458ba41b498648a36046a27a01b8'

* commit '4a1addef83d6458ba41b498648a36046a27a01b8':
Keep the crt start/end var name of sh consistent with other archs
4a1addef83d6458ba41b498648a36046a27a01b8 14-Jul-2010 Ying Wang <wangying@google.com> am 90b1d3dc: am b6a1c180: Keep the crt start/end var name of sh consistent with other archs

Merge commit '90b1d3dcfece8eef53277cbcf0326deda9f16f09' into gingerbread-plus-aosp

* commit '90b1d3dcfece8eef53277cbcf0326deda9f16f09':
Keep the crt start/end var name of sh consistent with other archs
90b1d3dcfece8eef53277cbcf0326deda9f16f09 14-Jul-2010 Ying Wang <wangying@google.com> am b6a1c180: Keep the crt start/end var name of sh consistent with other archs

Merge commit 'b6a1c1802961f40fe4736e80402f849968cd2563' into gingerbread

* commit 'b6a1c1802961f40fe4736e80402f849968cd2563':
Keep the crt start/end var name of sh consistent with other archs
b6a1c1802961f40fe4736e80402f849968cd2563 14-Jul-2010 Ying Wang <wangying@google.com> Keep the crt start/end var name of sh consistent with other archs

So that the PRIVATE_ vars get values correctly.

Change-Id: I1eea67f02c5bab5018b3b5fd93904e1ee8643bf7
ombo/TARGET_linux-sh.mk
aabbc07cb84b1693b5876d8f4bf4d21a4940681d 14-Jul-2010 Ying Wang <wangying@google.com> am 90cf34c7: am f0f60cdd: resolved conflicts for merge of 1a08100f to gingerbread

Merge commit '90cf34c72e204eb1d23f43d1fccbf2076e8ff67b'

* commit '90cf34c72e204eb1d23f43d1fccbf2076e8ff67b':
Support to build native libraries with prebuilt NDK
90cf34c72e204eb1d23f43d1fccbf2076e8ff67b 14-Jul-2010 Ying Wang <wangying@google.com> am f0f60cdd: resolved conflicts for merge of 1a08100f to gingerbread

Merge commit 'f0f60cdd8f4f74b2480774887606afdebec8d891' into gingerbread-plus-aosp

* commit 'f0f60cdd8f4f74b2480774887606afdebec8d891':
Support to build native libraries with prebuilt NDK
f0f60cdd8f4f74b2480774887606afdebec8d891 14-Jul-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 1a08100f to gingerbread

Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7
1a08100fa9d92c25de32ba4d13fd3958bbcab894 13-Jul-2010 Ying Wang <wangying@google.com> Support to build native libraries with prebuilt NDK

Bug: http://b/issue?id=2811253
Change-Id: Iabd4ab8b3d7236dffe89f1939e1142e882944026
inary.mk
lear_vars.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
onfig.mk
efinitions.mk
aw_executable.mk
hared_library.mk
tatic_library.mk
0e4c0267fb3276cd41c520216dce9b6bded5d46f 14-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source froyo

Change-Id: I2759c464efef13754154310d10816a5781243311
c1b24549e37399aa0b1f0c9d3e33a4b8527fce41 12-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 87f50000: merge from open-source master

Merge commit '87f500004acc7b68745bd939a473dd92e77b5c9c'

* commit '87f500004acc7b68745bd939a473dd92e77b5c9c':
Define __ANDROID__ for x86 to be on par with ARM build requirements
87f500004acc7b68745bd939a473dd92e77b5c9c 12-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I0221f3903a2fc6a0fb25ae62913fdc2e9d3c3f4f
fee7fe7c74a031f769f53b9a7d6d0c0015130f3b 12-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am c9d11861: merge from open-source master

Merge commit 'c9d118615161d8b94d4abedac86e3bdf510b251b'

* commit 'c9d118615161d8b94d4abedac86e3bdf510b251b':
Allow TARGET_ARCH to be set from BoardConfig.mk
c9d118615161d8b94d4abedac86e3bdf510b251b 12-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Iad583004b67ce1ef0651e81b57c2c95632da9845
fe2ef85d5d41cfa28c9fe8ef86da3dbaaeec1aba 08-Jul-2010 Bruce Beare <brucex.j.beare@intel.com> Define __ANDROID__ for x86 to be on par with ARM build requirements

Change-Id: I79c8f29af1f20b694f22a39f848216022809a5c6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
ombo/TARGET_linux-x86.mk
b73dc6690baf38bbc7c102a3992722db8d61a5a0 12-Jul-2010 Bruce Beare <brucex.j.beare@intel.com> Allow TARGET_ARCH to be set from BoardConfig.mk

Change-Id: I66aed78b763d238719822257c1f4f35301247df6
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
onfig.mk
umpvar.mk
nvsetup.mk
4be5c394c17dcc595c1da6feb695932526da7ec9 10-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 0fd96df4: merge from open-source master

Merge commit '0fd96df49ccecbf3628c95dabf3b94dfc27323e5'

* commit '0fd96df49ccecbf3628c95dabf3b94dfc27323e5':
Refactor Stripper. Allow a stripper other than SOSLIM to be specified
0fd96df49ccecbf3628c95dabf3b94dfc27323e5 10-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I40aa6f0f885ea30dd5f9918c323fa240a4830c38
635c42b4bcc69d59bbbf8f4949024175468d7cdf 10-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 4f6d526d: merge from open-source master

Merge commit '4f6d526d602b115b6cd4f2cefbce3e091bdbd871'

* commit '4f6d526d602b115b6cd4f2cefbce3e091bdbd871':
Set arm specific variables to be empty for non-arm platforms
2a582caba17cf3ee601cc224d0d360004b7bb46c 10-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 39a6a644: merge from open-source master

Merge commit '39a6a64471b28032d2037d9472d58dc0a77ef313'

* commit '39a6a64471b28032d2037d9472d58dc0a77ef313':
Create systemtarball either with bz2 or gz
4f6d526d602b115b6cd4f2cefbce3e091bdbd871 09-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I72922bd787ea0fbc199d9362e1cd1d2ed8283b57
39a6a64471b28032d2037d9472d58dc0a77ef313 09-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ic005b0772e144fc986fd3bacc67d5840b16efb81
c608c44c1f9771a8705131e48f3ee83a3185717d 09-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 703f4958: merge from open-source master

Merge commit '703f4958c207c575adfa1526725728b96c575649'

* commit '703f4958c207c575adfa1526725728b96c575649':
update 404'd source.android.com URLs
703f4958c207c575adfa1526725728b96c575649 09-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I9381e982495bddb4ddba12bdc46f8c4becddd6bf
8137a0b6590f0749bfc26b07ca2c4633a3a5d43a 09-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am d7fcea20: merge from open-source master

Merge commit 'd7fcea201db376e285aab74cefae29d2ac2b33df'

* commit 'd7fcea201db376e285aab74cefae29d2ac2b33df':
Create boottarball just like systemtarball
d7fcea201db376e285aab74cefae29d2ac2b33df 09-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I0a6dc054775374db6b312feccebc46e26266b1fe
56997a98c3da80c520d43978d9082233eb164064 09-Jul-2010 Ying Wang <wangying@google.com> am 1599ddd0: am 0d205521: Merge "Enforce 64-bit build environment" into gingerbread

Merge commit '1599ddd08529465aef8f205bd6fce28f16d2ec37'

* commit '1599ddd08529465aef8f205bd6fce28f16d2ec37':
Enforce 64-bit build environment
1599ddd08529465aef8f205bd6fce28f16d2ec37 09-Jul-2010 Ying Wang <wangying@google.com> am 0d205521: Merge "Enforce 64-bit build environment" into gingerbread

Merge commit '0d205521ae4e8907bcc80774260a68c923970eca' into gingerbread-plus-aosp

* commit '0d205521ae4e8907bcc80774260a68c923970eca':
Enforce 64-bit build environment
0d205521ae4e8907bcc80774260a68c923970eca 09-Jul-2010 Ying Wang <wangying@google.com> Merge "Enforce 64-bit build environment" into gingerbread
45ac4341515f7ff4d483cfb8e2fba8d3c2cb1f6e 24-Jun-2010 Bruce Beare <brucex.j.beare@intel.com> Refactor Stripper. Allow a stripper other than SOSLIM to be specified

Change-Id: I61137f5bb123dc5f610af9928ed3debdf85ba74d
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
akefile
ombo/HOST_darwin-x86.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
ombo/select.mk
onfig.mk
efinitions.mk
ynamic_binary.mk
daea3fce402d7e10f224f97552f6890a26da31ed 09-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Set arm specific variables to be empty for non-arm platforms"
0d09e587aaa52fe1d3f1bfdd6faec9c5e232e1df 09-Jul-2010 Chih-Wei Huang <cwhuang@linux.org.tw> Set arm specific variables to be empty for non-arm platforms

These variables are useless for non-arm platforms, and will
generate misleading messages during building process.

Change-Id: I37c46ac8d30f353333803d9591b65fca24ce3fd5
inary.mk
ee195f3365e1284705956cbda09a2924b8d8e906 09-Jul-2010 Steve Howard <showard@google.com> am 8b0ecc08: am de6a0857: Fix broken interaction of JarJar and Emma.

Merge commit '8b0ecc08166a4e83a8df5864e5264a88962101f1'

* commit '8b0ecc08166a4e83a8df5864e5264a88962101f1':
Fix broken interaction of JarJar and Emma.
f5f11eb01c7f2ea82e5cd91824bf4e053d4dfd69 09-Jul-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Create systemtarball either with bz2 or gz"
69ef5ce4f0e0adfac1ff12f8cc3dde65fab36486 11-Jun-2010 Bruce Beare <brucex.j.beare@intel.com> Create systemtarball either with bz2 or gz

Change-Id: I64e93872942e8dcad4a894a906be7912bb6da308
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
akefile
68f9303c90253f5149e4bfe323f9ee77fdf4b380 26-Jun-2010 Chris Peterson <cpeterso@cpeterso.com> update 404'd source.android.com URLs

Change-Id: If305c7f6f3ac3624568de258bdc13b142ad32cf9
ain.mk
36b332beca58f4bc350d820fe0a3a7bb13899028 08-Jul-2010 Brian Muramatsu <btmura@android.com> Build Accessibility Tests and APK

Bug 2814482

Froyo's cts.mk was missing two lines added to Eclair's cts.mk that
are needed to build the accessibility tests and apk.

Change-Id: I05f93bc0a56b2ec1e07eab8c7a15ef7d4bb90d18
asks/cts.mk
52aac20307073b8149a31d01b0b295651ea4b042 05-Jun-2010 Bruce Beare <brucex.j.beare@intel.com> Create boottarball just like systemtarball

Change-Id: I97640bc973ab1d115499878a63bff48f80b326ec
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
akefile
ain.mk
8b0ecc08166a4e83a8df5864e5264a88962101f1 08-Jul-2010 Steve Howard <showard@google.com> am de6a0857: Fix broken interaction of JarJar and Emma.

Merge commit 'de6a08576487b949180c1b0ed1c19e9f7f4ef787' into gingerbread-plus-aosp

* commit 'de6a08576487b949180c1b0ed1c19e9f7f4ef787':
Fix broken interaction of JarJar and Emma.
d2e830b9b408b95df46f628f33ced3dcbd6975d8 08-Jul-2010 Ying Wang <wangying@google.com> Enforce 64-bit build environment

We will only support 64-bit build environment from now on.

Change-Id: Ic58cb3e06e7fc9cf19a65e6c05c26f12ff9886b7
ain.mk
de6a08576487b949180c1b0ed1c19e9f7f4ef787 07-Jul-2010 Steve Howard <showard@google.com> Fix broken interaction of JarJar and Emma.

JarJar, like DX, can't handle the local var corruption that Emma
performs. To fix this, I'm moving the JarJar step before the Emma
step.

Couple other minor changes:
* Improved the comment about emma hardcoding its output filename,
since this took me about an hour to track down.
* Changed one line from "Copying $<" to "Copying $@". It seems to be
the convention that such lines print the destination, not the
source, so I made it consistent.

Change-Id: I9f5c36b4f5af15daf15025b89860e942f15bb668
ava.mk
8d9cbe557d352a2af6750500f3feb57b13cd9742 08-Jul-2010 Ying Wang <wangying@google.com> Add phony target dist_libraries

that is only used to put your library into the dist dir when doing a full build.

Change-Id: I11e9dc15237086843ea4a00736c81ffc680ca12e
ain.mk
6ab7b2d58214ebd4da97be01975dda43175ff787 07-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am d05a47c0: merge from open-source master

Merge commit 'd05a47c00ec3595b25ef9f46cd8b825cd35a8dca'

* commit 'd05a47c00ec3595b25ef9f46cd8b825cd35a8dca':
Add $(TARGET_DEVICE_DIR)/system.prop to be a prerequisite
d05a47c00ec3595b25ef9f46cd8b825cd35a8dca 07-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I3b89fb8a09f7c3e1a23695572bca33751626542d
4e3c6686d15423a41a419b78143852eebfc2eb46 31-Aug-2009 Chih-Wei Huang <cwhuang@linux.org.tw> Add $(TARGET_DEVICE_DIR)/system.prop to be a prerequisite

If $(TARGET_DEVICE_DIR)/system.prop exists, it should be
a prerequisite of $(INSTALLED_BUILD_PROP_TARGET),
as the following rules state.

Change-Id: Ie395b6f08cef198c3f5c733a5b6ae5a458335a9c
akefile
d5d6095552912726f70e4a357584150c77a819e9 02-Jul-2010 Steve Howard <showard@google.com> am 750ac4f3: Manual merge of change 50994 from master (DO NOT MERGE)

Merge commit '750ac4f3a43dfbb66e45517ce2502858daeab1a9' into gingerbread-plus-aosp

* commit '750ac4f3a43dfbb66e45517ce2502858daeab1a9':
Manual merge of change 50994 from master (DO NOT MERGE)
750ac4f3a43dfbb66e45517ce2502858daeab1a9 04-May-2010 Steve Howard <showard@google.com> Manual merge of change 50994 from master (DO NOT MERGE)

Merging from master because I'm bringing my maps API work into
gingerbread.

Fix and enable JarJar in Java builds.

java.mk contained a target to enable JarJar in Java builds, but it was
being bypassed. This change enabled JarJar as part of the build
process, and fixes a slight bug with the way it was set up.

Change-Id: I814e64eb30b41bf249a63d683c03040e2658fe0d
onfig.mk
ava.mk
b4c7d32cbac0ef36062c4e2f348b47e027610eef 02-Jul-2010 Doug Zongker <dougz@android.com> support for ext4/EMMC in target_files and OTA generation

Move the image sizes into a more generic key-value file. Make them
optional. Add additional key/value pairs describing what kind of
filesystem the device uses. Pass new fs-type-related arguments in
edify scripts when mounting and reformatting partitions.

Don't include all the init.*.rc files from the regular system in
recovery -- they aren't needed, and break recovery on some devices.

Change-Id: I40e49e65f0d76f735259e4b4fef882322cd739da
akefile
8160d9316afc9e653ab93e14a347ef6789a0ebed 02-Jul-2010 Ed Heyl <edheyl@google.com> am 7d735133: Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge b/2590492 and requested again

Merge commit '7d735133cd6f019ce839fa824f4507f19aff2e8f' into gingerbread-plus-aosp

* commit '7d735133cd6f019ce839fa824f4507f19aff2e8f':
Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
382fd41a9b34400cc9dbda348efc9924f28223b7 01-Jul-2010 The Android Open Source Project <initial-contribution@android.com> am 3c37c63a: merge from open-source master

Merge commit '3c37c63a83ff178334b855747ecda4c1f24c38ca'

* commit '3c37c63a83ff178334b855747ecda4c1f24c38ca':
Fix to "make ddmlib ddmuilib" under Windows/Cygwin.
7d735133cd6f019ce839fa824f4507f19aff2e8f 01-Jul-2010 Ed Heyl <edheyl@google.com> Add ramdisk.img to the dist dir, again (was removed at some point) - from master - please do no merge
b/2590492 and requested again

Change-Id: I1f4efac2a8ca47f1b69761bb9233427e0ca0411d
ain.mk
8532aa03becfb072aa6e884d313a67bada8a5abf 01-Jul-2010 Ed Heyl <edheyl@google.com> Add ramdisk.img to the dist dir, again (was removed at some point)
b/2590492 and requested again

Change-Id: I5e4c8efddf7a202694c36231c6082089eedefa5d
ain.mk
3c37c63a83ff178334b855747ecda4c1f24c38ca 01-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Idf8c8890a251c77b131fed6019428501a41fd788
34377b9ed8d5fc5c389a9cef5dbd727dae1faf1e 01-Jul-2010 Ying Wang <wangying@google.com> am 9fd6b635: am ca88861b: am 783f449b: Don\'t copy apns-conf.xml for apps-only build

Merge commit '9fd6b635d4f631968ed7a39394918ea3cd87f459'

* commit '9fd6b635d4f631968ed7a39394918ea3cd87f459':
Don't copy apns-conf.xml for apps-only build
9fd6b635d4f631968ed7a39394918ea3cd87f459 01-Jul-2010 Ying Wang <wangying@google.com> am ca88861b: am 783f449b: Don\'t copy apns-conf.xml for apps-only build

Merge commit 'ca88861ba6ede0e577d92c1ed103fd4acd3fc0ba' into gingerbread-plus-aosp

* commit 'ca88861ba6ede0e577d92c1ed103fd4acd3fc0ba':
Don't copy apns-conf.xml for apps-only build
ca88861ba6ede0e577d92c1ed103fd4acd3fc0ba 01-Jul-2010 Ying Wang <wangying@google.com> am 783f449b: Don\'t copy apns-conf.xml for apps-only build

Merge commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9' into gingerbread

* commit '783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9':
Don't copy apns-conf.xml for apps-only build
aae60c0760de29b461933347c23ec32963c91e4d 29-Jun-2010 Raphael Moll <ralf@android.com> Fix to "make ddmlib ddmuilib" under Windows/Cygwin.

Needed by the latest change to sdk.git/eclipse/script/create_ddms*.sh

Change-Id: I6dfbb418cc8813c7cdfbc077705158424220724f
ain.mk
2b5079353b57615e8ec9826a685453174d9c0f36 01-Jul-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master - DO NOT MERGE

Change-Id: I52a12f84d69726d353c87c1b150af205ba22f460
783f449bdc0fe8aa9f2385c22bb0831fa3d5d1c9 01-Jul-2010 Ying Wang <wangying@google.com> Don't copy apns-conf.xml for apps-only build

http://b/issue?id=2796939
This can fix commands mm and mmm in an unbundled branch.
The cause is that mm & mmm depends on phony target "files", which includes apns-conf.xml.

Change-Id: I72ce1c7c5ddfdcd3bbea5cb9645ca3a48ff8ac12
ain.mk
77dfeaed2ac068770cd29b314e7697afd7c1741c 22-Jun-2010 Jeff Hamilton <jham@android.com> Switch the required host Java environment to 1.6.

The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.

Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c

The java version changed, and we made envsetup automatically find the right JAVA_HOME.

This change forces everyone to re-source envsetup.sh

Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee

Fix javadoc for Java 6.

If you don't set bootclasspath, there would be errors like:
javadoc: error - In doclet class DroidDoc, method start has thrown an exception java.lang.reflect.InvocationTargetException

Change-Id: I1b83360cb595d50577c6043d6e91b0f92e4c04d6

Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp

The inherited value has caused build breakage on Mac build.

Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2

Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.

Don't check STAY_OFF_MY_LAWN in set_java_home. That function already
refuses to update JAVA_HOME if it's set to something, which should
be sufficient for anybody who doesn't want the script to mess with it.

With this change, you can get the benefits of the 1.5/1.6 auto-selection
without having to suffer through window title changes.

Change-Id: I5cfc5d6fdf26a10b42b52925f877012c0506b9a5
roiddoc.mk
nvsetup.mk
ain.mk
22d019b51d78684efc7fda70063a586e3e5ba8ea 30-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Change branch name to gingerbread, to match reality - DO NOT MERGE" into gingerbread
baff089c37b6ad5e317ffb1dc1f08905e873ae8a 29-Jun-2010 Doug Kwan <dougkwan@google.com> Enable ICF link-time optimization.

Change-Id: I49af3366262bebe12dacfebe99ec742b79bf9d84
ombo/TARGET_linux-arm.mk
8f5069b1be9af316c948e9cd7bae2abdc33da5bc 29-Jun-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 822fa972 to master

Change-Id: Ic7a7499b2058abbc6cefd94a0a06a95ef8c4d61c
822fa972f8013927f5180086b83bc81d15ca82dd 29-Jun-2010 Ying Wang <wangying@google.com> am dd2c2155: am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo

Merge commit 'dd2c21550c6a31493b4c1d0a01451a88a8747b35' into gingerbread-plus-aosp

* commit 'dd2c21550c6a31493b4c1d0a01451a88a8747b35':
Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
dd2c21550c6a31493b4c1d0a01451a88a8747b35 29-Jun-2010 Ying Wang <wangying@google.com> am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo

Merge commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c' into gingerbread

* commit '0af605f3b6e759f480a5124dc6b338ec58e1d40c':
Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS
0af605f3b6e759f480a5124dc6b338ec58e1d40c 29-Jun-2010 Ying Wang <wangying@google.com> Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo
dcd11407e242e8e50d122752a5df769450ab6d8d 28-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I90d465b0197034dab76505b8a68afc519be3e6e0
833e62400e7ecfea3df188b99b6639708fe36963 28-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Update platform version strings for AOSP

Change-Id: I47d405646dd2f5179bd0db0a0b360bf5ba0069c1
ersion_defaults.mk
cf937bb4d813a002a11ac0ffa2f3975938fb7d0d 25-Jun-2010 David 'Digit' Turner <digit@google.com> am 5cd0870e: am a7f9179e: Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread

Merge commit '5cd0870e6215ab8c2be01a8e7b36600db323b77a'

* commit '5cd0870e6215ab8c2be01a8e7b36600db323b77a':
Enable shared libraries to use crtbegin_so.S and crtend_so.S
5cd0870e6215ab8c2be01a8e7b36600db323b77a 25-Jun-2010 David 'Digit' Turner <digit@google.com> am a7f9179e: Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread

Merge commit 'a7f9179ecc7e2c4b70cf6eedb8ea785a00efb4c3' into gingerbread-plus-aosp

* commit 'a7f9179ecc7e2c4b70cf6eedb8ea785a00efb4c3':
Enable shared libraries to use crtbegin_so.S and crtend_so.S
a7f9179ecc7e2c4b70cf6eedb8ea785a00efb4c3 25-Jun-2010 David 'Digit' Turner <digit@google.com> Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread
6ae5c1b512d2d5e8e7abcbb7a3548511a933e522 25-Jun-2010 Ying Wang <wangying@google.com> am b2fe30f0: am c955834a: am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"

Merge commit 'b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88'

* commit 'b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88':
default empty tapas to TARGET_BUILD_APPS "all"
b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88 25-Jun-2010 Ying Wang <wangying@google.com> am c955834a: am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"

Merge commit 'c955834ad0715343a2245142be416f92b83e8306' into gingerbread-plus-aosp

* commit 'c955834ad0715343a2245142be416f92b83e8306':
default empty tapas to TARGET_BUILD_APPS "all"
665828875b25db458c0b47885850c1d7a11140df 25-Jun-2010 Ying Wang <wangying@google.com> am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"

Merge commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13' into froyo-plus-aosp

* commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13':
default empty tapas to TARGET_BUILD_APPS "all"
c955834ad0715343a2245142be416f92b83e8306 25-Jun-2010 Ying Wang <wangying@google.com> am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"

Merge commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13' into gingerbread

* commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13':
default empty tapas to TARGET_BUILD_APPS "all"
c048c9b598b36dc7506a954cc0d3d80f308b1b13 25-Jun-2010 Ying Wang <wangying@google.com> default empty tapas to TARGET_BUILD_APPS "all"

So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch.
Also, the magic "all" apps will build only apps, not other things.

Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
ase_rules.mk
ain.mk
572d63052dcc0238749b7c6a67a02a7e50d58495 24-Jun-2010 Ying Wang <wangying@google.com> am 8b4be231: am 8e6f821e: Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp

Merge commit '8b4be231519376c9dc73622be4b8a5ddc0d83805'

* commit '8b4be231519376c9dc73622be4b8a5ddc0d83805':
Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
8b4be231519376c9dc73622be4b8a5ddc0d83805 24-Jun-2010 Ying Wang <wangying@google.com> am 8e6f821e: Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp

Merge commit '8e6f821e733e075086cb80309717e3a85e2a9c37' into gingerbread-plus-aosp

* commit '8e6f821e733e075086cb80309717e3a85e2a9c37':
Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp
8e6f821e733e075086cb80309717e3a85e2a9c37 24-Jun-2010 Ying Wang <wangying@google.com> Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp

The inherited value has caused build breakage on Mac build.

Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2
roiddoc.mk
5f9168c0d56d0c20da91f06d1078a1a47f1b547a 24-Jun-2010 Andreas Huber <andih@google.com> am c55bb9ec: am f2bab487: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread

Merge commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e'

* commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e':
Remove now unnecessary property overrides to opt into stagefright.
c55bb9ecc92d34e448adec76bc06abdcd3c35f0e 24-Jun-2010 Andreas Huber <andih@google.com> am f2bab487: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread

Merge commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a' into gingerbread-plus-aosp

* commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a':
Remove now unnecessary property overrides to opt into stagefright.
f2bab487cc71a8a210ff98d21172d62edcaa6d2a 24-Jun-2010 Andreas Huber <andih@google.com> Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
a52c4f31dc79f51553661e8ab1223b33236df963 24-Jun-2010 Ying Wang <wangying@google.com> am 48de6ce7: am 7b142da3: Fix javadoc for Java 6.

Merge commit '48de6ce732a797f5c61186a3e57bec535e37d873'

* commit '48de6ce732a797f5c61186a3e57bec535e37d873':
Fix javadoc for Java 6.
48de6ce732a797f5c61186a3e57bec535e37d873 24-Jun-2010 Ying Wang <wangying@google.com> am 7b142da3: Fix javadoc for Java 6.

Merge commit '7b142da3ce3849e56134666566df3f04f033c57d' into gingerbread-plus-aosp

* commit '7b142da3ce3849e56134666566df3f04f033c57d':
Fix javadoc for Java 6.
7b142da3ce3849e56134666566df3f04f033c57d 24-Jun-2010 Ying Wang <wangying@google.com> Fix javadoc for Java 6.

If you don't set bootclasspath, there would be errors like:
javadoc: error - In doclet class DroidDoc, method start has thrown an exception java.lang.reflect.InvocationTargetException

Change-Id: I1b83360cb595d50577c6043d6e91b0f92e4c04d6
roiddoc.mk
e3bbae0382e887b69c8657bb793e3d492de55f49 24-Jun-2010 Andreas Huber <andih@google.com> Remove now unnecessary property overrides to opt into stagefright.

Change-Id: I9810030e5576ac5a9cb31fcf0ce3f0baa96f6f40
related-to-bug: 2370115
ain.mk
74ba0c834fd203264c5968bfa8267b1888e1e562 24-Jun-2010 Joe Onorato <joeo@android.com> am 1884d99a: am aee4daac: The java version changed, and we made envsetup automatically find the right JAVA_HOME.

Merge commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c'

* commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c':
The java version changed, and we made envsetup automatically find the right JAVA_HOME.
1884d99a7ab74dd53d9134d6200bb0aff3867f8c 24-Jun-2010 Joe Onorato <joeo@android.com> am aee4daac: The java version changed, and we made envsetup automatically find the right JAVA_HOME.

Merge commit 'aee4daacc804bbcd1df551cc2229d12fa5c35c24' into gingerbread-plus-aosp

* commit 'aee4daacc804bbcd1df551cc2229d12fa5c35c24':
The java version changed, and we made envsetup automatically find the right JAVA_HOME.
aee4daacc804bbcd1df551cc2229d12fa5c35c24 23-Jun-2010 Joe Onorato <joeo@android.com> The java version changed, and we made envsetup automatically find the right JAVA_HOME.

This change forces everyone to re-source envsetup.sh

Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee
nvsetup.mk
1ae607add31de4708e732c7139e68d425b920595 23-Jun-2010 Ying Wang <wangying@google.com> Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS

Change-Id: Ibbcd626e6856d9340d9d3e2f916127feed0b6f5c
efinitions.mk
ba3897fdf17452498607d53a6159f91b11381eb3 23-Jun-2010 Jeff Hamilton <jham@android.com> am 66d41149: am 4a1c70e5: Switch the required host Java environment to 1.6.

Merge commit '66d41149d94fc7153467f9e1b0af55518ba86565'

* commit '66d41149d94fc7153467f9e1b0af55518ba86565':
Switch the required host Java environment to 1.6.
66d41149d94fc7153467f9e1b0af55518ba86565 23-Jun-2010 Jeff Hamilton <jham@android.com> am 4a1c70e5: Switch the required host Java environment to 1.6.

Merge commit '4a1c70e53be40fd1b2c14eb7c0acc93f6df865bc' into gingerbread-plus-aosp

* commit '4a1c70e53be40fd1b2c14eb7c0acc93f6df865bc':
Switch the required host Java environment to 1.6.
9a4e5f4a30550c515d0f2a95a97019131fa422c7 23-Jun-2010 Dianne Hackborn <hackbod@google.com> am a41921ed: am f319c635: Add new "libandroid" to prelink map.

Merge commit 'a41921ed7e3cfccc40db3f8d2b1e4059b0715ebd'

* commit 'a41921ed7e3cfccc40db3f8d2b1e4059b0715ebd':
Add new "libandroid" to prelink map.
4a1c70e53be40fd1b2c14eb7c0acc93f6df865bc 22-Jun-2010 Jeff Hamilton <jham@android.com> Switch the required host Java environment to 1.6.

The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.

Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c
ain.mk
a41921ed7e3cfccc40db3f8d2b1e4059b0715ebd 22-Jun-2010 Dianne Hackborn <hackbod@google.com> am f319c635: Add new "libandroid" to prelink map.

Merge commit 'f319c635a85aca77b2f93f2a352295dba28c946b' into gingerbread-plus-aosp

* commit 'f319c635a85aca77b2f93f2a352295dba28c946b':
Add new "libandroid" to prelink map.
f319c635a85aca77b2f93f2a352295dba28c946b 19-Jun-2010 Dianne Hackborn <hackbod@google.com> Add new "libandroid" to prelink map.

Change-Id: I10bc30088fced39b2875bbbc19e33c53fa8352d7
relink-linux-arm.map
878c62ae14fb88cfda9d197298e152d82f854316 21-Jun-2010 Guang Zhu <guangzhu@google.com> resolved conflicts for merge of 10b3f4b8 to master

Change-Id: I169c45161af01596c408cd3f3173d67cb541cb46
10b3f4b8fc48ef12bced83716ef9fc08ec67ee1c 21-Jun-2010 Guang Zhu <guangzhu@google.com> am 4b137047: restore emma changes overwrittern by I9174f843

Merge commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e' into gingerbread-plus-aosp

* commit '4b137047210a1e64df1ebc0807d4eeeac7052c1e':
restore emma changes overwrittern by I9174f843
4b137047210a1e64df1ebc0807d4eeeac7052c1e 21-Jun-2010 Guang Zhu <guangzhu@google.com> restore emma changes overwrittern by I9174f843

Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5
ain.mk
e1fef62bce230b9eb8a2a2c910d593f87e8173be 21-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from froyo-plus-aosp - DO NOT MERGE

Change-Id: I5ddea1d56218732cf5cba16e0c8db18399b7f504
205591981c6382603d924885a7cefb86017c3949 21-Jun-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 34d37e50 to master

Change-Id: Ie7083ec2c87eb3fd28ea31002267f12ffe4426fa
ca553e21f8a82a421a2ea1ff504e7f9e328edb23 21-Jun-2010 Ying Wang <wangying@google.com> am 06898660: A nothing-to-do build should do nothing.

Merge commit '068986605b2afcd5e044b62f22ac6ecd5c15b519' into froyo-plus-aosp

* commit '068986605b2afcd5e044b62f22ac6ecd5c15b519':
A nothing-to-do build should do nothing.
45113a7faa37747032be887ed12dd0e440524229 21-Jun-2010 Ying Wang <wangying@google.com> am 06898660: A nothing-to-do build should do nothing.

Merge commit '068986605b2afcd5e044b62f22ac6ecd5c15b519' into gingerbread

* commit '068986605b2afcd5e044b62f22ac6ecd5c15b519':
A nothing-to-do build should do nothing.
438f5f75ec650dee5918e1976fedf2ed871dcd04 19-Jun-2010 David 'Digit' Turner <digit@google.com> Enable shared libraries to use crtbegin_so.S and crtend_so.S

This is necessary to ensure that dlclose() will properly call C++
destructors for the static objects within the shared library.

Change-Id: Ieb056042f9cda7ab120eb770b21f365cd6d64a66
ombo/TARGET_linux-arm.mk
21f597ba5c3bc8ef0c9e0ba115e2c083d0a7eece 19-Jun-2010 Jack Palevich <jackpal@google.com> Merge "Add LOCAL_JNI_SHARED_LIBRARIES_ABI build variable."
8b8ee713e02ba6699fd6c85c561cbb1242d76b68 18-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ia4356e797e0c9bceec56a9a5cfeab3def5ae453c
24de9707485f8621dd22d3cc843db1d7218a744a 18-Jun-2010 Ying Wang <wangying@google.com> Increase memory for Javadoc.

sdk builds continue breaking for out of memory..

Change-Id: Ie056241309f0303cdd4857cfb1421996811b1a8a
roiddoc.mk
979e4765e78daf8f85c94a98235e0fd0e718f4e1 18-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Change branch name to openmaster, to avoid confusion

Change-Id: Ibd0e460fd0f0c5d6fa4c1f858fbc280a0bcf7f1a
uild_id.mk
181857a19dcaf3b05f02afd0c0233b7e73bc2a01 18-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Change branch name to gingerbread, to match reality - DO NOT MERGE

Bug: 2780717
Change-Id: I448fa9c164ab3732c52d1f195493ed86be0a1b08
uild_id.mk
a0ab29b986af30351efc2983faaf93bcbf040303 18-Jun-2010 Jack Palevich <jackpal@google.com> Add LOCAL_JNI_SHARED_LIBRARIES_ABI build variable.

LOCAL_JNI_SHARED_LIBRARIES_ABI allows individual APKs to specify
specify the path where JNI shared libraries are stored in the APK. This
is useful if you want to build an APK that supports a generic version of
an ABI (e.g. armeabi) from a device configuration where
TARGET_CPU_ABI is set to a more specific version of an ABI (e.g.
armeabi-v7a.)

Note that specifying the LOCAL_JNI_SHARED_LIBRARIES_ABI does not
affect how the local JNI shared libraries are built. It just controls
where the local JNI shared libraries are placed within the APK.

Defaults to TARGET_CPU_ABI.

Change-Id: I1cbb293e0c953688945fc147c7fc367421cf860b
lear_vars.mk
efinitions.mk
ackage.mk
068986605b2afcd5e044b62f22ac6ecd5c15b519 18-Jun-2010 Ying Wang <wangying@google.com> A nothing-to-do build should do nothing.

Before this CL, ota_from_target_files is always executed even with no new change.

Change-Id: I29d6aef3c60e5b0229551a3bf22f2d31cb41f219
akefile
840182d8ad6f555ac28a26fccddb927319f40dfc 17-Jun-2010 Ying Wang <wangying@google.com> Merge "extfs support for img_from_target_files"
933abf15bcd66138ba4e5fba7071e239a8662c6b 16-Jun-2010 Ying Wang <wangying@google.com> extfs support for img_from_target_files

Change-Id: Ie3df70426066bff467792b8528bc4528eb6afe15
akefile
2eb35f020fc09cbba52034f8cdbffe67c88f0a2a 17-Jun-2010 Jean-Baptiste Queru <jbq@google.com> am 7aba65bb: merge from froyo-plus-aosp

Merge commit '7aba65bb2b38ade61f5edd4d9f92c58953505ed1'

* commit '7aba65bb2b38ade61f5edd4d9f92c58953505ed1':
Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target"
7aba65bb2b38ade61f5edd4d9f92c58953505ed1 17-Jun-2010 Jean-Baptiste Queru <jbq@google.com> merge from froyo-plus-aosp

Change-Id: Ica7f3076728f549ce94dd90584bdc24ee84ced15
aa90e9eac8211165d52cdba7b7a9d3102bf217f7 17-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I55d36474223c79e6ab5000b2cb09b01762eb3823
7ef314546ba57a371c7d78f95845322bccfa0786 17-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target"

This reverts commit 9bfd697cffae4b4f2bdbf122c3bbe7920525e718,
which was causing all prebuilts to be installed in all builds.

Change-Id: Ia5973b31d23bd74ec187b9e44715dea56c063efe
ulti_prebuilt.mk
96c286daf1e1434dbf04502c91c793a999ec36cd 17-Jun-2010 Jing Yu <jingyu@google.com> am eed926c8: am ada132a8: Switch toolchain from gcc-4.4.0 to gcc-4.4.3

Merge commit 'eed926c889382073c74de43a0d15e37462623cf3'

* commit 'eed926c889382073c74de43a0d15e37462623cf3':
Switch toolchain from gcc-4.4.0 to gcc-4.4.3
eed926c889382073c74de43a0d15e37462623cf3 17-Jun-2010 Jing Yu <jingyu@google.com> am ada132a8: Switch toolchain from gcc-4.4.0 to gcc-4.4.3

Merge commit 'ada132a80ba7edde00ac71727a205d55578e3f47' into gingerbread-plus-aosp

* commit 'ada132a80ba7edde00ac71727a205d55578e3f47':
Switch toolchain from gcc-4.4.0 to gcc-4.4.3
ada132a80ba7edde00ac71727a205d55578e3f47 17-Jun-2010 Jing Yu <jingyu@google.com> Switch toolchain from gcc-4.4.0 to gcc-4.4.3

gcc-4.4.3 toolchain is based on fsf GCC-4.4.3 with numerous patches.
It reduces 3.65% code size than the prebuilt gcc-4.4.0 toolchain,
and improves 3.4% performance on Android benchmarks.

The toolchain uses gold as default linker. With gold, the toolchain
further reduces 1MB system image.

Change-Id: I55eb4df185f2932e71498fcc28428e4d1b175393
ombo/TARGET_linux-arm.mk
nvsetup.mk
fc7b7827fc64dbabe30e6a5618d59c34c6fcd8c8 17-Jun-2010 David 'Digit' Turner <digit@google.com> am b6bee6f1: am 3e467785: Remove irritating warnings about \'va_list\' mangling when building C++ sources.

Merge commit 'b6bee6f17187a9eb3645e9519cca4a126d9aca21'

* commit 'b6bee6f17187a9eb3645e9519cca4a126d9aca21':
Remove irritating warnings about 'va_list' mangling when building C++ sources.
b6bee6f17187a9eb3645e9519cca4a126d9aca21 17-Jun-2010 David 'Digit' Turner <digit@google.com> am 3e467785: Remove irritating warnings about \'va_list\' mangling when building C++ sources.

Merge commit '3e4677856f0e16a732cecc15cafa7efde1f21241' into gingerbread-plus-aosp

* commit '3e4677856f0e16a732cecc15cafa7efde1f21241':
Remove irritating warnings about 'va_list' mangling when building C++ sources.
6a7ce1c7782c6f2dec8e4281c46249539ad03957 17-Jun-2010 Ying Wang <wangying@google.com> Merge "Move definition of build-userimage-ext-target to build/"
3e4677856f0e16a732cecc15cafa7efde1f21241 17-Jun-2010 David 'Digit' Turner <digit@google.com> Remove irritating warnings about 'va_list' mangling when building C++ sources.

Change-Id: I6305e93515e57462e7c57af0cc41a659e4190696
ombo/TARGET_linux-arm.mk
63f7dad434ef54a33e95012621386d4df10b3779 17-Jun-2010 Guang Zhu <guangzhu@google.com> am 4873beb5: am a943634a: Merge "improvement for emma filter option" into gingerbread

Merge commit '4873beb5b018d74a3b38403f34628ed6c3435888'

* commit '4873beb5b018d74a3b38403f34628ed6c3435888':
improvement for emma filter option
4873beb5b018d74a3b38403f34628ed6c3435888 17-Jun-2010 Guang Zhu <guangzhu@google.com> am a943634a: Merge "improvement for emma filter option" into gingerbread

Merge commit 'a943634afaf64ad2188fc8ecfb54daed40350be2' into gingerbread-plus-aosp

* commit 'a943634afaf64ad2188fc8ecfb54daed40350be2':
improvement for emma filter option
a943634afaf64ad2188fc8ecfb54daed40350be2 17-Jun-2010 Guang Zhu <guangzhu@google.com> Merge "improvement for emma filter option" into gingerbread
c79f4da0ef8a030d0aaf342e6107a4f4788471a4 16-Jun-2010 Ying Wang <wangying@google.com> Move definition of build-userimage-ext-target to build/

Change-Id: I313dc26e8c497797c3321627e13ae298b1e37723
akefile
onfig.mk
f9cd36a0f71c78e20f5ff24f9dd48af17d741cb6 16-Jun-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 56791ebe to master

Change-Id: I7463636796f1262fd92af839102dc58d562259f7
56791ebe2622ba223ddde214f9b1c3f495191921 16-Jun-2010 Ying Wang <wangying@google.com> am c01cf7b9: resolved conflicts for merge of 2b8d2383 to gingerbread

Merge commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6' into gingerbread-plus-aosp

* commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6':
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6 16-Jun-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of 2b8d2383 to gingerbread

Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
8004266329761dcb8545d23200a5baa747cedd1f 15-Jun-2010 Joe Onorato <joeo@android.com> Require a directory that could actually exist.

Change-Id: I6030a062dc9f6a40ea32ecbb612c2b9353fc1af6
asks/cts.mk
8aeb7cc4614147adaa70a9c270c68737afb4c3f7 15-Jun-2010 Joe Onorato <joeo@android.com> am 2b8d2383: Merge changes I02214abd,I79e6f60e into froyo

Merge commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1' into froyo-plus-aosp

* commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1':
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
2b8d2383043a2b16e53538f9ebf123bfffd27ba1 15-Jun-2010 Joe Onorato <joeo@android.com> Merge changes I02214abd,I79e6f60e into froyo

* changes:
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
9cd3d8c6543ffb2eef7935d8f832f99675dc630e 15-Jun-2010 Guang Zhu <guangzhu@google.com> improvement for emma filter option

the original implementation directly embeds the filter variable into command
line; this implies that filter variable cannot contain any whitespaces,
otherwise it'll be misintepreted as a new command line argument to emma. the
side effect is that user will be forced to cram all filter related java
class/package names into one line, which could be very long. with this
change, user can use line continuation ("\") or appending ("+=") to break
up long filter specs.

Change-Id: I2c130033cdb5120251d6f84c3dd906d140d52991
efinitions.mk
82a93b76a8fab6a9a619596c9a927ddda44b8fd5 14-Jun-2010 Eric Laurent <elaurent@google.com> am a67baff9: am 71affe70: am 484d4d54: Merge "Added prelinked library for audio effects JNI." into kraken

Merge commit 'a67baff9a50be3a335e650d208d51e33e20b70e2'

* commit 'a67baff9a50be3a335e650d208d51e33e20b70e2':
Added prelinked library for audio effects JNI.
a67baff9a50be3a335e650d208d51e33e20b70e2 14-Jun-2010 Eric Laurent <elaurent@google.com> am 71affe70: am 484d4d54: Merge "Added prelinked library for audio effects JNI." into kraken

Merge commit '71affe70fd8f882c7c9cc7a5aca28e714241eb6e' into gingerbread-plus-aosp

* commit '71affe70fd8f882c7c9cc7a5aca28e714241eb6e':
Added prelinked library for audio effects JNI.
71affe70fd8f882c7c9cc7a5aca28e714241eb6e 14-Jun-2010 Eric Laurent <elaurent@google.com> am 484d4d54: Merge "Added prelinked library for audio effects JNI." into kraken

Merge commit '484d4d5470336b662a5e65a1f10653c4c433cf84' into gingerbread

* commit '484d4d5470336b662a5e65a1f10653c4c433cf84':
Added prelinked library for audio effects JNI.
484d4d5470336b662a5e65a1f10653c4c433cf84 14-Jun-2010 Eric Laurent <elaurent@google.com> Merge "Added prelinked library for audio effects JNI." into kraken
63c8af9aafe19e20cc6344115fbe5b914ab10d64 12-Jun-2010 Raphael <raphael@google.com> Fix the build: properly detect the BUILD OS version of Java, not the host one.

This matters when building Windows under Linux.

Change-Id: I1eaa4eeda4df359313f16d52605a1b8298765269
ombo/javac.mk
b55b07fef7c5bff8d9f3403698f18195889737ba 12-Jun-2010 Ed Heyl <edheyl@google.com> am e46a061d: am d7e7e482: am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"

Merge commit 'e46a061d08f9667783d39a60106003497c2ad41e'

* commit 'e46a061d08f9667783d39a60106003497c2ad41e':
Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
e46a061d08f9667783d39a60106003497c2ad41e 12-Jun-2010 Ed Heyl <edheyl@google.com> am d7e7e482: am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"

Merge commit 'd7e7e4825293f5b623e07f854d7ed2e3470be586' into gingerbread-plus-aosp

* commit 'd7e7e4825293f5b623e07f854d7ed2e3470be586':
Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
d7e7e4825293f5b623e07f854d7ed2e3470be586 12-Jun-2010 Ed Heyl <edheyl@google.com> am d83f3396: Revert "Merge "Switch the required host Java environment to 1.6." into kraken"

Merge commit 'd83f33969aa2734000338e01b84957996ef1bb34' into gingerbread

* commit 'd83f33969aa2734000338e01b84957996ef1bb34':
Revert "Merge "Switch the required host Java environment to 1.6." into kraken"
d83f33969aa2734000338e01b84957996ef1bb34 12-Jun-2010 Ed Heyl <edheyl@google.com> Revert "Merge "Switch the required host Java environment to 1.6." into kraken"

This reverts commit 1f29d2c376295cb7ba909ae2beb4904099546e89, reversing
changes made to f9f513ab3386e0ab61cb072170b4b65f0d124732.
ain.mk
19b9aa3cd15ba8bd1981945ba91088c07d7648f3 11-Jun-2010 Sriram Raman <sriramkraman@google.com> am ec1c20a7: am 6ad4e499: am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken

Merge commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d'

* commit 'ec1c20a7077a0afb476f8ca2b290e7a01c002b1d':
Switch the required host Java environment to 1.6.
ec1c20a7077a0afb476f8ca2b290e7a01c002b1d 11-Jun-2010 Sriram Raman <sriramkraman@google.com> am 6ad4e499: am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken

Merge commit '6ad4e499a6f9c0477ef430ba4ca73df533f6cadc' into gingerbread-plus-aosp

* commit '6ad4e499a6f9c0477ef430ba4ca73df533f6cadc':
Switch the required host Java environment to 1.6.
6ad4e499a6f9c0477ef430ba4ca73df533f6cadc 11-Jun-2010 Sriram Raman <sriramkraman@google.com> am 1f29d2c3: Merge "Switch the required host Java environment to 1.6." into kraken

Merge commit '1f29d2c376295cb7ba909ae2beb4904099546e89' into gingerbread

* commit '1f29d2c376295cb7ba909ae2beb4904099546e89':
Switch the required host Java environment to 1.6.
1f29d2c376295cb7ba909ae2beb4904099546e89 11-Jun-2010 Sriram Raman <sriramkraman@google.com> Merge "Switch the required host Java environment to 1.6." into kraken
df249af6b6bd137b7a27623905f3e94a31104eef 11-Jun-2010 Ying Wang <wangying@google.com> am 74a9fd08: am a07d37b7: Cherry-pick bug fixes from master.

Merge commit '74a9fd08731f78516a6c0e81169c8e8ff7a6d9c1' into gingerbread-plus-aosp

* commit '74a9fd08731f78516a6c0e81169c8e8ff7a6d9c1':
Cherry-pick bug fixes from master.
290f527297f655d1fd76522b253681fb4aad4a7f 11-Jun-2010 Ying Wang <wangying@google.com> am a07d37b7: Cherry-pick bug fixes from master.

Merge commit 'a07d37b79300e76da5f21f532578fcd686a74b16' into froyo-plus-aosp

* commit 'a07d37b79300e76da5f21f532578fcd686a74b16':
Cherry-pick bug fixes from master.
74a9fd08731f78516a6c0e81169c8e8ff7a6d9c1 11-Jun-2010 Ying Wang <wangying@google.com> am a07d37b7: Cherry-pick bug fixes from master.

Merge commit 'a07d37b79300e76da5f21f532578fcd686a74b16' into gingerbread

* commit 'a07d37b79300e76da5f21f532578fcd686a74b16':
Cherry-pick bug fixes from master.
f03c9acfecaa809ea86527d1edcb94f5633e7372 11-Jun-2010 Ed Heyl <edheyl@google.com> fix platform name

Change-Id: Ic6507f94887ead4d710a3da85582d49a2d9b8f24
ersion_defaults.mk
4977caa70035992921f9d3f8eaa8c6f28292171e 11-Jun-2010 Ed Heyl <edheyl@google.com> am 1d2c25b7: kraken --> gingerbread

Merge commit '1d2c25b7804e6fcee213b5ed81594f48c563e2eb' into gingerbread-plus-aosp

* commit '1d2c25b7804e6fcee213b5ed81594f48c563e2eb':
kraken --> gingerbread
1d2c25b7804e6fcee213b5ed81594f48c563e2eb 11-Jun-2010 Ed Heyl <edheyl@google.com> kraken --> gingerbread

Change-Id: I7710134ec026b9c494fe2912809607c162b5ac51
ersion_defaults.mk
da12daf15f2e6aef7e94f340d23bc435ddc025f4 10-Jun-2010 Joe Onorato <joeo@android.com> Add a tapas command.

(Actually there was a tapas command that just called choosecombo).

The new better tapas command is for building unbundled apps. Run
it with one or more modules to build and optionally a build variant.

tapas [variant] App1 App2 ...

If you don't supply a build variant, it defaults to eng.

Change-Id: I02214abd0b5ad02e364fcb024e10cf6ad17a9e68
ain.mk
16fa4b290e8ce76652c9ba0ba16b80578456ab95 10-Jun-2010 Joe Onorato <joeo@android.com> Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.

Change-Id: I79e6f60e009dad3a48709962347441e4ca0c337a
nvsetup.mk
ain.mk
ackage.mk
roduct_config.mk
75f5e39f40df211ca63dc7eb4c72844fefc1dfa7 10-Jun-2010 Jean-Baptiste Queru <jbq@google.com> am 8ce07fab: merge from froyo-plus-aosp
8ce07fabb60b557541872dcfcaf64241751be915 10-Jun-2010 Jean-Baptiste Queru <jbq@google.com> merge from froyo-plus-aosp

Change-Id: Ie085dd2e50a68bb79699f98d31ef8ceb0fe8d339
76478e8ce6283b045c3759fc868773b0e699af30 10-Jun-2010 Jeff Hamilton <jham@android.com> am f597c7be: am f9f513ab: Merge "Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers." into kraken
f9f513ab3386e0ab61cb072170b4b65f0d124732 10-Jun-2010 Jeff Hamilton <jham@android.com> Merge "Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers." into kraken
d41c06539c2c8f39d4f434efb1f69a31773a2566 09-Jun-2010 Jeff Hamilton <jham@android.com> Switch the required host Java environment to 1.6.

Change-Id: Ic289e35a747b6f462816aca159acba6d400829c9
ain.mk
e4fb7ccd9bb17f90670059992b07c908464c7952 09-Jun-2010 Jeff Hamilton <jham@android.com> Make the Java version check non-fatal to aid in the switch to 1.6 on the build servers.

Change-Id: Ieb0779ef54cdfa921a8dbfb1041536f8969d22e4
ain.mk
a07d37b79300e76da5f21f532578fcd686a74b16 09-Jun-2010 Ying Wang <wangying@google.com> Cherry-pick bug fixes from master.

1. Set correct aidl_preprocess_import for LOCAL_SDK_VERSION current.
2. Set correct PRIVATE_BOOTCLASSPATH for non-empty LOCAL_SDK_VERSION.

Change-Id: Iff8e266931434863521bfa4621767bed31d31cc0
ase_rules.mk
9a5418bba5440c915cbb44752982b80225d83cd5 09-Jun-2010 Ying Wang <wangying@google.com> resolved conflicts for merge of f83fd362 to master

Change-Id: I527111ec1461e258b4911a2aaa90100eceacea80
ab251d9c80bdffb53605437c9c18c2d0ee40aa24 09-Jun-2010 Ying Wang <wangying@google.com> am 7a794289: Merge "Unbundle the build system." into froyo

Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into froyo-plus-aosp

* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
Unbundle the build system.
66356cef22875e3eba6603cf960a58993b47b12e 09-Jun-2010 Ying Wang <wangying@google.com> am 7a794289: Merge "Unbundle the build system." into froyo

Merge commit '7a7942899eedde3b946768a155fac3d70af5c9c3' into kraken

* commit '7a7942899eedde3b946768a155fac3d70af5c9c3':
Unbundle the build system.
0f6f4ca54e3b283e3498064f47e2baac9a9c5db2 09-Jun-2010 Ying Wang <wangying@google.com> Unbundle the build system.

Change-Id: I88912d876c3972212e8871b3e5b3b8b6d2da34d0
ase_rules.mk
onfig.mk
ackage.mk
asks/apicheck.mk
452c31bc2d0a72da586768a2fc274dfa6aa4b932 09-Jun-2010 Eric Laurent <elaurent@google.com> Added prelinked library for audio effects JNI.

Change-Id: Ic3d26cedbff599c3ee6fed080b64fce5375ea940
relink-linux-arm.map
f56e9165d9ba2984dc2534c9c19bc33b48f17cab 08-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I2169fb30a5bfe48501745b2141e82ad9e25971aa
64947314b74cc280928628614a4434c0b5c5dfb6 08-Jun-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Build BUILD_MULTI_PREBUILT for the prebuilt target"
4873d8f5ca9fecc9c826ad383befbefb3407296b 04-Jun-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Id3161ac44e0eaba0184b3d2d4af43e4e40d26e90
8d09b69e2d438bb0c374b4347728e890b0142845 27-May-2010 Jeff Hamilton <jham@android.com> Build host tools as 32bit on all Darwin machines.

Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
ombo/darwin-x86.mk
7c8b1dd3c3ab925cfa14ef58458b55f3bb9e21ab 03-Jun-2010 Jeff Hamilton <jham@android.com> am 858e4d5b: am ebc2869b: Build host tools as 32bit on all Darwin machines.
ebc2869b8d324caf93ca68be08aa2be9a09c4cce 27-May-2010 Jeff Hamilton <jham@android.com> Build host tools as 32bit on all Darwin machines.

Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
ombo/HOST_darwin-x86.mk
12a77ba4c6b377f8db0b39ba1916f20000624218 03-Jun-2010 Ying Wang <wangying@google.com> am 2e684553: am eee01787: am e8ffa149: am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.
eee0178732d11f1bdac3c451f97a810c226388b8 02-Jun-2010 Ying Wang <wangying@google.com> am e8ffa149: am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.

Merge commit 'e8ffa1490023eff03335b550c582eaadd3a4561b' into kraken

* commit 'e8ffa1490023eff03335b550c582eaadd3a4561b':
Override LOCAL_CERTIFICATE in inherit-package.
e8ffa1490023eff03335b550c582eaadd3a4561b 02-Jun-2010 Ying Wang <wangying@google.com> am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.

Merge commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab' into froyo-plus-aosp

* commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab':
Override LOCAL_CERTIFICATE in inherit-package.
ba16a89dbd61003a3b907d0f5e8fc48fba2afcab 02-Jun-2010 Ying Wang <wangying@google.com> Override LOCAL_CERTIFICATE in inherit-package.

it's to fix typo.

Change-Id: I9a791faa4b7b5967b5d23bfcb4caeebaef94e723
efinitions.mk
f33c3ef9332c2d3e4a04b14819aa3dbb9f0d4d21 02-Jun-2010 Ying Wang <wangying@google.com> am b93e03cb: am 52911309: Cherry-pick unbundled build changes from master

Merge commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5' into kraken

* commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5':
Cherry-pick unbundled build changes from master
b93e03cbc9d47a9d9a385c780ed64639e2a23ae5 02-Jun-2010 Ying Wang <wangying@google.com> am 52911309: Cherry-pick unbundled build changes from master

Merge commit '529113098350c026ec521258d4c6fba51f285a48' into froyo-plus-aosp

* commit '529113098350c026ec521258d4c6fba51f285a48':
Cherry-pick unbundled build changes from master
368c640b141a2b14fb477370723334b8d0f1b418 02-Jun-2010 Joe Onorato <joeo@android.com> am 09082d12: am 8a06bac1: Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the build.
d05d74b2d6f717ee25ca14c913ea7610c030ecd1 29-May-2010 Brian Carlstrom <bdc@google.com> Fix "make cts" for refactored libcore

Change-Id: I718ee82681a4989205118d3e828567971e5f1849
asks/cts.mk
b6a08f0cd36b12054ac73992a2737ea294387116 29-May-2010 Brian Carlstrom <bdc@google.com> Deleting test builds obsoleted by libcore reorg

Change-Id: Ia8f5984e5ba03d1429c31c48d098cb044305cab1
asks/cts.mk
e4b24ebab8757ce52a1bd3b3b9986e4d253f0166 27-May-2010 Ying Wang <wangying@google.com> Fix "argument list too long"

Bug http://b/issue?id=2718472

Change-Id: I07eaf0d9dff2fa7c86f59bc50fb3b28516642301
efinitions.mk
8a06bac1db18ff7702dbd2a4ffbdde97330cd665 21-May-2010 Joe Onorato <joeo@android.com> Make make ECLIPSE-lunch build a .classpath for all the java stuff that will be included in the
build.

Change-Id: I5a6066fa2afc9cb7bea794770bbb589615a1f9eb
ase_rules.mk
asks/ide.mk
529113098350c026ec521258d4c6fba51f285a48 26-May-2010 Ying Wang <wangying@google.com> Cherry-pick unbundled build changes from master

Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
ase_rules.mk
ain.mk
ackage.mk
roduct.mk
roduct_config.mk
73d51db60e1695773fd3e313fe487d0f20ec80fe 25-May-2010 Ying Wang <wangying@google.com> Merge "Include all resources for unbundled app builds."
7b993eb8796ad11489783d3279bee258d4edfbb1 25-May-2010 Eric Laurent <elaurent@google.com> am 045fcc72: am ba12575b: Merge "Fix issue 2667796 [Audio Effect Framework] Effect factory and libraries." into kraken
62e145d20d78851a8fdf24c312f38b9bc850e559 24-May-2010 Ying Wang <wangying@google.com> Include all resources for unbundled app builds.

Change-Id: I78c67e8f9ea42aaeb06b3f8986110f8367bede3a
http://b/issue?id=2698843
ackage.mk
c5307b85c55412c7ab2c79f00579bee5e73121dd 21-May-2010 Eric Laurent <elaurent@google.com> Fix issue 2667796 [Audio Effect Framework] Effect factory and libraries.

Added prelink map entry for libeffects.so. This library contains the
effect factory needed to load plugin effect libraries.

Also remove obsolete entry for libaudiopolicygeneric.so library.

Change-Id: I65db56eec2c1ff1b50c6da0572492138d3e00607
relink-linux-arm.map
00f3a02b0fb9796dc56940d48f6776289fbdf3a1 20-May-2010 Ying Wang <wangying@google.com> Improve on unbundled app build

1. build only apps specified in APP-xxx.
2. support building multiple apps in a single make: make APP-Gmail-GmailTests-xxx

Change-Id: I863d3b503a240ae43652e9b18043b60416bcc25a
ain.mk
roduct_config.mk
ebd5a9e11f34d7980d0cb3ef07f32aa4ae8e834f 11-May-2010 Ying Wang <wangying@google.com> Dist unbundled app.

Change-Id: Ib4c01b2623ec1059b66c541cc35eae4d2d811ef3
http://b/issue?id=2667113
ain.mk
1a031e411ef5eca621c1958103407a6dc40a5114 11-May-2010 Ying Wang <wangying@google.com> Support for unbundled app build

With this CL, run "make APP-{appname}" to build unbundled app in
the unbundled app src tree.
See http://b/issue?id=2667113

Change-Id: I1d753db795142508bc841ae66b4408220ab687c5
ain.mk
roduct.mk
roduct_config.mk
18b75566429107b147368f8e392f6b25f975f5ee 14-May-2010 Guang Zhu <guangzhu@google.com> Squashed commit of the following (DO NOT MERGE):

commit 7401608f3b9b52b3348e32ec9fefe7583d6c2fa4
Author: Guang Zhu <guangzhu@google.com>
Date: Fri Apr 23 11:54:37 2010 -0700

collect emm meta files for emma instrumented build

when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files
generated for each module will be collected into one emma_meta.zip file

Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af

commit 8376d70938f6507d54b66fe5832a637aa883974e
Author: Guang Zhu <guangzhu@google.com>
Date: Wed Mar 10 15:48:03 2010 -0800

enhancement for building app with emma code coverage

* global filter to avoid applying instrumentation on emma classes
* remove local variable information at dex step instead of compile time

Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f

Change-Id: I971bd0f291bede2568b21347247d37a7d035c661
akefile
lear_vars.mk
efinitions.mk
ava.mk
ain.mk
df63579f4c10e7aa5fcf481b99f609a8a10d1108 18-May-2010 Ying Wang <wangying@google.com> am 4873a26f: am 01c35179: Fix typo.
01c351793a21ba136d520a4863387270e89ea46e 18-May-2010 Ying Wang <wangying@google.com> Fix typo.

Change-Id: I6eb60e7b89bd331deaa46e2c3f746aa2b042e1b4
ase_rules.mk
e66a8dd59aa0edee812c7347b0f933515bfdc51c 18-May-2010 Joe Onorato <joeo@android.com> am ecfca8a5: am 4f9c2052: fix typo
4f9c20529e6c38aa29ed5c1f3f39e9de5980d6e6 18-May-2010 Joe Onorato <joeo@android.com> fix typo

Change-Id: Ic00f82ea7bbe570ef30f52b353ba147664d755d7
lear_vars.mk
a64dbd75becf1cbbaa96403b39c99d58ba0b75cf 18-May-2010 Joe Onorato <joeo@android.com> am 36ce8736: am 77dc0a58: Add a rule that builds an eclipse project file for an app.
77dc0a58e27fe7c3fcdb67bbee71010c59dd4344 18-May-2010 Joe Onorato <joeo@android.com> Add a rule that builds an eclipse project file for an app.

Type make ECLIPSE-<app1>-<app2>... with the apps as listed in LOCAL_PACKAGE_NAME.

Change-Id: Ieb96dfc9dfc13bdf1b3be53572092fc7bc695869
ase_rules.mk
lear_vars.mk
ava.mk
ain.mk
asks/ide.mk
7c61e97c858eb861e46cb5fb68f10a811690a3bf 18-May-2010 Nick Kralevich <nnk@google.com> am 06dae704: am d868cad8: Add -Werror=format-security
d15b6972bfc4709b26969198b9d351e21b6ec157 15-May-2010 Ying Wang <wangying@google.com> Allow java source in LOCAL_GENERATED_SOURCE

Change-Id: I82f426f1523f56a87ad396f2d7928b839f7c3ec9
ase_rules.mk
d868cad8284730bd902a354a984dc57c870802fc 14-May-2010 Nick Kralevich <nnk@google.com> Add -Werror=format-security

Security hardening: don't allow code to compile which
uses format strings in an inappropriate way. Make format
string compiler warnings into errors.

Change-Id: I1461dad589a2416420fd84ccf765983e859eea8a
ombo/TARGET_linux-arm.mk
07c5e16d883ad43314ff6da9b31eac05087973c0 14-May-2010 The Android Open Source Project <initial-contribution@android.com> am da9a8535: am 216d8448: am 95f862bc: merge from open-source master
216d8448a04f3c7794d1e4ec1178a2bf6da2ba95 14-May-2010 The Android Open Source Project <initial-contribution@android.com> am 95f862bc: merge from open-source master

Merge commit '95f862bcb0418fd931c574157a5c90312ea2fb77' into kraken

* commit '95f862bcb0418fd931c574157a5c90312ea2fb77':
Fix "make modules" script bug under Mac OS X.
95f862bcb0418fd931c574157a5c90312ea2fb77 14-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I4ea9aa2765cb634382da92ff17f5af9e2f6b4078
f91e9e2729b7ac5224c82b347c3bc6a22ea020d8 14-May-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Fix "make modules" script bug under Mac OS X."
7ec45cb4635c72d33c5b38fdc283c40adbd3db17 14-May-2010 Nick Kralevich <nnk@google.com> am 876ae91c: am 06df2923: libdrm2 is never used. Remove the reference to it.
06df292347f6e23fd718748dbbc80d0318c3f80c 13-May-2010 Nick Kralevich <nnk@google.com> libdrm2 is never used. Remove the reference to it.

Change-Id: Iee14e336377cedb56adb71bc4f40ded137906f1f
athmap.mk
586dc045dcb134b3066a91c77e06c75056849aad 13-May-2010 Jesse Wilson <jessewilson@google.com> Merge "Moving junit out of core.jar and into core-junit.jar"
f2f3e4b234271a20ff3663256081c8aed26f7807 05-May-2010 Jesse Wilson <jessewilson@google.com> Moving junit out of core.jar and into core-junit.jar

This commit was submitted too early:
https://android-git.corp.google.com/g/50610
...and then rolled back:
https://android-git.corp.google.com/g/50622

Change-Id: I5f4e53bd0c892ab64711b99b2e95d2f101626dbc
ava.mk
9c01eb9f23e58903e2f9034080475b570867d222 06-May-2010 Kristian Monsen <kristianm@google.com> Added libchromium.so to the prelink map in the temp section.

Change-Id: I9f5c42ba24c5ca17a7d274029f5b845e2ca1950a
relink-linux-arm.map
9bfd697cffae4b4f2bdbf122c3bbe7920525e718 14-Feb-2010 Ravi K Yenduri <yenduri@pv.com> Build BUILD_MULTI_PREBUILT for the prebuilt target

Add files included as prebuilts with "BUILD_MULTI_PREBUILT"
to be installed as part of the 'prebuilt' target.

Change-Id: I2fa2dfff2637701281ab78a523c58fc46577ab75
ulti_prebuilt.mk
144b028eac600bdf4817648dd23c577abba01134 10-May-2010 Colin Cross <ccross@android.com> Fix dependencies on ext2 user images

Change-Id: I0efca76ef0c38db40c41be573457b788b7b8d451
akefile
2373361ecb6dbd31d8a558f7e3c4cfa3e75206c3 10-May-2010 The Android Open Source Project <initial-contribution@android.com> am 63cac277: am f48c3ac3: am f7c63421: merge from open-source master
f48c3ac39d0f63b8cf16b92d3543b888715b13de 10-May-2010 The Android Open Source Project <initial-contribution@android.com> am f7c63421: merge from open-source master

Merge commit 'f7c634216e673407f5a7a879bcf2ddb2454e4670' into kraken

* commit 'f7c634216e673407f5a7a879bcf2ddb2454e4670':
Replace arm with proper variable for CPU/ABI
f7c634216e673407f5a7a879bcf2ddb2454e4670 10-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Id99b6cbc613c6c7b9d1ef79274b1c28b808a32d4
8c1cbacfdff0763aea5a60e756d072dc6075add5 08-May-2010 Ying Wang <wangying@google.com> Make LOCAL_SDK_VERSION current use correct framework.aidl

Change-Id: Ic9327378e22412f74f1a3311dfb5c7936670d6f8
http://b/issue?id=2666578
ase_rules.mk
0a7b2c5c13dfd3d3c38bceb79fa2bd4a360addf8 07-May-2010 Colin Cross <ccross@android.com> build: Add support for ext3 and ext4 images

Change-Id: I63b36bfa0036419df92a60a1f8f7b0a7e6b1b62e
akefile
onfig.mk
ef5c640fd45937f7d1ce735d8888f06fd8098e11 04-May-2010 Steve Howard <showard@google.com> Fix and enable JarJar in Java builds.

java.mk contained a target to enable JarJar in Java builds, but it was
being bypassed. This change enabled JarJar as part of the build
process, and fixes a slight bug with the way it was set up.

Change-Id: If24113f399a168939a1a1d0738c5df57caf8d05f
onfig.mk
ava.mk
0e27dff167faede2d13dae5d488866bce85c28bc 07-May-2010 Patrick Scott <phanna@android.com> Quiet the build a little more.

Change-Id: Id15808249800f32671bb902872b50051dfcb9909
efinitions.mk
7cb5e10f636d3774adfb82e7520b3049ab19fe0a 07-May-2010 Dan Bornstein <danfuzz@android.com> resolved conflicts for merge of 541c3f81 to master

Change-Id: I1a58398c79e538db8bac65b9f4d92028f1eca69e
8a5d30e73a151aacec62a7d236f98cbb23664d2c 07-May-2010 Dan Bornstein <danfuzz@android.com> am 6e079d7e: am 03fb96f0: Allow for a slightly larger libwebcore, add another library to the list, correct/update a couple entries, and add a couple more comments.

Merge commit '6e079d7e3d30cd8985fc5d1e34c871cdf2ec5068' into kraken

* commit '6e079d7e3d30cd8985fc5d1e34c871cdf2ec5068':
Allow for a slightly larger libwebcore, add another library to the list,
6e079d7e3d30cd8985fc5d1e34c871cdf2ec5068 07-May-2010 Dan Bornstein <danfuzz@android.com> am 03fb96f0: Allow for a slightly larger libwebcore, add another library to the list, correct/update a couple entries, and add a couple more comments.

Merge commit '03fb96f01eeed12ce5dc6dd8fa2e839ed497758e' into froyo-plus-aosp

* commit '03fb96f01eeed12ce5dc6dd8fa2e839ed497758e':
Allow for a slightly larger libwebcore, add another library to the list,
03fb96f01eeed12ce5dc6dd8fa2e839ed497758e 06-May-2010 Dan Bornstein <danfuzz@android.com> Allow for a slightly larger libwebcore, add another library to the list,
correct/update a couple entries, and add a couple more comments.

Bug: 2651381
Change-Id: I9aaf48c3c2115b111794710bb4e959613bf22add
relink-linux-arm.map
938179808dda5b8e2e6cdf1b90423b9eed99642c 06-May-2010 Dan Bornstein <danfuzz@android.com> resolved conflicts for merge of 54c29015 to master

Change-Id: I0b45ef84343289e84c6bcdf64b6ca4c0aff414c5
ea4b1a8600e65d487af7528baa31deabb4db020a 05-May-2010 Dan Bornstein <danfuzz@android.com> am aed937ba: am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo

Merge commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b' into kraken

* commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b':
Fixed a bunch of stuff in the prelink mappings file:
aed937ba46e4137ad5a5d047a438f48c4c81e46b 05-May-2010 Dan Bornstein <danfuzz@android.com> am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo

Merge commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a' into froyo-plus-aosp

* commit '3ca0e96a3a66a6c53536bf7346f616e672e2c57a':
Fixed a bunch of stuff in the prelink mappings file:
e6f47ace30855ea7dca94256fad9983d1e916732 05-May-2010 Nick Kralevich <nnk@google.com> am 8084f8c1: am 2915cc3e: Enable NX protections
5b9f19e58f55c67a5ebcbd4988a37142cc7ac770 05-May-2010 Bruce Beare <brucex.j.beare@intel.com> Replace arm with proper variable for CPU/ABI

Change-Id: If8594d9a2abf4d8c08b5ccea612bb700afa9e9b7
efinitions.mk
2915cc3e323a9bf86e1a20b201ceb4e9529bc5a2 05-May-2010 Nick Kralevich <nnk@google.com> Enable NX protections

Add -Wa,--noexecstack and -Wl,-z,noexecstack as default
flags when compiling applications. This enables NX
protections, which prevent code from executing on the
stack or heap. NX protections can block a large number
of buffer overflow attacks, and is an important security
feature.

Change-Id: Iad4bab9f8664584ba6ce832a5318d07680d7a908
ombo/TARGET_linux-arm.mk
6c6ab0a75365d98547e557a16239f86af34c0e54 05-May-2010 Colin Cross <ccross@android.com> am 80d38729: am 9ca21644: build: Fix including WHOLE_STATIC_LIBRARIES in static libraries
7eab0d8b57b1401dedd095bc7d0bd827a6e46ec6 05-May-2010 Dianne Hackborn <hackbod@google.com> am 7fa3aa53: am 93b01600: Add native include path.
7dfcfbc0d4f5d761cef026196035ae2f3019cbae 04-May-2010 Dan Bornstein <danfuzz@android.com> Fixed a bunch of stuff in the prelink mappings file:

* Added mappings for most of the libraries that didn't already
have them (as observed from my build).

* Re-canonicalized all the offsets in the mappings file,
per the official policy of keeping things megabyte-aligned.

* Added comments on each line indicating what size the library
actually appeared to be in my build (to help with future rejiggerings).

* Added a bit of documentation about the whole deal.

Even with this change, I know there are other libraries that will
still need to be included, but I think what I have here is a good
step. Also, this change only reserves room for the new libraries, but
subsequent changes (in other subprojects) are required to actually
start prelinking the new libraries. Those changes will be forthcoming
as well.

Bug: 2651381
Change-Id: I7a06382fc2b8a14bbd3261de58df3f8a31e4108e
relink-linux-arm.map
9ca2164414713424d55383292511d8841facf4fc 05-May-2010 Colin Cross <ccross@android.com> build: Fix including WHOLE_STATIC_LIBRARIES in static libraries

Static libraries that include other static libraries were being incorrectly
built with .a files inside the top level .a file, as well as the .o files
that were extracted from the component .a files. This patch fixes the
final ar call to only add .o files to the archive.

Change-Id: Ic1ff025129e3c379fa56b4da2f09e9f16ea3c4fb
efinitions.mk
93b016008f1614a2475b230bae2c9283bfba3c5a 04-May-2010 Dianne Hackborn <hackbod@google.com> Add native include path.

Change-Id: Ic5d0b807467e8e673399a8a5f9b6702bc72960ab
onfig.mk
3600a1604a07db7edd1b753638827d68a640a185 05-May-2010 Jesse Wilson <jessewilson@google.com> Undo commit: Moving junit out of core.jar and into core-junit.jar

Change-Id: I09875ef5f45b1d643ae389a6871cad374d80746b
ava.mk
72c941a14757255a73f0bf31d689cc2b99fff6cf 05-May-2010 Jesse Wilson <jessewilson@google.com> Moving junit out of core.jar and into core-junit.jar.

Also extending the arbitrary limit on build argument sizes,
which I ran up against in building after this change.

Change-Id: Iba79a37b27e7d5efa2b02a99aa253a2eec7ede75
efinitions.mk
ava.mk
eaf130ec2c4fc643f63614bae8a94bc1fed12068 04-May-2010 The Android Open Source Project <initial-contribution@android.com> am 58248935: am cf28b803: am ae4e1455: merge from open-source master
cf28b80398f36e5a3e67f803458e07442a2b9364 04-May-2010 The Android Open Source Project <initial-contribution@android.com> am ae4e1455: merge from open-source master

Merge commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6' into kraken

* commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6':
Adapt to new location of libcore
Make expr more POSIXy
generic_x86 support
Remove obsolete machine-setup.html reference.
ae4e14556bb3a789c4263ebba7ed42b3035e13f6 04-May-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
5b59f6b08c5ccdeb465d029c914d859cada4b984 24-Apr-2010 Ying Wang <wangying@google.com> Use sdk as the bootstrap classpath while compiling against sdk.

Change-Id: Iad16b8c03d88d138abee5e24433b6a654fa21410
http://b/issue?id=2623361
ase_rules.mk
045d4af72d487ed3b21dfdf951ecb41ad5609a80 30-Apr-2010 Jean-Baptiste Queru <jbq@google.com> Adapt to new location of libcore

Change-Id: Ibabfe907f00522c1966ddc333352eaea2bdcb5bd
leanspec.mk
ain.mk
60bc203660224ffd7244a17d13e7a6f90b5cd0d0 30-Apr-2010 Jean-Baptiste Queru <jbq@google.com> Adapt to new location of libcore

Change-Id: I17a2f432f69bd0cb381e83b6395fb2ae6e4faf9d
leanspec.mk
ain.mk
aa000340af86e298eddd43aa6f0020793bee6fcb 30-Apr-2010 Jean-Baptiste Queru <jbq@google.com> Adapt to new location of libcore

Change-Id: Ib32222c3541b2aa66df6d6a5519049653647aae7
leanspec.mk
ain.mk
f38069243078629d3ebe127a06b72be911f2dd74 23-Jan-2009 Evan JIANG <firstfan@gmail.com> Fix "make modules" script bug under Mac OS X.

For Mac OS uses BSD sed, it doesn't support "\n". Then, "make modules"
command cannot work correctly under Mac OS. Using tr command to replace
sed command, it has the same behavior under both Mac OS and Linux.

Change-Id: I29e044cc66bf24f6459cbb33164fd9f55f772e3c
ain.mk
df55739f49753fbfe5755469d4ebfe6448c501fc 29-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am 345cbd2d: am cd0bd801: merge from open-source master
345cbd2d25a48824681377507f815948a7f76306 29-Apr-2010 The Android Open Source Project <initial-contribution@android.com> am cd0bd801: merge from open-source master

Merge commit 'cd0bd8011bb955e8ffab9e77180ce2b23ba7e923' into kraken

* commit 'cd0bd8011bb955e8ffab9e77180ce2b23ba7e923':
Fix "make layoutlib" under Windows+Cygwin
cd0bd8011bb955e8ffab9e77180ce2b23ba7e923 29-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ie49d1b19914fcfefedfdfc070800426d4b13dd46
ee43a90f4fd0ad1646e4038733f17ca78cc0671d 29-Apr-2010 Ying Wang <wangying@google.com> Merge "Dist only if the goal is to be built"
bfa25878f976173af752fa91dcc526a6e4e75080 18-Apr-2010 Raphael Moll <ralf@android.com> Remove obsolete machine-setup.html reference.

Bug 1231

Change-Id: I629361cf5dddc9d0fbf493e016f1aaf2a50b6935
ain.mk
a37a2cb23159709260f248b46428987c9aeb2998 28-Apr-2010 Ying Wang <wangying@google.com> Dist only if the goal is to be built

Change-Id: I1b794f36a6dc39ce68cc990b967d2d55118c92ca
http://b/issue?id=2635603
akefile
ain.mk
3fcf6020d312bb986a940108778fa4937ed85b6e 28-Apr-2010 Brett Chabot <brettchabot@google.com> Merge "Add CTS tests for the accessibility APIs. (make)"
19f5d7db9658833d5a7bf81502a0e244465881d7 27-Apr-2010 Nick Kralevich <nnk@google.com> am 387e4d06: LOCAL_LDFLAGS should come after TARGET_GLOBAL_LDFLAGS
387e4d0601fad468f51cba8286522674914e01cb 26-Apr-2010 Nick Kralevich <nnk@google.com> LOCAL_LDFLAGS should come after TARGET_GLOBAL_LDFLAGS

A package can define a LOCAL_LDFLAGS. If a LOCAL_LDFLAGS
exists, it should come after the global LDFLAGS, to allow
the local flags to override the global flags.

Change-Id: I6e44c17949c1f11c808d0ed3f327d63fb51a1468
ombo/TARGET_linux-arm.mk
ee7971132250c735b5cf11ae10d1961dc81d724a 26-Apr-2010 Ying Wang <wangying@google.com> Add ramdisk to dist. [DO NOT MERGE]

cherry-pick from master.
http://b/issue?id=2590492

Change-Id: I1a8f0313a486665847b27fb58ac9a57881d5e913
ain.mk
0198d6ebb457d11797deb414c51b8897c67f7f10 23-Apr-2010 Guang Zhu <guangzhu@google.com> collect emm meta files for emma instrumented build

when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files
generated for each module will be collected into one emma_meta.zip file

Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af
akefile
ain.mk
08430d5350da15f9c3ff332f731a69a5b23fece6 23-Apr-2010 Svetoslav Ganov <svetoslavganov@google.com> Add CTS tests for the accessibility APIs. (make)

Change-Id: I4cdf7639412e1fcea0f4ee29f79e2868408cf9a1
asks/cts.mk
649c4731b100abb3c875184451c49617f5af657c 24-Apr-2010 Raphael <raphael@google.com> am 381ee392: am 9ca1628e: Support building Windows SDK under Linux.

Merge commit '381ee392e8ebba35cb65321415f4cdb537b446ed' into kraken

* commit '381ee392e8ebba35cb65321415f4cdb537b446ed':
Support building Windows SDK under Linux.
8b9b39e995407a025ed9bc87b5062194f1b5f51f 26-Feb-2010 Ying Wang <wangying@google.com> Add phony target to build and dist sample code.

See http://b/issue?id=2468418
After this CL, add "samplecode" to your make goals, you will get the sample apks
built and installed at out/target/common/samples/.

Change-Id: Iff83f2ba6b6c2fe6ac1c78ca4a9d4bc6953dac8a
ain.mk
929cdf3313e50df136f483f92205ab74ae77e8b5 20-Apr-2010 Ying Wang <wangying@google.com> Add ramdisk.img to the dist dir.

Change-Id: Ia74c501298010734dd1b8db8df86720d3e8bb7cd
http://b/issue?id=2590492
ain.mk
9ca1628e3f565607e1fdef71b570d3ddb5ec09df 17-Apr-2010 Raphael <raphael@google.com> Support building Windows SDK under Linux.

- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

(Merge master Change I9d08d0df)
akefile
onfig.mk
nvsetup.mk
ain.mk
3d224a0fc9ed34ac4c3c79c479d5c6dc5c31b87c 17-Apr-2010 Raphael <raphael@google.com> Support building Windows SDK under Linux.

- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

Change-Id: I9d08d0df598b8a7292532d23c55f48101a95a240
akefile
onfig.mk
nvsetup.mk
ain.mk
b1ae8ab97df04a56f28e27888d37146ff17b0201 23-Apr-2010 Dianne Hackborn <hackbod@google.com> Merge "Mmmmmm... Gingerbread!"
6717059ccc85272163b7e4ea4954cb8f3b59530a 21-Apr-2010 Doug Zongker <dougz@android.com> don't use the -m option when building OTA packages any more

The -m option no longer exists; we only support one OTA package script
language in gingerbread.

Change-Id: I9b532a30f8c3b297b8ffdb2a570a24db37f056d1
akefile
3533eca851fe846df21f0f4c60c545e7a6e64a78 05-Apr-2010 Ying Wang <wangying@google.com> Add build number to apks by appending it to versionName.

Change-Id: I476ff3514068814211d67e8ed956f1923be33bcd
http://b/issue?id=2557312
efinitions.mk
155afe393faa0aae47d517fa687a7e4ab3cae91b 11-Mar-2010 Guang Zhu <guangzhu@google.com> enhancement for building app with emma code coverage

* global filter to avoid applying instrumentation on emma classes
* remove local variable information at dex step instead of compile time

Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f
lear_vars.mk
efinitions.mk
ava.mk
a51b76e15b4d2b7fede5ec7359fbc9fd75145003 20-Apr-2010 Kenny Root <kroot@google.com> Merge "Add subdir under frameworks/base for code ported from icu4j."
d6f9929f4a51e3da687c0b03553661c09f0eb224 16-Apr-2010 Dianne Hackborn <hackbod@google.com> Mmmmmm... Gingerbread!

Change-Id: I1ad5293d5b35eaa34107d9112266ac28d1269925
leanspec.mk
ersion_defaults.mk
c01c284dda6de21e23e0919b73a2da5793e3157a 19-Apr-2010 Brad Fitzpatrick <bradfitz@android.com> am 492adf41: am dc5f3888: am 135677a7: For userdebug builds, enable Dalvik lock contention sampling.
492adf41690fe306ed6cfecd6821fd0d24586c8c 19-Apr-2010 Brad Fitzpatrick <bradfitz@android.com> am dc5f3888: am 135677a7: For userdebug builds, enable Dalvik lock contention sampling.

Merge commit 'dc5f3888d092310f1bb7f0d26be05d4b4cef6b91' into kraken

* commit 'dc5f3888d092310f1bb7f0d26be05d4b4cef6b91':
For userdebug builds, enable Dalvik lock contention sampling.
135677a71800c27d7747b5c86712d05a74392f62 17-Apr-2010 Brad Fitzpatrick <bradfitz@android.com> For userdebug builds, enable Dalvik lock contention sampling.

Change-Id: I75cca6fc0ac0d0adfc059a8f82b2f6ae584361f3
ain.mk
472e07c8f4ba7bf5a708357b4a4aaa8a1e84eedb 16-Apr-2010 Dianne Hackborn <hackbod@google.com> am cc45ee9c: On to Kraken...
cc45ee9c3c68f72391f5e7ba300312047d976bfa 15-Apr-2010 Dianne Hackborn <hackbod@google.com> On to Kraken...

Change-Id: Ib5f57d8095a0e88fdbbc933ccb2ea0c6d83010ae
leanspec.mk
ersion_defaults.mk
7058f499e9a74151f6ea137697cd5b2101182782 13-Apr-2010 Raphael Moll <ralf@android.com> Fix "make layoutlib" under Windows+Cygwin

Change-Id: I5277afe77f1e3367ecfd0933a9ab14a5a42c2be2
ain.mk
7d25429b6768590c7410475d7207762e044e6832 07-Apr-2010 Dianne Hackborn <hackbod@google.com> am f2a1c24d: am 966c7355: am 303b3412: Add clean step for SDK version change.
f2a1c24dd1430bc5cbca07d46456b05728fbdaf3 07-Apr-2010 Dianne Hackborn <hackbod@google.com> am 966c7355: am 303b3412: Add clean step for SDK version change.

Merge commit '966c7355c3705095532bcc71ae6d893bdbe3531d' into kraken

* commit '966c7355c3705095532bcc71ae6d893bdbe3531d':
Add clean step for SDK version change.
303b34121e0d331570bcb156b03251cca93a5631 07-Apr-2010 Dianne Hackborn <hackbod@google.com> Add clean step for SDK version change.

Change-Id: I2ea85496af49572115dbbd9a98787b1fd54adc50
leanspec.mk
570212043859ad7f49d061bb7bff7e89d102e50e 07-Apr-2010 Shih-wei Liao <sliao@google.com> Merge "Add libbcc.so"
e0a18a75a930fd83ceee55a8ac0270625476d8c1 07-Apr-2010 Joe Onorato <joeo@android.com> Finish moving the policies out of frameworks/policies/base and into frameworks/base.

Change-Id: I6b3991de3276258318cab2aff9651f18b3d07f85
roduct.mk
roduct_config.mk
05d275837c5f16784a23c9ccc9095f14b9ad02fd 05-Apr-2010 Doug Felt <dougfelt@google.com> Add subdir under frameworks/base for code ported from icu4j.

Change-Id: I6c9fa6dac1f80bbaf8c80b9e0900f4e628ff596f
athmap.mk
efba0b9829ae375a7d7e2093dee707b79f1b8951 05-Apr-2010 Dianne Hackborn <hackbod@google.com> It's beginning to look a lot like release time!

Everywhere we build...

Froyo is now Android 2.2, API 8.

This breaks the YouTube prebuilt (yay prebuilts!) but little else.
Does this mean we are becoming mature?

Change-Id: I15d228d57853a0dfabc47dda253d55339a5b3d17
ersion_defaults.mk
139e33243bbe92858f39919c220a4d65fe8790bd 01-Apr-2010 Ying Wang <wangying@google.com> Add symbols.zip and build.prop to sdk dist.

Change-Id: I667f5ef847a6e8e78c6b3df5c2b092bb5d863955
http://b/issue?id=2394164
akefile
ain.mk
6714dbc236bf5dccba6778aa83223ee8555a6157 31-Mar-2010 Ying Wang <wangying@google.com> Add comments for ANDROID_BUILD_SHELL

Change-Id: I71f0a1a08b097cd179bbcb684a9114267f9bf0db
onfig.mk
ain.mk
2ce495a0a7986fcd458954f1cae8cd1b030091d0 30-Mar-2010 Ying Wang <wangying@google.com> Allow use of alternative to bash as the build shell.

Change-Id: Ib92217f90c98e04a1d16efd4904d9d7ba9dda3cf
http://b/issue?id=2557214
onfig.mk
ain.mk
5db9b5af0d7c1ed94c7a16092c155ee7f0d58ea9 27-Mar-2010 Shih-wei Liao <sliao@google.com> Add libbcc.so

Change-Id: I8ef01a8ed647e5012d27e3c048fc1f4ee5a5e03a
relink-linux-arm.map
910dcbebc07a63debb0848e7cc157664508016ff 25-Mar-2010 Ying Wang <wangying@google.com> Cherry-pick 6f1c75849c4b101b55ae624755e43293724ce76e from eclair

Change-Id: I21a69669935d838595b2fa01c5be10e6c1975da9
akefile
9a6a1e33b3010e8ba1a47c95b691dfa09e73ffa3 18-Mar-2010 Ying Wang <wangying@google.com> Add android-info.txt to the dist dir.

Change-Id: I735655205085b0baf490b0dd011eb59cb6d4c45b
http://b/issue?id=2524072
ain.mk
8c254825a062fd240566404d9d6ecc7cc56b30ba 17-Mar-2010 Ying Wang <wangying@google.com> Support to override instr target package in inherit-package

http://b/issue?id=2451361
With this CL, you can inherit a testing package to test a inheriting package.
Note: we change the meaning of $(5), so we need to change any existing calls
to inherit-package in other projects.

Change-Id: I673155d1b8b6006953d14e1ab87066536ebd1e54
ase_rules.mk
efinitions.mk
283e2a1e1bae4e21824969a15da6420204633ddd 16-Mar-2010 Doug Zongker <dougz@android.com> store filesystem config info in target files at build time

Store a dump of the desired uid/gid/mode for every system file in the
target_files zip. Modify ota_from_target_files to use this stored
information when it is available, instead of running fs_config from
the current client (which might be out of sync from the one where the
target_files zip was built).

b/2516887 - New android_filesystem_config.h needed

Change-Id: I8409a0265d1d50daad9c2bc033c99b74b8931b20
akefile
6e6824c4ce0ae398832c22234c322004cb50bd81 11-Mar-2010 Colin Cross <ccross@android.com> Merge changes Ib3b44e83,I70d50928

* changes:
Add a new build target armv7-a-neon
Modify the armv7-a target arch to not use NEON
1873e44d58b0761e93021a9ba45f83d84650ceb6 11-Mar-2010 Ying Wang <wangying@google.com> Merge "Don't force localization for package tagged as tests."
f807c55f39cca4b40a3c7346cd11ee836e24fc3c 09-Mar-2010 Colin Cross <ccross@android.com> Add a new build target armv7-a-neon

Change-Id: Ib3b44e839b093974aff0d595950e6b691beee7a5
ombo/arch/arm/armv7-a-neon.mk
5720bb91a4e93071539a2ddf2d377284e3afba0a 09-Mar-2010 Colin Cross <ccross@android.com> Modify the armv7-a target arch to not use NEON

To build for a target with NEON, use armv7-a-neon

Change-Id: I70d509287b04c0faebe44faf6c8ebb28a7360ff9
ombo/arch/arm/armv7-a.mk
c61d5932d3b1014352dd5cbcb2684a95b3e172a3 11-Mar-2010 Ying Wang <wangying@google.com> Don't force localization for package tagged as tests.

Change-Id: I612598443371fc388cf08ddde7ebdd1d3dec9c7e
efinitions.mk
ackage.mk
08e3883350e1134200448ebbd4c7df86ef11a5af 10-Mar-2010 Ying Wang <wangying@google.com> Merge "Let Proguard load emma jar if it's enabled."
389b7e11e48c3579ad143f8583d08c23c1c40eb2 10-Mar-2010 Ying Wang <wangying@google.com> Let Proguard load emma jar if it's enabled.

Change-Id: I57a0bcfb486339f48dc25f5fc5d44a1178dee678
See: http://b/issue?id=2502181
ava.mk
4f85d00113ee29c71b8205332ba0b26a85dee1c7 09-Mar-2010 Bjorn Bringert <bringert@android.com> Make ProGuard keep @VisibleForTesting classes and methods

Change-Id: I7f5d14fd4188859c52ab85c33af1ac275888611c
roguard.flags
d2e571cb5565356223718b82e835f56aff0c78c8 09-Mar-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I9fedeb014c946b53bfdd424b00c0cb5fc08f8333
99e087bc82c11d5909785acc7333176952a14032 08-Mar-2010 Andy McFadden <fadden@android.com> Added -lpthread to target LDFLAGS for sim-eng.

This adds "-lpthread" to TARGET_GLOBAL_LDFLAGS when TARGET_SIMULATOR
is true. This is much easier than inserting it into individual
makefiles as needed. Has no effect on other builds.

Should fix the sim-eng build breakage in libcameraservice.

Change-Id: I4dcd7d54b93d1be1622b8ce78a1662d28ca9f9f2
ombo/TARGET_linux-x86.mk
ab2b1db4f8448f4ac2bcc775a96df4b7c786a59e 06-Mar-2010 Dan Egnor <egnor@google.com> Cleanspec rules to take care of old (pre-static) libraries.

(The build system doesn't react gracefully when something is switched
from a shared library to a static library.)
leanspec.mk
221cdbb17dba524c95b4c0a48c663843f5f739a2 05-Mar-2010 Andrew Stadler <stadler@android.com> Fix builds due to Music2 moving around.
leanspec.mk
048683ea7e2d21dc681917d1b0eab7a24df79eaf 05-Mar-2010 Jean-Baptiste Queru <jbq@google.com> Merge from eclair

Change-Id: I4496dadd8a738a05c647589ca78732e9b608ca29
4eb079f67f7ec1dea9c430edfe6a2a589b3100d9 22-Jan-2010 Jean-Baptiste Queru <jbq@google.com> Look for product configs in device/ in addition to vendor/

This will allow to create open-sourceable product configurations.

Change-Id: I4e73347c2095935340bfc8c3737c2adf1ef22a9c
onfig.mk
roduct.mk
09433bc2a5167faf68ab82c97b42f581c74ff31f 04-Mar-2010 Romain Guy <romainguy@android.com> Add clean step for Launcher & Launcher2
leanspec.mk
bba8decfa637e49f3581901bbe721f85b4dd2314 04-Mar-2010 Dan Egnor <egnor@google.com> Remove a bunch of obsolete/(potentially) renamed .apk's.

I found these kicking around my system/app with old timestamps, and old
packages just cause trouble. Depending on the build flavor they may or
may not still be there, but it's harmless to clean them.
leanspec.mk
a17463fcac945a055ad0f33eabf0b0fa7824a015 03-Mar-2010 Ying Wang <wangying@google.com> Fix proguard_option_file.
ackage.mk
fa9ae7bbbe4412893d585a92b12f17b806a58d62 03-Mar-2010 Ying Wang <wangying@google.com> Decentralizes cleanspecs.

After this change, you should add-clean-step at the end of CleanSpec.mk
in your project, instead of the centralized cleanspecs.mk in build/core.
leanbuild.mk
leanspec.mk
f47dc0638a58cf1976d0a3b42ed6da1d6b8fd161 02-Mar-2010 Ying Wang <wangying@google.com> Merge "Turn on Proguard by default for user/userdebug builds."
518ce5753a95355eccf396f8ed9c36960c83274b 02-Mar-2010 Jean-Baptiste Queru <jbq@google.com> De-dupe PRODUCT_COPY_FILES

This allows to explicitly deal with situations where we
want to use PRODUCT_COPY_FILES to manage overrides.

Change-Id: I2f87862e19b973f090099f335e9bdeb0c9f3bfe9
akefile
a7c0784287367043be0eee00715846080aa438b6 01-Mar-2010 Xavier Ducrohet <xav@android.com> Merge "The builders project is gone. Remove it from main.mk"
a5b1e4e1bb63caea8eedad072a78b11c6dc8c0cd 26-Feb-2010 Andy McFadden <fadden@android.com> Merge "Tweak default x86 target arch variant."
ef26218762945f6043d5c515ab601189ca7cc865 26-Feb-2010 Andy McFadden <fadden@android.com> Tweak default x86 target arch variant.

Simply set the arch variant for sim-eng to be "x86".
ombo/TARGET_linux-x86.mk
d0c997e0b6547704ad1d7ce7aa1c6cda6801e471 25-Feb-2010 Dianne Hackborn <hackbod@google.com> Framework no longer links with android-common.
athmap.mk
75e326486763e9b0a764a837cae38719b79cb329 25-Feb-2010 Jean-Baptiste Queru <jbq@google.com> Don't build OTA package for aosp_emulator_us

This allows "make dist" to work on that configuration.

A better fix would be to allow each product to specify
whether it's an emulator target or a device target, and
to adapt to that, but that'd be a lot more intrusive.

Change-Id: I47708025204a4991466abceb1708a3020a543238
akefile
b464b5e82ee76427634492614dcb64a6917eb33d 24-Feb-2010 Xavier Ducrohet <xav@android.com> The builders project is gone. Remove it from main.mk

Change-Id: Ibec7be55667e83d635e1de990772e2730d0e75ff
ain.mk
16e95bb99df4515ad37d73562bffb1a9fd21c162 24-Feb-2010 Andy McFadden <fadden@android.com> Build the target side of the simulator as 32-bit.

This detail got lost in my previous cleanup change 9b4a812.

Also add a comment explaining why the host side of the
simulator needs to be built in 64-bit (wxWidgets).

Change-Id: I2a867f7f80b43d53e73348b19f6ae834600295f9
ombo/HOST_linux-x86.mk
ombo/TARGET_linux-x86.mk
9b4a81237be29b0aae50d1e370b63a07ea2b88b9 23-Feb-2010 Jean-Baptiste Queru <jbq@google.com> Get rid of $(combo_target)

The only OS-ARCH combo that would have benefited from it
is linux-x86, but it explicitly used separate configurations
for the HOST_ and TARGET_ side of things.

This makes is clear which files are related to the HOST_
configuration and which ones are related to the TARGET_
configuration, and expands $(combo_target) to the only
possible/reasonable value that it could have had in every
file.

This also cleans up the simulator, by moving it in a single
place in TARGET_linux_x86 (since the only part that's special
is to use HOST_ settings even when building TARGET_ modules).

Change-Id: I2420eeb8cfe539f5807ec99cb3177ffb9f2476d5
ombo/HOST_darwin-x86.mk
ombo/HOST_linux-x86.mk
ombo/HOST_windows-x86.mk
ombo/TARGET_linux-arm.mk
ombo/TARGET_linux-sh.mk
ombo/TARGET_linux-x86.mk
ombo/darwin-x86.mk
ombo/linux-arm.mk
ombo/linux-sh.mk
ombo/linux-x86.mk
ombo/select.mk
ombo/target_linux-x86.mk
ombo/windows-x86.mk
e009f29590c64acd269f1e9a42368099e2554b86 23-Feb-2010 Andy McFadden <fadden@android.com> Fix build.

The "set default variant to armv5te if none defined" in the ARM config
was applying to all architectures, but as it turns out only ARM builds
actually cared. When I made a copy of the "set default" code to the x86
config, one or the other would win for builds that didn't specify a
variant. Turns out x86 won, so sim and voles worked, but opal didn't.
ombo/linux-arm.mk
ombo/linux-x86.mk
b94202f222570ad85dadbf4fb449c6820481a047 23-Feb-2010 Andy McFadden <fadden@android.com> Merge "Provide default variant for x86."
8d7c2b5c6df74c82562849aded9271f2bf77b10b 22-Feb-2010 Andy McFadden <fadden@android.com> Provide default variant for x86.

The TARGET_ARCH_VARIANT was not being set for x86. This caused some
difficulties when x86-atom tried to include variant-specific versions
of files.
ombo/linux-x86.mk
22344e760f49041a79a5b81339ff75716fee5651 22-Feb-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Allow optional product inheritance"
28a846d013fc89c9b7e480e0610895ac6b119fab 22-Feb-2010 Joe Onorato <joeo@android.com> Allow optional product inheritance

This allows to use a proper $(call inherit-product) across
the open-source -> non-open-source boundary in a way that
can automatically adapt to whether the non-open-source
part is present or not

Change-Id: I357721c68362ff8c0f90610850b0368adee68ada
roduct.mk
85ab497a4e9ee1b3cba653b06030c099fb7ca4e9 20-Feb-2010 Ying Wang <wangying@google.com> Turn on Proguard by default for user/userdebug builds.
ava.mk
ackage.mk
577c5ba9f4fd81e057d8c671772a16bc2719a9b3 19-Feb-2010 Fred Quintana <fredq@google.com> Merge "remove obsolete property ro.config.sync"
1d89773c1dd0e433a2dbd0ef8aedaf4c20f6ff74 18-Feb-2010 Doug Zongker <dougz@android.com> fix makefile inheritance system

The variable inheritance system can leave extra spaces in a variable
when multiple levels of inheritance are used. It can expand:

"@inherit:foo @inherit:bar @inherit:baz"

to

"value @inherit:bar @inherit:baz"

and then

"value @inherit:baz" (if bar has no value for the variable)

and then

"value " (if baz also has no value).

Call strip to remove excess spaces between words after each
replacement pass.

Change-Id: Ic4cfc6fed1865066a6353a522e4bdcb68ec875d3
ode_fns.mk
74a7e068003978c766530f18358b0f89804c6525 17-Feb-2010 Chia-chi Yeh <chiachi@android.com> Remove dead shared objects from prelink map.
relink-linux-arm.map
5dc8a659174abf68df351049679b38e32a162c5c 17-Feb-2010 Fred Quintana <fredq@google.com> remove obsolete property ro.config.sync
ain.mk
7e2f13b43a4a80f0739913368d4f21616caa33db 17-Feb-2010 Doug Zongker <dougz@android.com> build the event-log-tags file for the simulator

Change-Id: Idfbc8257e5e3651fe92649d59305f0e24ba60c91
akefile
d2827a1d6a9067ccceca205c8577ff96fce3ca09 17-Feb-2010 Raphael Moll <raphael@google.com> Merge "Allow sdk/builders to be built using Windows SDK."
719a123a587da473fde4907c1bcda29e20e23dfe 17-Feb-2010 Raphael <raphael@google.com> Allow sdk/builders to be built using Windows SDK.

Change-Id: Ic3c8bc2bace166442bf780b625e5d528fea4df9f
ain.mk
abfbbe2e1dc0d8dc01b87492427c670dab70f81f 16-Feb-2010 Doug Zongker <dougz@android.com> allow EventLog tag numbers to be auto-assigned

With this change, you can specify "?" in place of a tag number in a
.logtags file and the build system will assign numbers to these tags.
(The numbers used shouldn't matter since we translate them back to tag
names whenever the logs are read back.)

This is pretty straightforward to do:

- make merge-event-log-tags.py assign numbers to any tags that specify
"?"

- make the generated java files depend on the merged output

- make java-event-log-tags.py read both the original .logtags and the
merged output, and fill in tag numbers for any "?" using the merged
version.

Change-Id: Icc6ccd705db461d570fc929922a830aa6deaca48
ase_rules.mk
efinitions.mk
1181898e547c16dc2fe2f81990f0d481e523f45f 05-Feb-2010 Dima Zavin <dima@android.com> core: pass nand page size to mkyaffs2image based on BOARD_NAND_PAGE_SIZE boardconfig var

Change-Id: I6feefba15eb1562161e38df03223cb2fba4eb7ee
Signed-off-by: Dima Zavin <dima@android.com>
akefile
e3265fb743e13a1b602f220f58b398d82772eabb 25-Jan-2010 Ying Wang <wangying@google.com> Makefile change for build against historical sdk versions.

If LOCAL_SDK_VERSION is current, link against the stub, otherwise
link against prebuilt historical sdk
ase_rules.mk
ava.mk
3b2bdf10338fb048fc749ce9f65a77f917f7d304 01-Feb-2010 Ying Wang <wangying@google.com> Fix and enable proguard on packages.
ase_rules.mk
efinitions.mk
ava.mk
ackage.mk
roguard.flags
roguard_tests.flags
769835e0d9e6c448b191c21a2f6c5b10d8537b23 10-Feb-2010 Mathias Agopian <mathias@google.com> add libsurfaceflinger_client and libcamera_client to the prelinkmap
relink-linux-arm.map
98252565775b7636f54ac96eb9e25b5093f82475 08-Feb-2010 Patrick Scott <phanna@android.com> Put private includes before system includes.

This change allows modules to insert different include paths before the system
include paths. STLPort uses this to find system include files that have the same
name.
efinitions.mk
bb67d21337f8d87628fbc09585be6cfe6ab0336c 06-Feb-2010 Jeff Hamilton <jham@android.com> Get LOCAL_MANIFEST_PACKAGE_NAME working.

Change-Id: Ieafbf2596252ee3a2fe5d1ad433e8863fbf84601
ase_rules.mk
lear_vars.mk
efinitions.mk
f184a0f26db350693902ab623c414974978f4ac4 01-Feb-2010 Brian Carlstrom <bdc@google.com> Add support for LOCAL_JAVACFLAGS

The Dalvik core libraries team would like to start making warnings
errors in certain packages by definition LOCAL_JAVACFLAGS. This will
allow easier debuging of warnings in other packages by supplying
"-Xlint:..." options.
uild-system.html
lear_vars.mk
efinitions.mk
ost_java_library.mk
ava.mk
899e62a841bebefe6d9ab37ddc682e72fcb0f92b 05-Feb-2010 Joe Onorato <joeo@android.com> Add an inherit-package macro to the build system.

This lets you use the source code from one apk to build a new one
with a new module name, a new android package name and optionally,
a new certificate.

To use this, in a makefile, add this:

$(call inherit-package, \
packages/apps/Music/Android.mk, \
Music, \
MusicFork, \
my_cert, \
com.example.music)

You don't need the LOCAL_PATH and CLEAR_VARS stuff. It will override
only the packages that are defined in the makefile name you give, but
if other modules of other types are defined, you will get an error
saying that it's defined twice. In that case, you need to move the
duplicate library (for example a .so) out into a different makefile.

A LOCAL_OVERRIDES_PACKAGES entry is automatically created for the
forked app.
lear_vars.mk
efinitions.mk
ackage.mk
29544b21fb52c47bcc84439678d767db1e74dd4f 05-Feb-2010 Jean-Baptiste Queru <jbq@google.com> Merge "Look for product configs in device/ in addition to vendor/"
14833605d26bf970cd5335c02af4354b68d93348 02-Feb-2010 Doug Zongker <dougz@android.com> add UnmountAll function to OTA script; support radio images w/path

Three unrelated changes:

- change the add-radio-file makefile function to support adding files
with paths. (The path part of the pathname is stripped off.)

- add an UnmountAll function to the OTA script generation code, so
that we can explicitly unmount everything we've mounted (in addition
to doing it automatically at the end of the script).

- add the updater API version to the info object passed to
device-specific code.

Change-Id: Ia62b15403c1cc8fce8d9910f291450c8077e49f4
efinitions.mk
a89c990e31b39e58adecd1f72b517d47284b275a 02-Feb-2010 Bjorn Bringert <bringert@android.com> Add all-logtags-files-under macro

Change-Id: Icb4c7e1bb2dfa4df71f07cb022c92e95a9115019
efinitions.mk
5993b091940dc2e50ccc31b603bed6608b723f27 28-Jan-2010 Raphael <raphael@google.com> am ccd0338c: am e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.

Merge commit 'ccd0338ce637e62c483a727de04236aa05f989aa'

* commit 'ccd0338ce637e62c483a727de04236aa05f989aa':
Fix windows make: layoutlib_api moved to sdk.git too.
ffae6f5127387c7a1f5cc49ca3f5f3203f7d15f0 27-Jan-2010 Ed Heyl <edheyl@google.com> am 25a331ab: Merge "Update version string." into eclair

Merge commit '25a331ab870edcf31dbbfab0a9e6f4cef88654f5' into eclair-plus-aosp

* commit '25a331ab870edcf31dbbfab0a9e6f4cef88654f5':
Update version string.
813022b0a349af3056adaa779a285589f3a1681b 26-Jan-2010 Dianne Hackborn <hackbod@google.com> Update version string.

Change-Id: I9b03dadcbc93109f9c91bb9813a41ec23a6c1448
ersion_defaults.mk
ccd0338ce637e62c483a727de04236aa05f989aa 25-Jan-2010 Raphael <raphael@google.com> am e749b5a7: Fix windows make: layoutlib_api moved to sdk.git too.

Merge commit 'e749b5a71abe9c3659921c50cc4468a1a4f984f5' into eclair-plus-aosp

* commit 'e749b5a71abe9c3659921c50cc4468a1a4f984f5':
Fix windows make: layoutlib_api moved to sdk.git too.
e749b5a71abe9c3659921c50cc4468a1a4f984f5 23-Jan-2010 Raphael <raphael@google.com> Fix windows make: layoutlib_api moved to sdk.git too.

Change-Id: Ia030eda4514361b20a5ecb29c997ab625909228c
ain.mk
8d05416d613af2632eb3dd5763dee468a3b09034 22-Jan-2010 Jean-Baptiste Queru <jbq@google.com> Look for product configs in device/ in addition to vendor/

This will allow to create open-sourceable product configurations.

Change-Id: I4e73347c2095935340bfc8c3737c2adf1ef22a9c
onfig.mk
roduct.mk
a7ab17d0a3ad20b068f99da58ba331cc63ee8237 14-Jan-2010 Bjorn Bringert <bringert@android.com> Allow multiple directories in LOCAL_RESOURCE_DIR

Before, LOCAL_RESOURCE_DIR got messed up when the build system
tried to find the whole LOCAL_RESOURCE_DIR string in each
overlay directory.

This change splits LOCAL_RESOURCE_DIR before appending it to
the overlay directory paths.

I've verified that this now works:

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/overlay $(LOCAL_PATH)/res

Change-Id: Iea47f94a14720af0ca4b422aec30acf4acbe13cf
ackage.mk
09831ec9b21f37590778104795865ec5171ce4cf 13-Jan-2010 Wei-Ta Chen <weita@google.com> Merge "Add libjpeg to the prelink map."
44f6dde6a505a261e6074b77e141e4a29cc7dab0 13-Jan-2010 Raphael Moll <raphael@google.com> am acbbba88: am d1b68863: Merge "Add etc1tool to Windows SDK." into eclair

Merge commit 'acbbba88fb2a2e43b63cb83675ea368c47621ca8'

* commit 'acbbba88fb2a2e43b63cb83675ea368c47621ca8':
Add etc1tool to Windows SDK.
acbbba88fb2a2e43b63cb83675ea368c47621ca8 13-Jan-2010 Raphael Moll <raphael@google.com> am d1b68863: Merge "Add etc1tool to Windows SDK." into eclair

Merge commit 'd1b68863f5ef252a92adcfb22d3ca48872981a61' into eclair-plus-aosp

* commit 'd1b68863f5ef252a92adcfb22d3ca48872981a61':
Add etc1tool to Windows SDK.
4e7b0e21c538fc44b616aa4c9e8a2f3e933ce545 12-Jan-2010 Raphael <raphael@google.com> Add etc1tool to Windows SDK.

SDK BUG 2368918

This depends on Change I83485145 from development.git.

Change-Id: I1b4f5e39bd08c0cfbb656f2857921fb5ad305812
ain.mk
75127b769e20490f3348802e6b708d67c60c2b04 07-Jan-2010 Jean-Baptiste Queru <jbq@google.com> Remove special-handling of the restricted tag.

Nobody is using it any more, and it'd be too easy to
make a build system change that wouldn't properly handle it.

Change-Id: Ia61232ff944c34c46932c1885b2b0ec1b479566b
efinitions.mk
ain.mk
6907cfe7de2007b0320f4606d9ea62da2062d3ca 07-Jan-2010 Jean-Baptiste Queru <jbq@google.com> Remove special-case where CLASS=apps ignored TAGS=user

Also add a warning when there's TAG=user on a CLASS=apps module,
as this is not what people normally intend (this should be handled
in core.mk instead).

This used to be a source of confusion, with people using TAGS=user on
APPS and non-APPS modules, and being surprised to see some of those
included but not others.

Change-Id: I56b5618a556abdc6b841bf7a943d77c20fe9a4c5
ase_rules.mk
ain.mk
a831cbdcfc44e12c4bc556383558ec7b1e4bac3d 07-Jan-2010 Jean-Baptiste Queru <jbq@google.com> Warn when using unrecognized/uncommon tags.

Such tags don't do anything, so using them is at
best a no-op, at worst a typo where the author intended
something else.

Change-Id: I1462032f4df3564b06a82685f226a6d5a665a633
ase_rules.mk
7b86bfb03ee785cb828139c94bb86817d3249667 07-Jan-2010 Joe Onorato <joeo@android.com> add a warning about using include in product spec files.

currently disabled because there are too many of them.
ode_fns.mk
d139dbb8189522279370e91311d76efecb077278 06-Jan-2010 Wei-Ta Chen <weita@google.com> Add libjpeg to the prelink map.

libjpeg is now built to a shared library,
which enables it be dynamically linked by various packeages/libraries.
relink-linux-arm.map
05c7f61cafa1455d0e81a9b49a729acd6c6d2939 05-Jan-2010 Joe Onorato <joeo@android.com> Don't do the check build step for apps that link against the SDK.

We already have the apicheck process to make sure that nobody breaks that,
so doing the extra check isn't necessary.
ase_rules.mk
bc8abb6fec5063b05fa9ca7f87663caed962bf02 04-Jan-2010 Joe Onorato <joeo@android.com> Tell python not to spam the source tree with .pyc files.

This only has an effect on python 2.6 and above.
onfig.mk
fcc50ebb4aa3912612ff975edba60139e0e3b488 29-Dec-2009 Jack Palevich <jackpal@google.com> Add libETC1 to the prelink map.

libETC1 is a library for compressing and
decompressing images in the ETC1 format.

This is a common texture format for OpenGL ES 2.0
GPUs.
relink-linux-arm.map
0a3cfdc853efb7a57b06def3bd95127398366acb 18-Dec-2009 Jean-Baptiste Queru <jbq@google.com> Add all-html-files-under

This allows to run droiddoc on only a specific set of subdirectories
instead of using all subdirectories.

Change-Id: I6b5daa31f6ce6801705a5c87bd05ea0e4e8c5d88
efinitions.mk
a709a1b2a47432bde2189e7fe32b8a02ffdd3fcc 18-Dec-2009 Brett Chabot <brettchabot@android.com> am d5cf3a95: am 1e43c510: Add CTS accounts tests to CTS makefile.

Merge commit 'd5cf3a95cce2d9699d2c3f5998d51302f51aa03c'

* commit 'd5cf3a95cce2d9699d2c3f5998d51302f51aa03c':
Add CTS accounts tests to CTS makefile.
d5cf3a95cce2d9699d2c3f5998d51302f51aa03c 18-Dec-2009 Brett Chabot <brettchabot@android.com> am 1e43c510: Add CTS accounts tests to CTS makefile.

Merge commit '1e43c510758439b3195597056121c59b71481254' into eclair-plus-aosp

* commit '1e43c510758439b3195597056121c59b71481254':
Add CTS accounts tests to CTS makefile.
1e43c510758439b3195597056121c59b71481254 18-Dec-2009 Brett Chabot <brettchabot@android.com> Add CTS accounts tests to CTS makefile.

Change-Id: If7d87e2deed2036536ad852c382dca0e8bbad87b
asks/cts.mk
64b00e3f98a15db0ef6dfe83e3c2141b9b483631 17-Dec-2009 Andreas Huber <andih@google.com> Squashed commit of the following:

commit b03d5f537dee393affddf89663ae6977a5512d98
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 17 14:00:37 2009 -0800

Update cleanspec to facilitate incremental building with full stagefright lib.

commit b92560a1989f8b9cb27a8772cec5346d3d90dc84
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 17 13:31:48 2009 -0800

Enable building stagefright in all builds, make stagefright the default player.
ain.mk
aa2885ed34c3949d2008d8c976e8645f3eeee56d 17-Dec-2009 Jeff Hamilton <jham@android.com> Switch the platform name from Eclair-MR2 to Froyo.
ersion_defaults.mk
f6a53aa5f24878ad9098409ed3d3f41bb5c63fb5 16-Dec-2009 Doug Zongker <dougz@android.com> add "EXTERNAL" as special value of LOCAL_CERTIFICATE

Setting LOCAL_CERTIFICATE to "EXTERNAL" now marks an apk (either a
prebuilt or otherwise) as needing the default test key within the
system, but one that should be signed after the target_files is
produced but before sign_target_files_apks does the rest of the
signing. (We use this to ship apps on the system that are signed by
third parties, like Facebook.)
akefile
ackage.mk
rebuilt.mk
a660e48ea7c6423473d7ddaf5e7027c833366971 15-Dec-2009 Doug Zongker <dougz@android.com> am 4cac8afc: am 714111cb: include pre-signed prebuilt .apks in apkcerts.txt

Merge commit '4cac8afc21a356ce3ca074f12383cf1526d44156'

* commit '4cac8afc21a356ce3ca074f12383cf1526d44156':
include pre-signed prebuilt .apks in apkcerts.txt
4cac8afc21a356ce3ca074f12383cf1526d44156 15-Dec-2009 Doug Zongker <dougz@android.com> am 714111cb: include pre-signed prebuilt .apks in apkcerts.txt

Merge commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008' into eclair-mr2-plus-aosp

* commit '714111cbdde0fd5c4f276d4666ddb99cbf0c5008':
include pre-signed prebuilt .apks in apkcerts.txt
714111cbdde0fd5c4f276d4666ddb99cbf0c5008 14-Dec-2009 Doug Zongker <dougz@android.com> include pre-signed prebuilt .apks in apkcerts.txt
rebuilt.mk
3a104c868eb1b422b8cf3d8a2f7e6376d368585c 12-Dec-2009 Doug Zongker <dougz@android.com> am 39ecb46e: am 9bc88726: Merge change I45302ff0 into eclair-mr2

Merge commit '39ecb46ed1c124e4d3e3ebb594a62b65984483ac'

* commit '39ecb46ed1c124e4d3e3ebb594a62b65984483ac':
make prebuilt .apks require LOCAL_CERTIFICATE
39ecb46ed1c124e4d3e3ebb594a62b65984483ac 11-Dec-2009 Doug Zongker <dougz@android.com> am 9bc88726: Merge change I45302ff0 into eclair-mr2

Merge commit '9bc88726cb24e92007d42c126ec094e687b3905f' into eclair-mr2-plus-aosp

* commit '9bc88726cb24e92007d42c126ec094e687b3905f':
make prebuilt .apks require LOCAL_CERTIFICATE
9bc88726cb24e92007d42c126ec094e687b3905f 11-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I45302ff0 into eclair-mr2

* changes:
make prebuilt .apks require LOCAL_CERTIFICATE
45302ff00b66af10d1fe8214e1a76f3b4ddc7073 11-Dec-2009 Doug Zongker <dougz@android.com> make prebuilt .apks require LOCAL_CERTIFICATE

Require people who check in new prebuilts to decide what keys they
should be signed with, rather than having a fire drill every time we
go to sign a build and discover new prebuilts.
rebuilt.mk
27861a988c3a7869f8b8caf777dd3700e1ff2e19 11-Dec-2009 Ying Wang <wangying@google.com> am baefd248: am 92e2d3e2: am 6ef046c8: Fixes ProGuard options.

Merge commit 'baefd2480f63ad9b3a5ec9764879ae01f2ad9886'

* commit 'baefd2480f63ad9b3a5ec9764879ae01f2ad9886':
Fixes ProGuard options.
baefd2480f63ad9b3a5ec9764879ae01f2ad9886 11-Dec-2009 Ying Wang <wangying@google.com> am 92e2d3e2: am 6ef046c8: Fixes ProGuard options.

Merge commit '92e2d3e206a301a090d90e8c61d85e88fdc35a71' into eclair-mr2-plus-aosp

* commit '92e2d3e206a301a090d90e8c61d85e88fdc35a71':
Fixes ProGuard options.
92e2d3e206a301a090d90e8c61d85e88fdc35a71 11-Dec-2009 Ying Wang <wangying@google.com> am 6ef046c8: Fixes ProGuard options.

Merge commit '6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-mr2

* commit '6ef046c8932989ca97d1cb39413ef99761315a06':
Fixes ProGuard options.
92269fdd4ff34e89e8a1b62c7057e6bc47a58d5e 09-Dec-2009 Ying Wang <wangying@google.com> am 6ef046c8: Fixes ProGuard options.

Merge commit '6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-plus-aosp

* commit '6ef046c8932989ca97d1cb39413ef99761315a06':
Fixes ProGuard options.
6ef046c8932989ca97d1cb39413ef99761315a06 08-Dec-2009 Ying Wang <wangying@google.com> Fixes ProGuard options.

1. Dedup LOCAL_JAVA_LIBRARIES.
2. Even no resource or asset for a package, we still need to set
package_expected_intermediates_COMMON, which is anyway used by ProGuard.
ava.mk
ackage.mk
6c5a1ceed95d6fd9f3e12c329f32af780be8bec5 04-Dec-2009 Doug Zongker <dougz@android.com> am 95137c3d: am 6c4a70c6: Merge change I672b05c4 into eclair-mr2

Merge commit '95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e'

* commit '95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e':
make build depend on event-log-tags file
fef125ec594afc3de41ea219b7bc2668272ce123 04-Dec-2009 Dianne Hackborn <hackbod@google.com> am af5cb904: am 176c758c: Change version to MR2 development.

Merge commit 'af5cb9042497509fb75060667f5ca921c10218a6'

* commit 'af5cb9042497509fb75060667f5ca921c10218a6':
Change version to MR2 development.
95137c3dfeebbefebacd37f26d5e7cb7f0a99c7e 04-Dec-2009 Doug Zongker <dougz@android.com> am 6c4a70c6: Merge change I672b05c4 into eclair-mr2

Merge commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944' into eclair-mr2-plus-aosp

* commit '6c4a70c64d45545814ba60ad8ad3a95474ea0944':
make build depend on event-log-tags file
af5cb9042497509fb75060667f5ca921c10218a6 04-Dec-2009 Dianne Hackborn <hackbod@google.com> am 176c758c: Change version to MR2 development.

Merge commit '176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc' into eclair-mr2-plus-aosp

* commit '176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc':
Change version to MR2 development.
6c4a70c64d45545814ba60ad8ad3a95474ea0944 04-Dec-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I672b05c4 into eclair-mr2

* changes:
make build depend on event-log-tags file
672b05c47cc703c984cf3afd6318cbeb24e3b80a 04-Dec-2009 Doug Zongker <dougz@android.com> make build depend on event-log-tags file

Oops, I forgot to make the build actually require the event-log-tags file.
akefile
0d5eb0b7e473ee734a78b12fb5f2d5d27da0f745 04-Dec-2009 Doug Zongker <dougz@android.com> am af830d39: am 485847e4: Merge change I6f85805b into eclair-mr2

Merge commit 'af830d3999ac1670b92207f6c1201d297913b9a9'

* commit 'af830d3999ac1670b92207f6c1201d297913b9a9':
break up event-log-tags; generate java source files with constants
176c758cb40afd39960eb6b5fe0a3aabbdc4f8cc 04-Dec-2009 Dianne Hackborn <hackbod@google.com> Change version to MR2 development.
ersion_defaults.mk
af830d3999ac1670b92207f6c1201d297913b9a9 04-Dec-2009 Doug Zongker <dougz@android.com> am 485847e4: Merge change I6f85805b into eclair-mr2

Merge commit '485847e4c47e1504ddf8b830d557211d02a76e57' into eclair-mr2-plus-aosp

* commit '485847e4c47e1504ddf8b830d557211d02a76e57':
break up event-log-tags; generate java source files with constants
9bd4962af87257c6a97e9026af7e4764394412c2 30-Nov-2009 Doug Zongker <dougz@android.com> break up event-log-tags; generate java source files with constants

Construct the /system/etc/event-log-tags file by unioning together any
*.logtags files included in LOCAL_SRC_FILES throughout the system (with
appropriate error checking for dup tag numbers, etc.)

For java packages, generate a java source file from the logtags file for
that package that contains static integer constants for each tag name.
akefile
ase_rules.mk
onfig.mk
efinitions.mk
679aa653fc1c15b601e4ffaec48d3206fd073b99 21-Nov-2009 Dan Bornstein <danfuzz@android.com> am 92a71f46: am aa71af7f: am bb0c8804: Add Bluetooth to the test list.

Merge commit '92a71f465fa02de5a5e6ed9ba84d2f1dd62e2c78'

* commit '92a71f465fa02de5a5e6ed9ba84d2f1dd62e2c78':
Add Bluetooth to the test list.
92a71f465fa02de5a5e6ed9ba84d2f1dd62e2c78 21-Nov-2009 Dan Bornstein <danfuzz@android.com> am aa71af7f: am bb0c8804: Add Bluetooth to the test list.

Merge commit 'aa71af7f8efa812b65461e4d3ca39aae1dd23b8b' into eclair-mr2-plus-aosp

* commit 'aa71af7f8efa812b65461e4d3ca39aae1dd23b8b':
Add Bluetooth to the test list.
fced1d6d9787492269c4a37e2da77f239590803b 21-Nov-2009 Dan Bornstein <danfuzz@android.com> am bb0c8804: Add Bluetooth to the test list.

Merge commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617' into eclair-plus-aosp

* commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617':
Add Bluetooth to the test list.
aa71af7f8efa812b65461e4d3ca39aae1dd23b8b 21-Nov-2009 Dan Bornstein <danfuzz@android.com> am bb0c8804: Add Bluetooth to the test list.

Merge commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617' into eclair-mr2

* commit 'bb0c8804dd7440d589ef8845960ad8b76d4b6617':
Add Bluetooth to the test list.
bb0c8804dd7440d589ef8845960ad8b76d4b6617 20-Nov-2009 Dan Bornstein <danfuzz@android.com> Add Bluetooth to the test list.

Change-Id: I1e18b76c87a7bba5ef3b4db8ac763bc7d9b6aac6
asks/cts.mk
3f7669520f0764a7cc777b03a0a2b51c5cb126f4 20-Nov-2009 Dan Bornstein <danfuzz@android.com> am 33f188de: am d867551e: am ffbe862d: Merge change I60b2633b into eclair

Merge commit '33f188de6c656d4056b1f98f37c4b8ca63c7d493'

* commit '33f188de6c656d4056b1f98f37c4b8ca63c7d493':
Add the JNI test to the CTS list.
33f188de6c656d4056b1f98f37c4b8ca63c7d493 19-Nov-2009 Dan Bornstein <danfuzz@android.com> am d867551e: am ffbe862d: Merge change I60b2633b into eclair

Merge commit 'd867551efea52a7d342b8fd2ed08fc9939090e88' into eclair-mr2-plus-aosp

* commit 'd867551efea52a7d342b8fd2ed08fc9939090e88':
Add the JNI test to the CTS list.
d867551efea52a7d342b8fd2ed08fc9939090e88 19-Nov-2009 Dan Bornstein <danfuzz@android.com> am ffbe862d: Merge change I60b2633b into eclair

Merge commit 'ffbe862d05cb69278a26fb41950a2ce313451f49' into eclair-mr2

* commit 'ffbe862d05cb69278a26fb41950a2ce313451f49':
Add the JNI test to the CTS list.
ee11f163846168c14de3e3c710cac2c57cdbbde1 19-Nov-2009 Dianne Hackborn <hackbod@google.com> am 26ab7084: am 07e1232a: resolved conflicts for merge of 90b35770 to eclair-mr2

Merge commit '26ab7084b508d2052c3e4e62e9c6d0f7d08211d1'

* commit '26ab7084b508d2052c3e4e62e9c6d0f7d08211d1':
Update version name to 2.1 and API to 7.
26ab7084b508d2052c3e4e62e9c6d0f7d08211d1 19-Nov-2009 Dianne Hackborn <hackbod@google.com> am 07e1232a: resolved conflicts for merge of 90b35770 to eclair-mr2

Merge commit '07e1232a2dc2887ba0003d629032c21fbb426652' into eclair-mr2-plus-aosp

* commit '07e1232a2dc2887ba0003d629032c21fbb426652':
Update version name to 2.1 and API to 7.
07e1232a2dc2887ba0003d629032c21fbb426652 19-Nov-2009 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 90b35770 to eclair-mr2
42faa77ce1d5abbce3e2067297af1506ebff6e05 19-Nov-2009 Dan Bornstein <danfuzz@android.com> am ffbe862d: Merge change I60b2633b into eclair

Merge commit 'ffbe862d05cb69278a26fb41950a2ce313451f49' into eclair-plus-aosp

* commit 'ffbe862d05cb69278a26fb41950a2ce313451f49':
Add the JNI test to the CTS list.
ffbe862d05cb69278a26fb41950a2ce313451f49 19-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I60b2633b into eclair

* changes:
Add the JNI test to the CTS list.
779b49a2386ef6506049d94331fe9ebba4e3a9be 19-Nov-2009 Dianne Hackborn <hackbod@google.com> am 90b35770: Merge change If922a88c into eclair

Merge commit '90b35770c227f9b4ad56194de627593496acf724' into eclair-plus-aosp

* commit '90b35770c227f9b4ad56194de627593496acf724':
Update version name to 2.1 and API to 7.
90b35770c227f9b4ad56194de627593496acf724 19-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change If922a88c into eclair

* changes:
Update version name to 2.1 and API to 7.
886332b8bedd9ce12ccf49920dbbac271cb44552 19-Nov-2009 Dan Egnor <egnor@google.com> am f711e349: am 1f816cf5: Merge change I362bebd3 into eclair-mr2

Merge commit 'f711e3494ca8e740c19f77ec753051e0517208a3'

* commit 'f711e3494ca8e740c19f77ec753051e0517208a3':
Include the common source files directly in the framework library
00dbcf8f0586491d330ff90399c72559c06bb894 19-Nov-2009 Raphael <raphael@google.com> am 89715318: am c3d743d2: am 81d88c31: am d920ec83: Fix a Windows-only discrepency in the Windows SDK build.

Merge commit '89715318b22014e2a2a683fe4300dffc2dd5e512'

* commit '89715318b22014e2a2a683fe4300dffc2dd5e512':
Fix a Windows-only discrepency in the Windows SDK build.
154c9e8b999b7e399bf59b005846ffe16878418d 19-Nov-2009 Raphael <raphael@google.com> am 08ab72b3: am 6f5cb991: am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split.

Merge commit '08ab72b3512f59edb45d6156611a72d3a8d04a4e'

* commit '08ab72b3512f59edb45d6156611a72d3a8d04a4e':
Fix the Windows SDK build for the development to sdk split.
b61a97bcdfffc9eab5d913d71abb0bc0b14c3d81 19-Nov-2009 Xavier Ducrohet <xav@android.com> am 3c5b1842: am 802bb072: am 258b2b45: am 1ae98804: Change where makefile looks for sdk_clean.sh

Merge commit '3c5b1842ea37cbf6a1c520f32f3782f9a2db406b'

* commit '3c5b1842ea37cbf6a1c520f32f3782f9a2db406b':
Change where makefile looks for sdk_clean.sh
f711e3494ca8e740c19f77ec753051e0517208a3 19-Nov-2009 Dan Egnor <egnor@google.com> am 1f816cf5: Merge change I362bebd3 into eclair-mr2

Merge commit '1f816cf57b93654638989e6007d669c04b3d9b88' into eclair-mr2-plus-aosp

* commit '1f816cf57b93654638989e6007d669c04b3d9b88':
Include the common source files directly in the framework library
89715318b22014e2a2a683fe4300dffc2dd5e512 19-Nov-2009 Raphael <raphael@google.com> am c3d743d2: am 81d88c31: am d920ec83: Fix a Windows-only discrepency in the Windows SDK build.

Merge commit 'c3d743d262cd69e817524f8a4e5554ef29ffa837' into eclair-mr2-plus-aosp

* commit 'c3d743d262cd69e817524f8a4e5554ef29ffa837':
Fix a Windows-only discrepency in the Windows SDK build.
08ab72b3512f59edb45d6156611a72d3a8d04a4e 19-Nov-2009 Raphael <raphael@google.com> am 6f5cb991: am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split.

Merge commit '6f5cb991f61acbc21090c3744d5bf16b01b7aa52' into eclair-mr2-plus-aosp

* commit '6f5cb991f61acbc21090c3744d5bf16b01b7aa52':
Fix the Windows SDK build for the development to sdk split.
3c5b1842ea37cbf6a1c520f32f3782f9a2db406b 19-Nov-2009 Xavier Ducrohet <xav@android.com> am 802bb072: am 258b2b45: am 1ae98804: Change where makefile looks for sdk_clean.sh

Merge commit '802bb072c2d9efaac1c46ac13d7e69a0aaf936a9' into eclair-mr2-plus-aosp

* commit '802bb072c2d9efaac1c46ac13d7e69a0aaf936a9':
Change where makefile looks for sdk_clean.sh
fdc0efd29cec2b5d0928c4ba0ef7cfe8f11a0160 19-Nov-2009 Brett Chabot <brettchabot@android.com> am 82a36c3b: am b4805a18: am 2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup.

Merge commit '82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32'

* commit '82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
2bc3daebe50715953fee6bd21bb5a236b2389f84 19-Nov-2009 Raphael <raphael@google.com> am 81d88c31: am d920ec83: Fix a Windows-only discrepency in the Windows SDK build.

Merge commit '81d88c31be80493886e6844ebf8af8a03273208c' into eclair-plus-aosp

* commit '81d88c31be80493886e6844ebf8af8a03273208c':
Fix a Windows-only discrepency in the Windows SDK build.
6e602b483301090510d3c21a1f63f37143fcce48 19-Nov-2009 Raphael <raphael@google.com> am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split.

Merge commit 'f15e028fe822069e44b0e06fa91f537048538f94' into eclair-plus-aosp

* commit 'f15e028fe822069e44b0e06fa91f537048538f94':
Fix the Windows SDK build for the development to sdk split.
79e7cc50c3fd95e3d2155ccb11532ba6bfeb5b34 19-Nov-2009 Xavier Ducrohet <xav@android.com> am 258b2b45: am 1ae98804: Change where makefile looks for sdk_clean.sh

Merge commit '258b2b4504949fa95b733b149dd5f8146bfb7887' into eclair-plus-aosp

* commit '258b2b4504949fa95b733b149dd5f8146bfb7887':
Change where makefile looks for sdk_clean.sh
c3e17966b597f50e056eac42016e054f1d837eaf 19-Nov-2009 Dianne Hackborn <hackbod@google.com> Update version name to 2.1 and API to 7.

Change-Id: If922a88c1f3e99553ec5df9b870713eab1c53c54
ersion_defaults.mk
01833fba3beb255a0c2908a83d02ecdc844da64d 19-Nov-2009 Dan Bornstein <danfuzz@android.com> Add the JNI test to the CTS list.

Change-Id: I60b2633b98ccb06551e521ff229ed12c897cc2e6
asks/cts.mk
1f816cf57b93654638989e6007d669c04b3d9b88 19-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I362bebd3 into eclair-mr2

* changes:
Include the common source files directly in the framework library when building, to allow mutual interdependencies; the common static library will be built independently.
c3d743d262cd69e817524f8a4e5554ef29ffa837 19-Nov-2009 Raphael <raphael@google.com> am 81d88c31: am d920ec83: Fix a Windows-only discrepency in the Windows SDK build.

Merge commit '81d88c31be80493886e6844ebf8af8a03273208c' into eclair-mr2

* commit '81d88c31be80493886e6844ebf8af8a03273208c':
Fix a Windows-only discrepency in the Windows SDK build.
6f5cb991f61acbc21090c3744d5bf16b01b7aa52 19-Nov-2009 Raphael <raphael@google.com> am f15e028f: am a62a4421: Fix the Windows SDK build for the development to sdk split.

Merge commit 'f15e028fe822069e44b0e06fa91f537048538f94' into eclair-mr2

* commit 'f15e028fe822069e44b0e06fa91f537048538f94':
Fix the Windows SDK build for the development to sdk split.
802bb072c2d9efaac1c46ac13d7e69a0aaf936a9 19-Nov-2009 Xavier Ducrohet <xav@android.com> am 258b2b45: am 1ae98804: Change where makefile looks for sdk_clean.sh

Merge commit '258b2b4504949fa95b733b149dd5f8146bfb7887' into eclair-mr2

* commit '258b2b4504949fa95b733b149dd5f8146bfb7887':
Change where makefile looks for sdk_clean.sh
81d88c31be80493886e6844ebf8af8a03273208c 19-Nov-2009 Raphael <raphael@google.com> am d920ec83: Fix a Windows-only discrepency in the Windows SDK build.

Merge commit 'd920ec8354940653e6cf53a1540360cca3bcc5f7' into eclair

* commit 'd920ec8354940653e6cf53a1540360cca3bcc5f7':
Fix a Windows-only discrepency in the Windows SDK build.
f15e028fe822069e44b0e06fa91f537048538f94 19-Nov-2009 Raphael <raphael@google.com> am a62a4421: Fix the Windows SDK build for the development to sdk split.

Merge commit 'a62a442129a28bf3a62139183868a13b91e976ad' into eclair

* commit 'a62a442129a28bf3a62139183868a13b91e976ad':
Fix the Windows SDK build for the development to sdk split.
258b2b4504949fa95b733b149dd5f8146bfb7887 19-Nov-2009 Xavier Ducrohet <xav@android.com> am 1ae98804: Change where makefile looks for sdk_clean.sh

Merge commit '1ae988040777f88f766fc421af79a61175e917af' into eclair

* commit '1ae988040777f88f766fc421af79a61175e917af':
Change where makefile looks for sdk_clean.sh
81ab3c593a2546dad8db23284fc86bd689cf1245 18-Nov-2009 Dan Egnor <egnor@google.com> Include the common source files directly in the framework library
when building, to allow mutual interdependencies; the common static
library will be built independently.
athmap.mk
82a36c3b36a3f80b7c2d6ea382af91cc4e2bca32 18-Nov-2009 Brett Chabot <brettchabot@android.com> am b4805a18: am 2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup.

Merge commit 'b4805a18e51d3a18caa2cac821479a9535778d58' into eclair-mr2-plus-aosp

* commit 'b4805a18e51d3a18caa2cac821479a9535778d58':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
6485303717b041f4a7532d2db6b359bf03028ef3 18-Nov-2009 Brett Chabot <brettchabot@android.com> am 2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup.

Merge commit '2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-plus-aosp

* commit '2779fa7d9fea6f61392135a231e69a3e9b89768e':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
b4805a18e51d3a18caa2cac821479a9535778d58 18-Nov-2009 Brett Chabot <brettchabot@android.com> am 2779fa7d: Change name of CTS DeviceInfoCollector package to TestDeviceSetup.

Merge commit '2779fa7d9fea6f61392135a231e69a3e9b89768e' into eclair-mr2

* commit '2779fa7d9fea6f61392135a231e69a3e9b89768e':
Change name of CTS DeviceInfoCollector package to TestDeviceSetup.
2779fa7d9fea6f61392135a231e69a3e9b89768e 12-Nov-2009 Brett Chabot <brettchabot@android.com> Change name of CTS DeviceInfoCollector package to TestDeviceSetup.

Bug 2099347

Change-Id: Ica876daca8993e8f6eefda6f1a733dcadc92f292
asks/cts.mk
d920ec8354940653e6cf53a1540360cca3bcc5f7 18-Nov-2009 Raphael <raphael@google.com> Fix a Windows-only discrepency in the Windows SDK build.

For some reason, there's a slight behavior difference between
my Windowss machine and the Windows build servers, that is on
mine the include of framework/base results in duplicate build
rules being defined. My machine used to work like the Windows
build server and the behavior mysteriously changed a while
ago. This change should make it all work the same on all boxes.

Change-Id: I45e02e9eadfc586f86caa6a2690deda9648e600d
ain.mk
576714fdb91ffed79559f0f2ac9aa6f2967b6f40 18-Nov-2009 Dan Egnor <egnor@google.com> am 1a0b304f: am 573205f4: Remove external/googleclient (the code moved elsewhere)

Merge commit '1a0b304faca9a1977f1fe1b44d089a4b01593c81'

* commit '1a0b304faca9a1977f1fe1b44d089a4b01593c81':
Remove external/googleclient (the code moved elsewhere)
a62a442129a28bf3a62139183868a13b91e976ad 18-Nov-2009 Raphael <raphael@google.com> Fix the Windows SDK build for the development to sdk split.

Change-Id: Iabeee6aa319a3d98d05357f508b190ba65196df7
ain.mk
1a0b304faca9a1977f1fe1b44d089a4b01593c81 18-Nov-2009 Dan Egnor <egnor@google.com> am 573205f4: Remove external/googleclient (the code moved elsewhere)

Merge commit '573205f4838cf0369fd6a7028c793726d1eb8620' into eclair-mr2-plus-aosp

* commit '573205f4838cf0369fd6a7028c793726d1eb8620':
Remove external/googleclient (the code moved elsewhere)
573205f4838cf0369fd6a7028c793726d1eb8620 18-Nov-2009 Dan Egnor <egnor@google.com> Remove external/googleclient (the code moved elsewhere)
ain.mk
58226c0825abd1fd753a823f958dabe78761b5e3 18-Nov-2009 Dan Bornstein <danfuzz@android.com> am 39b99e4f: am 34ce5914: resolved conflicts for merge of c3d9645e to eclair-mr2

Merge commit '39b99e4f593e2af103f6d21bc24776c264ee7ab3'

* commit '39b99e4f593e2af103f6d21bc24776c264ee7ab3':
Add the example test to the CTS.
39b99e4f593e2af103f6d21bc24776c264ee7ab3 18-Nov-2009 Dan Bornstein <danfuzz@android.com> am 34ce5914: resolved conflicts for merge of c3d9645e to eclair-mr2

Merge commit '34ce59147ca68f81a36ab05533a90199147ef3c7' into eclair-mr2-plus-aosp

* commit '34ce59147ca68f81a36ab05533a90199147ef3c7':
Add the example test to the CTS.
34ce59147ca68f81a36ab05533a90199147ef3c7 18-Nov-2009 Dan Bornstein <danfuzz@android.com> resolved conflicts for merge of c3d9645e to eclair-mr2
189b528d26a561d6a0d4af58ec2da5138b37d2b0 18-Nov-2009 Dan Bornstein <danfuzz@android.com> am c3d9645e: Merge change I392672f1 into eclair

Merge commit 'c3d9645e29aeb124b39a0b7639767a5f1fead229' into eclair-plus-aosp

* commit 'c3d9645e29aeb124b39a0b7639767a5f1fead229':
Add the example test to the CTS.
c3d9645e29aeb124b39a0b7639767a5f1fead229 18-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I392672f1 into eclair

* changes:
Add the example test to the CTS.
1ae988040777f88f766fc421af79a61175e917af 18-Nov-2009 Xavier Ducrohet <xav@android.com> Change where makefile looks for sdk_clean.sh
akefile
1347f92e3aea9712a150514b9e77a8860b788304 17-Nov-2009 Dan Bornstein <danfuzz@android.com> Add the example test to the CTS.

Change-Id: I392672f1767bf72a18058de49c8658dabdc93a4d
asks/cts.mk
cb3e80cd55cd1fca3e3be390f8b8b68470c1bbae 17-Nov-2009 Adam Bliss <abliss@google.com> am 3a4b4985: am 0774bf3e: am 580cdbe0: Enables nodpi drawables in the framework.

Merge commit '3a4b4985ed9dafc01fd372474d40ec85bcc7f027'

* commit '3a4b4985ed9dafc01fd372474d40ec85bcc7f027':
Enables nodpi drawables in the framework.
3a4b4985ed9dafc01fd372474d40ec85bcc7f027 17-Nov-2009 Adam Bliss <abliss@google.com> am 0774bf3e: am 580cdbe0: Enables nodpi drawables in the framework.

Merge commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9' into eclair-mr2-plus-aosp

* commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9':
Enables nodpi drawables in the framework.
0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9 17-Nov-2009 Adam Bliss <abliss@google.com> am 580cdbe0: Enables nodpi drawables in the framework.

Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-mr2

* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
Enables nodpi drawables in the framework.
55823d3a089af4a401918a6d539144ef2775cd57 17-Nov-2009 Adam Bliss <abliss@google.com> am 580cdbe0: Enables nodpi drawables in the framework.

Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-plus-aosp

* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
Enables nodpi drawables in the framework.
580cdbe0fe0dd794c7035d8a406353f88aad827e 17-Nov-2009 Adam Bliss <abliss@google.com> Enables nodpi drawables in the framework.
roduct_config.mk
73053721a0f602b09cd3283b2b80a5b6610be9fb 13-Nov-2009 Dianne Hackborn <hackbod@google.com> am 26542574: am 8feaa2b6: am d0b22902: Merge change I847e8ab8 into eclair

Merge commit '265425746b50ddb14467b2bdbd62f3424b7176f0'

* commit '265425746b50ddb14467b2bdbd62f3424b7176f0':
Fix issue #2258571: Fix build versions
265425746b50ddb14467b2bdbd62f3424b7176f0 13-Nov-2009 Dianne Hackborn <hackbod@google.com> am 8feaa2b6: am d0b22902: Merge change I847e8ab8 into eclair

Merge commit '8feaa2b67fdb93fe04a220cd5857c80c60b53934' into eclair-mr2-plus-aosp

* commit '8feaa2b67fdb93fe04a220cd5857c80c60b53934':
Fix issue #2258571: Fix build versions
8feaa2b67fdb93fe04a220cd5857c80c60b53934 13-Nov-2009 Dianne Hackborn <hackbod@google.com> am d0b22902: Merge change I847e8ab8 into eclair

Merge commit 'd0b229025792977fe668cd636c7875d954b80b82' into eclair-mr2

* commit 'd0b229025792977fe668cd636c7875d954b80b82':
Fix issue #2258571: Fix build versions
8d9c211a124845ea732d8d606c12882549f12667 13-Nov-2009 Dianne Hackborn <hackbod@google.com> am d0b22902: Merge change I847e8ab8 into eclair

Merge commit 'd0b229025792977fe668cd636c7875d954b80b82' into eclair-plus-aosp

* commit 'd0b229025792977fe668cd636c7875d954b80b82':
Fix issue #2258571: Fix build versions
f6295cdd8234673965ee41015e32340d4e8a76a7 13-Nov-2009 Dianne Hackborn <hackbod@google.com> Fix issue #2258571: Fix build versions

Change-Id: I847e8ab8080d5a0716e913da8e176e7dfcd966eb
ersion_defaults.mk
579e12bb6eeaf327e7edb61c1886261259fef203 12-Nov-2009 David 'Digit' Turner <digit@google.com> am e870a487: am 002d1c24: am 31597999: Merge change I2edfb71d into eclair

Merge commit 'e870a487d6679eecca1f19524807cc2215922fb5'

* commit 'e870a487d6679eecca1f19524807cc2215922fb5':
Support secondary CPU ABI in build.prop
e870a487d6679eecca1f19524807cc2215922fb5 12-Nov-2009 David 'Digit' Turner <digit@google.com> am 002d1c24: am 31597999: Merge change I2edfb71d into eclair

Merge commit '002d1c24b4dee2582e660f80669176c4a3e2db33' into eclair-mr2-plus-aosp

* commit '002d1c24b4dee2582e660f80669176c4a3e2db33':
Support secondary CPU ABI in build.prop
0464bc49e1db3e0787441b171f4cd5c28ab2c060 12-Nov-2009 David 'Digit' Turner <digit@google.com> am 31597999: Merge change I2edfb71d into eclair

Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-plus-aosp

* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
Support secondary CPU ABI in build.prop
002d1c24b4dee2582e660f80669176c4a3e2db33 12-Nov-2009 David 'Digit' Turner <digit@google.com> am 31597999: Merge change I2edfb71d into eclair

Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2

* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
Support secondary CPU ABI in build.prop
c96782980778a4b1b9d6b0bf7647e594f84f74a7 09-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I573364cd

* changes:
Fix the host rule for building executables on darwin-x86.
f43b38da71a414cd487a6eec20c2c2ca5d366f34 09-Nov-2009 Jean-Baptiste Queru <jbq@google.com> am e1b710a5: merge from open-source master

Merge commit 'e1b710a5ba16be660d5383f1e56bd76b664b1d05'

* commit 'e1b710a5ba16be660d5383f1e56bd76b664b1d05':
Added prune options to findleaves.sh to ignore the .git and .repo
Added a default to specify an alternative tool chain prefix if needed.
Update prelink map for libFLAC
e1b710a5ba16be660d5383f1e56bd76b664b1d05 09-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
16dc9c38d82f0563845137acc1c90cdb9b806733 09-Nov-2009 Dan Bornstein <danfuzz@android.com> Fix the host rule for building executables on darwin-x86.

Change-Id: I573364cd0c95ce0157e21d3bb4f7e3b13c61dd70
ombo/darwin-x86.mk
04f7cc171f75c443fffc7c8549ea9d3d1668460d 09-Nov-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
2edfb71d01bff3632598e66eae7a32d656af8447 07-Nov-2009 David 'Digit' Turner <digit@google.com> Support secondary CPU ABI in build.prop

BoardConfig.mk typically defines TARGET_CPU_ABI to the name of the
native machine code CPU ABI supported by the target device. For example,
existing devices today use the value 'armeabi' corresponding to an
ARMv5TE instruction set with soft-float implementation.

This patch allows this file to also define TARGET_CPU_ABI2 to name
a secondary (minor) CPU ABI also supported by the device. This is useful
when the main ABI is ARMv7-A (identified as 'armeabi-v7a') which also
supports ARMv5TE. Such devices should have TARGET_CPU_ABI defined to
'armeabi-v7a' and TARGET_CPU_ABI2 defined to 'armeabi'.

TARGET_CPU_ABI2 will be translated into the ro.product.cpu.abi2 property
in build.prop. This value will be used by the PackageManager to handle
"fat-binaries" generated with the NDK.
akefile
onfig.mk
c4386e4112d317c14b975ee6706a1a0d3455af37 06-Nov-2009 Mike Reed <reed@google.com> am ebed06a2: am 65a731b7: Merge change I8dd26ee4 into eclair-mr2

Merge commit 'ebed06a259eb1c00112a4e3a9d6d721700bbaedb'

* commit 'ebed06a259eb1c00112a4e3a9d6d721700bbaedb':
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
ebed06a259eb1c00112a4e3a9d6d721700bbaedb 06-Nov-2009 Mike Reed <reed@google.com> am 65a731b7: Merge change I8dd26ee4 into eclair-mr2

Merge commit '65a731b737bd6e8afa0b18176064dcc130dbb4ce' into eclair-mr2-plus-aosp

* commit '65a731b737bd6e8afa0b18176064dcc130dbb4ce':
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
65a731b737bd6e8afa0b18176064dcc130dbb4ce 06-Nov-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I8dd26ee4 into eclair-mr2

* changes:
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
ceb18f8923ca85203094b2b0702f5d81c0622c46 05-Nov-2009 akushner <akushner@gmail.com> Added prune options to findleaves.sh to ignore the .git and .repo
directories since the Android.mk files will not be found in these
directories.

Prunning out these directories decreased the make parse by nearly
a minute on a cold cache and eliminated 60,000+ stats on files in
the .git and .repo directories.
ain.mk
78562c4174e3b0344b88f293b4d091d1340bf650 05-Nov-2009 Fred Quintana <fredq@google.com> am 6f007cf9: am aa82f8ee: am 357f5bc8: Merge change I7397e6fe into eclair

Merge commit '6f007cf96c21b1dfce6e258eee5c2963aa86bcf1'

* commit '6f007cf96c21b1dfce6e258eee5c2963aa86bcf1':
add the new accounts and sync package to the generic target and enable sync for all builds
6f007cf96c21b1dfce6e258eee5c2963aa86bcf1 05-Nov-2009 Fred Quintana <fredq@google.com> am aa82f8ee: am 357f5bc8: Merge change I7397e6fe into eclair

Merge commit 'aa82f8ee8f747e4466f3f6754201765a2b5b3707' into eclair-mr2-plus-aosp

* commit 'aa82f8ee8f747e4466f3f6754201765a2b5b3707':
add the new accounts and sync package to the generic target and enable sync for all builds
aa82f8ee8f747e4466f3f6754201765a2b5b3707 05-Nov-2009 Fred Quintana <fredq@google.com> am 357f5bc8: Merge change I7397e6fe into eclair

Merge commit '357f5bc804fc80f06776e1da141e4b322d7e3248' into eclair-mr2

* commit '357f5bc804fc80f06776e1da141e4b322d7e3248':
add the new accounts and sync package to the generic target and enable sync for all builds
5b5ec09e2e39a24b0f7f8d849cd963826b7ff387 05-Nov-2009 Fred Quintana <fredq@google.com> am 357f5bc8: Merge change I7397e6fe into eclair

Merge commit '357f5bc804fc80f06776e1da141e4b322d7e3248' into eclair-plus-aosp

* commit '357f5bc804fc80f06776e1da141e4b322d7e3248':
add the new accounts and sync package to the generic target and enable sync for all builds
617c402c711e4c06bd07e72897bbd450d47b3193 04-Nov-2009 Android Code Review <code-review@android.com> Merge change I377f1f02

* changes:
Update prelink map for libFLAC
170e1d59f6cf8176c30a5672267fb8be6d1076c6 04-Nov-2009 Fred Quintana <fredq@google.com> add the new accounts and sync package to the generic target and enable sync for all builds
ain.mk
8dd26ee452b7cd36adb1c75d90d7f36159568bcc 30-Oct-2009 Mike Reed <reed@google.com> remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)

i.e. if NDEBUG is defined, then SK_RELEASE will get defined in the skia config headers
ombo/linux-arm.mk
96fb8fef18c1f698fd9cc79e34103a78a50655bc 29-Oct-2009 android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> resolved conflicts for merge of 01e7a68f to master
01e7a68fd0a143c2f12d29b4085b2f72347c49e7 29-Oct-2009 android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> am 8a5d5272: resolved conflicts for merge of 3fa11599 to eclair-mr2

Merge commit '8a5d527223414c3c23b8021eb8ed468d3299e968' into eclair-mr2-plus-aosp

* commit '8a5d527223414c3c23b8021eb8ed468d3299e968':
Bump version to 2.1 API 6.
8a5d527223414c3c23b8021eb8ed468d3299e968 29-Oct-2009 android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> resolved conflicts for merge of 3fa11599 to eclair-mr2
b8906579abeeac2ed44058b1680e70e58ce33523 27-Oct-2009 Dianne Hackborn <hackbod@google.com> am 3fa11599: Bump version to 2.1 API 6.

Merge commit '3fa115999c8512095301724f557821f25ddfe08f' into eclair-plus-aosp

* commit '3fa115999c8512095301724f557821f25ddfe08f':
Bump version to 2.1 API 6.
3fa115999c8512095301724f557821f25ddfe08f 23-Oct-2009 Dianne Hackborn <hackbod@google.com> Bump version to 2.1 API 6.

Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
ersion_defaults.mk
6581feda8535b45a574cc1a5bece3f0bd0f6a3f2 22-Oct-2009 Dan Bornstein <danfuzz@android.com> Only put .o files into static libraries when building for the host.

In particular don't put the symbol indices from included .a files into
them. I didn't change the equivalent device rule ala the "if it ain't
broke" rule of thumb.

Change-Id: I064ac356a6f48f93fca2cd08a8408ca835f8f9a4
efinitions.mk
ecfec9da142fad814a447da748756669422ba886 22-Oct-2009 Owen Lin <owenlin@google.com> am 053ff0e6: am 355670b9: am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.

Merge commit '053ff0e674087e6320fbb961f384b9fe6d2c6949'

* commit '053ff0e674087e6320fbb961f384b9fe6d2c6949':
Add OVERRIDE_PACKAGES support for prebuild modules.
bccc5b549b8cfa272d5e01a5e680d48ea66978ca 22-Oct-2009 Brandon Ballinger <brandonb@google.com> am 21e91f35: am c6c46243: am 36f349ac: Merge change Ied29246e into eclair

Merge commit '21e91f357a45069eaa55542dc9f46d1293d1c21c'

* commit '21e91f357a45069eaa55542dc9f46d1293d1c21c':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
053ff0e674087e6320fbb961f384b9fe6d2c6949 22-Oct-2009 Owen Lin <owenlin@google.com> am 355670b9: am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.

Merge commit '355670b98584210502f96fe0446a854f07026c28' into eclair-mr2-plus-aosp

* commit '355670b98584210502f96fe0446a854f07026c28':
Add OVERRIDE_PACKAGES support for prebuild modules.
21e91f357a45069eaa55542dc9f46d1293d1c21c 22-Oct-2009 Brandon Ballinger <brandonb@google.com> am c6c46243: am 36f349ac: Merge change Ied29246e into eclair

Merge commit 'c6c462434c17dfbbe3128b2a2804f5d2417ebadb' into eclair-mr2-plus-aosp

* commit 'c6c462434c17dfbbe3128b2a2804f5d2417ebadb':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
355670b98584210502f96fe0446a854f07026c28 22-Oct-2009 Owen Lin <owenlin@google.com> am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.

Merge commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-mr2

* commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924':
Add OVERRIDE_PACKAGES support for prebuild modules.
c6c462434c17dfbbe3128b2a2804f5d2417ebadb 22-Oct-2009 Brandon Ballinger <brandonb@google.com> am 36f349ac: Merge change Ied29246e into eclair

Merge commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-mr2

* commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
3d02eacbdef0c1a0c0725d10628bec13f4139be9 21-Oct-2009 Dan Bornstein <danfuzz@android.com> It's not safe to use the TARGET ar when building a HOST .a (natch).

Change-Id: If9e851fe3306993fb49210952d81ab36cb78c807
efinitions.mk
90a540b321bd574706a74e9379e49ac21056c776 21-Oct-2009 Owen Lin <owenlin@google.com> am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.

Merge commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-plus-aosp

* commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924':
Add OVERRIDE_PACKAGES support for prebuild modules.
64d5a8070630e816e62fc2d3fdcbe820f50ec924 16-Oct-2009 Owen Lin <owenlin@google.com> Add OVERRIDE_PACKAGES support for prebuild modules.

So that some prebuild module can override existing packages.

Change-Id: I4f0d019e07b84d24cf0234903bd4b06104e0ed27
rebuilt.mk
603b894c92cd7ed44a99700dc5ff1ddc94b61794 21-Oct-2009 Brandon Ballinger <brandonb@google.com> am 36f349ac: Merge change Ied29246e into eclair

Merge commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-plus-aosp

* commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5':
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
36f349acc9c976cf3966ebde5df6410a09a3d7a5 21-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change Ied29246e into eclair

* changes:
Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
ed29246e31016d4fefdb360cdc9caa44913086e8 21-Oct-2009 Brandon Ballinger <brandonb@google.com> Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
rebuilt.mk
5752ee5a9965faec52984a0a89ede1a3decd201f 20-Oct-2009 Doug Zongker <dougz@android.com> am decdbd79: Merge change I5e98e6f0 into eclair

Merge commit 'decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-plus-aosp

* commit 'decdbd7956c34895f73001cfa2018a27c8702ad0':
use aapt to build jar files instead of the system zip (DO NOT MERGE)
5e98e6f05cce5f0d1e647c56423d51287d50bc3c 20-Oct-2009 Doug Zongker <dougz@android.com> use aapt to build jar files instead of the system zip (DO NOT MERGE)

By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.

(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
efinitions.mk
6bffc91c5d85ee828b37fa56efb7d87a76214747 15-Oct-2009 Dan Bornstein <danfuzz@android.com> Make the host static library build rule know about
LOCAL_WHOLE_STATIC_LIBRARIES.

While I was in the territory, I reordered a few lines to be more
consistent with nearby code/files.

Change-Id: Ie9809f065e32ca748ae4539dd785980ff496c2d2
efinitions.mk
ost_static_library.mk
3ca0693894ce58c8616bfc8b54e0efe6d84fb3a8 15-Oct-2009 Jean-Baptiste Queru <jbq@google.com> am e93ece70: merge from open-source master

Merge commit 'e93ece70a8d9657d5d08c59db75582d0d057d3bb'

* commit 'e93ece70a8d9657d5d08c59db75582d0d057d3bb':
Remove temporary vold logic
added linux-sh.mk to support SuperH architecture
e93ece70a8d9657d5d08c59db75582d0d057d3bb 15-Oct-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
2a118364824f3bcc1cca81124246ba7a1177a603 14-Oct-2009 Jean-Baptiste Queru <jbq@google.com> merge from open-source master
690804c399f3b68845a566f2e1257e2957621658 14-Oct-2009 Doug Zongker <dougz@android.com> am 6ebf4436: Merge change I04432db5 into eclair-mr2

Merge commit '6ebf443631025b132f644bd349258192db4e3e9c'

* commit '6ebf443631025b132f644bd349258192db4e3e9c':
use aapt to build jar files instead of the system zip
b54523bc00916ac9f209ad483d13c91ef275b384 14-Oct-2009 Raphael <raphael@google.com> am feec1ce3: am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt

Merge commit 'feec1ce3e01c93f43f425747df8073e9580d775a'

* commit 'feec1ce3e01c93f43f425747df8073e9580d775a':
Windows SDK: support tools/sdklauncher and tools/layoutopt
fa477ba15eeb11ec9c37cf0af24b46566ab866ac 14-Oct-2009 Dan Bornstein <danfuzz@android.com> Allow WITH_JIT to be overridden in a custom buildspec.mk file.

Change-Id: I0fb7ffcfb9786f611e981d8f22f67a5ac8c9c405
ombo/linux-arm.mk
6ebf443631025b132f644bd349258192db4e3e9c 13-Oct-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change I04432db5 into eclair-mr2

* changes:
use aapt to build jar files instead of the system zip
feec1ce3e01c93f43f425747df8073e9580d775a 13-Oct-2009 Raphael <raphael@google.com> am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt

Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2

* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
Windows SDK: support tools/sdklauncher and tools/layoutopt
3d967b873a5f116e14a323c4f059bda3829456ac 13-Oct-2009 Dianne Hackborn <hackbod@google.com> am 3f7405e9: am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.

Merge commit '3f7405e9940db18fade6fb86899bb8b88bd67bcf'

* commit '3f7405e9940db18fade6fb86899bb8b88bd67bcf':
Finish issue #2168428: STOP SHIP: Bump API version to 5.
aa569862dee45bfa72d342e9982cb5205df9bf04 13-Oct-2009 Raphael <raphael@google.com> Windows SDK: support tools/sdklauncher and tools/layoutopt

Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
ain.mk
ca02204ddbcef9dfcf4d2167a0ab2828f047f584 12-Oct-2009 Sriram Raman <sriramkraman@google.com> am 2bd9027d: Merge change I5bbd2294 into eclair-mr2

Merge commit '2bd9027d0a2055e56a8047c11dda7f6551b9f183'

* commit '2bd9027d0a2055e56a8047c11dda7f6551b9f183':
For Ying Wang:
a5ed6af74d8186f9404c68b307731e8a7602d74d 12-Oct-2009 Joe Onorato <joeo@android.com> am cb9102e0: am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.

Merge commit 'cb9102e056e8553745c2abd942852232bfadd98b'

* commit 'cb9102e056e8553745c2abd942852232bfadd98b':
eng builds only -- make the thing that makes setupwizard optional actually work.
c2289d10cc11df0b159559cd4e8be46bdc5b0149 12-Oct-2009 Dianne Hackborn <hackbod@google.com> am de7e9e6e: am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5

Merge commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638'

* commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638':
Part of issue #2168428: STOP SHIP: Bump API version to 5
392bda6e092faec2ebbc25f7361d3fb9fefcb473 12-Oct-2009 Brett Chabot <brettchabot@android.com> am 66e0c458: Merge change I7bc67c51 into eclair-mr2

Merge commit '66e0c458ae94b8520d8d54c15ecf6a283380b69d'

* commit '66e0c458ae94b8520d8d54c15ecf6a283380b69d':
Manual merge of donut-gms cts.mk changes.
9e4374be2c4b09f58ec4a9a3947224e98aaaf656 09-Oct-2009 Doug Zongker <dougz@android.com> use aapt to build jar files instead of the system zip

By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
efinitions.mk
3f7405e9940db18fade6fb86899bb8b88bd67bcf 09-Oct-2009 Dianne Hackborn <hackbod@google.com> am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.

Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-mr2

* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
Finish issue #2168428: STOP SHIP: Bump API version to 5.
ff6f3fe4482bcad900bce2e78204ad5cb466bbf9 09-Oct-2009 Dianne Hackborn <hackbod@google.com> Finish issue #2168428: STOP SHIP: Bump API version to 5.

We are now 2.0. Note that CorpCal and PhoneConfig are now gone
until their prebuilts are updated.

Change-Id: I26d13d6b75f5633113d82b8d90788d8bbc915014
ersion_defaults.mk
1b3886b8485589438a86ccb5b9dbb9067da35627 08-Oct-2009 Brett Chabot <brettchabot@android.com> am 45dc54f6: Add speech tests to CTS makefile.

Merge commit '45dc54f680faea12519870db356f84924c00687d' into eclair

* commit '45dc54f680faea12519870db356f84924c00687d':
Add speech tests to CTS makefile.
af6ccb69fe171614d9dd3e1a5f0c6a1d19cb14d4 08-Oct-2009 Brett Chabot <brettchabot@android.com> am 30e1f2bd: Add dpi tests to CTS.

Merge commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair

* commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408':
Add dpi tests to CTS.
45dc54f680faea12519870db356f84924c00687d 17-Sep-2009 Brett Chabot <brettchabot@android.com> Add speech tests to CTS makefile.
asks/cts.mk
30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408 10-Sep-2009 Brett Chabot <brettchabot@android.com> Add dpi tests to CTS.
asks/cts.mk
5bbd2294e9ba74462b940e9ef2f879c0ce4ef8a7 08-Oct-2009 Sriram Raman <sriramkraman@google.com> For Ying Wang:

Fix "argument list too long" build error bug.
ombo/darwin-x86.mk
ombo/select.mk
efinitions.mk
cb9102e056e8553745c2abd942852232bfadd98b 07-Oct-2009 Joe Onorato <joeo@android.com> am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.

Merge commit '0889661cd890e49a4827da0dc5d583274347d178' into eclair-mr2

* commit '0889661cd890e49a4827da0dc5d583274347d178':
eng builds only -- make the thing that makes setupwizard optional actually work.
0889661cd890e49a4827da0dc5d583274347d178 07-Oct-2009 Joe Onorato <joeo@android.com> eng builds only -- make the thing that makes setupwizard optional actually work.
ain.mk
de7e9e6e8fc4044dbc48f1687af92e7aae1d6638 07-Oct-2009 Dianne Hackborn <hackbod@google.com> am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5

Merge commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-mr2

* commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b':
Part of issue #2168428: STOP SHIP: Bump API version to 5
0187d84264fb6cf67650354c8c5da0a0712dbb0b 07-Oct-2009 Dianne Hackborn <hackbod@google.com> Part of issue #2168428: STOP SHIP: Bump API version to 5

This bumps the API version. We are still going to be an Eclair
development version until prebuilts are updated.

Change-Id: Ie76f3cda15b6c2c0b924db614e8024c04ce5a035
ersion_defaults.mk
03b09fd33fef282dfe684ca6ae167c41282ae08b 03-Oct-2009 Jean-Baptiste Queru <jbq@google.com> Remove temporary vold logic
ain.mk
7bc67c5114ec9aebe30bc3cdee6c2d63172cee42 02-Oct-2009 Brett Chabot <brettchabot@android.com> Manual merge of donut-gms cts.mk changes.
asks/cts.mk
16d088ec1e02d85f318b4657db91fe0145db67d3 02-Oct-2009 android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> set BUILD_ID, do not merge
uild_id.mk
5eec9dd20f0b8fbadd347e86a3233162304a23a7 01-Oct-2009 Doug Zongker <dougz@android.com> am da2d06bb: am c18736b1: remember device-specific releasetools extensions in target-files

Merge commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412'

* commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412':
remember device-specific releasetools extensions in target-files
c18736b1a777c386dc3c5e3f878249770b5edd78 30-Sep-2009 Doug Zongker <dougz@android.com> remember device-specific releasetools extensions in target-files

Store the location of the releasetools extensions in the target-files
zip, and make ota_from_target_files use that stored location by
default (though it can still be overridden with -s if desired).
akefile
dea0b8c5eaa416dfd296dc38e8b719aec64091b5 25-Sep-2009 Joe Onorato <joeo@android.com> am 4ff55ba0: am e62902c9: Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references

Merge commit '4ff55ba0c7749abb0039fa49024be5f1b0e62de2'

* commit '4ff55ba0c7749abb0039fa49024be5f1b0e62de2':
Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
0a71aacfff325674b0e19493f3af7d34895f0d29 25-Sep-2009 Dave Bort <dbort@android.com> am 9db1fc2b: am b392641d: Make fail if it\'s called after including

Merge commit '9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2'

* commit '9db1fc2bea0b75b59ad52f94faa1e7d66209d2d2':
Make $(my-dir) fail if it's called after including $(CLEAR_VARS)
8392b83176f4090c9d7b9b4c90505bac1d280c79 25-Sep-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 25632 into eclair

* changes:
Set default build ID to eclair (usually this is overridden). Please do not merge.
e62902c95b3b6f876ffafa5595396b25e7bd2395 24-Sep-2009 Joe Onorato <joeo@android.com> Fix http://b/2114936 - Setting LOCAL_SDK_VERSION current still allows internal API references
ase_rules.mk
b392641d9b07d6321aed828c983af04115da8aab 20-May-2009 Dave Bort <dbort@android.com> Make $(my-dir) fail if it's called after including $(CLEAR_VARS)
efinitions.mk
2dcc806af56351dca462225be7ecfad7da5aa8f1 22-Sep-2009 Jing Yu <jingyu@google.com> Add FDO options to Android make system.
inary.mk
lear_vars.mk
ombo/darwin-x86.mk
ombo/linux-arm.mk
ynamic_binary.mk
928aec7cb39d86d0730c3c2e74cc826f3a9503a1 18-Sep-2009 Ed Heyl <edheyl@google.com> Set default build ID to eclair (usually this is overridden). Please do not merge.
uild_id.mk
9a6b73c0aa13a7d652c3f3668c64cb98b258045e 17-Sep-2009 Android Code Review <code-review@android.com> Merge change 10642

* changes:
added linux-sh.mk to support SuperH architecture
aa7e606fc31ab93d2bc42843427c1028073170b0 17-Sep-2009 Doug Zongker <dougz@android.com> am fe0602f6: increase reserved blocks from 5 to 8

Merge commit 'fe0602f60b971c3b350d47115cba188cc67c7038'

* commit 'fe0602f60b971c3b350d47115cba188cc67c7038':
increase reserved blocks from 5 to 8
fe0602f60b971c3b350d47115cba188cc67c7038 15-Sep-2009 Doug Zongker <dougz@android.com> increase reserved blocks from 5 to 8

Our yaffs filesystems reserve 5 blocks, use 1 for a checkpoint, and
may use 1 or 2 more for caching. Take these all into account when
computing the max image size.
efinitions.mk
93d9ff44ce700c770fd78b9e15467be2af587559 15-Sep-2009 Doug Zongker <dougz@android.com> increase reserved blocks from 5 to 8

Our yaffs filesystems reserve 5 blocks, use 1 for a checkpoint, and
may use 1 or 2 more for caching. Take these all into account when
computing the max image size.
efinitions.mk
cae7d6735ee53aaecc4f7ea57cf56cf16c6a7ced 10-Sep-2009 Andy McFadden <fadden@android.com> am 42fe578d: am 2c86bfd2: Sleazy workaround for webkit build failures.

Merge commit '42fe578dae8d8068bef81f2e8cef4d2c38dddfbf'

* commit '42fe578dae8d8068bef81f2e8cef4d2c38dddfbf':
Sleazy workaround for webkit build failures.
2c86bfd285d8b3765da0144da31d1a3d216cb95c 10-Sep-2009 Andy McFadden <fadden@android.com> Sleazy workaround for webkit build failures.

The WebKit library link line is exceeding 128KB on sim-eng builds.
The path to sim-eng object files is slightly longer than device builds
because the object files live under the "host" directory.

This change truncates the "product" directory name to "pr", reducing the
command line by a few KB. This only affects sim-eng builds.

The real fix will need be to webkit (see internal bug 1917987), which
will eventually start failing on device builds if it continues to grow.
nvsetup.mk
db95cb44265eedbee03f711f876ec8fd465dd8b1 09-Sep-2009 Ben Cheng <bccheng@google.com> Enable Dalvik JIT by default for the master branch.
ombo/linux-arm.mk
dc785843c7f1f4dcbcf603c8ae8e9599ea2d15b1 03-Sep-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
db7ab295c4d6e9b03ea3149ad015699f63221087 30-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 23258 into eclair

* changes:
Add the ability to turn on proguard for java targets, and to call aapt to generate a rules file for proguard for stuff from the manifest and other resources that need to be kept.
2daa2b3b059ac755e8280741b23d65360ae233bc 30-Aug-2009 Joe Onorato <joeo@android.com> Add the ability to turn on proguard for java targets, and to call aapt
to generate a rules file for proguard for stuff from the manifest and
other resources that need to be kept.
lear_vars.mk
onfig.mk
efinitions.mk
ava.mk
ackage.mk
roguard.flags
0425394081908f9f7c357c927c9d446d778b79e3 30-Aug-2009 Brett Chabot <brettchabot@google.com> am 3c7c8a60: Merge change 22522 into donut

Merge commit '3c7c8a60860f97ac4c7381bd6ed30a43864372da' into eclair

* commit '3c7c8a60860f97ac4c7381bd6ed30a43864372da':
Add Gesture tests to CTS.
3c7c8a60860f97ac4c7381bd6ed30a43864372da 30-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 22522 into donut

* changes:
Add Gesture tests to CTS.
c6646c9ac41122ecc022102efdcceb890a0ca529 28-Aug-2009 Daniel Sandler <dsandler@google.com> Introduce a default density ('mdpi') for all device builds.

This is done by appending "mdpi" (medium density or 160 dpi, which is what
we've been using so far on dream etc.) to PRODUCT_LOCALES if no other dpi is
found there. (PRODUCT_LOCALES is then sent as a configuration parameter to
aapt to determine which resources should be included in the build.)

With this change, each build will now include only one density of any given
asset. For example, if there exists

drawable-hdpi/foo.png
drawable-mdpi/foo.png

...then the build will include *only* drawable-mdpi/foo.png, unless the
density is overridden in the build's own device spec:

PRODUCT_LOCALES += hdpi

...in which case the build will include only drawable-hdpi/foo.png.
roduct_config.mk
3938ab2572e7c9d5894975c0076b271b2846faa9 27-Aug-2009 Doug Zongker <dougz@android.com> am 1b6d0a65: allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned

Merge commit '1b6d0a65fc62901f2c18d00c556bd5da50f35584' into eclair

* commit '1b6d0a65fc62901f2c18d00c556bd5da50f35584':
allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned
1b6d0a65fc62901f2c18d00c556bd5da50f35584 27-Aug-2009 Doug Zongker <dougz@android.com> allow prebuilts to specify LOCAL_CERTIFICATE so they can be resigned

If a prebuilt specifies a LOCAL_CERTIFICATE, stick it in the
PACKAGES.* collection so that the predexopt process can work on the
file (which only works if the new .apk can be signed).
rebuilt.mk
fbc039e9b9cda43fd4dc8bd63887dcb8feaa22b8 26-Aug-2009 Doug Zongker <dougz@android.com> am 4ac1ba61: fix typo in bash expression

Merge commit '4ac1ba61075190fa9ced594c85285beff6293184' into eclair

* commit '4ac1ba61075190fa9ced594c85285beff6293184':
fix typo in bash expression
ed96e88850b471d4ebbbdd1c2acd3efdc6b19a10 26-Aug-2009 Doug Zongker <dougz@android.com> resolved conflicts for merge of 6dd2ae02 to eclair
4ac1ba61075190fa9ced594c85285beff6293184 26-Aug-2009 Doug Zongker <dougz@android.com> fix typo in bash expression

Fortunately the error doesn't change the value of the expression
(since undefined variables are treated as 0 inside "$((...))").
efinitions.mk
6dd2ae02c1a117f7494d8b880fdc6c35572adaa8 26-Aug-2009 Doug Zongker <dougz@android.com> turn down allowed image size

yaffs appears to reserve 5 blocks on the partition for itself.
Account for this when computing the maximum allowable image size.
akefile
efinitions.mk
759901fa6d6e9dae3f220aa29ace6b490eb967ea 25-Aug-2009 Brett Chabot <brettchabot@google.com> Add Gesture tests to CTS.
asks/cts.mk
d0088f0e285eefc975505ac846ace2f695d31e7a 25-Aug-2009 Phil Dubach <phillipd@google.com> am 793817ba: CTS: Add missing make dependencies for application security tests

Merge commit '793817baa1455c410311d79ef6f44cac1c26be9f' into eclair

* commit '793817baa1455c410311d79ef6f44cac1c26be9f':
CTS: Add missing make dependencies for application security tests
793817baa1455c410311d79ef6f44cac1c26be9f 24-Aug-2009 Phil Dubach <phillipd@google.com> CTS: Add missing make dependencies for application security tests

Change-Id: I4d069b18b0da5f49ca9bb377d04732b8222ac137
asks/cts.mk
c4d5369c2295c65ce6ec335fea02feb735534a4d 24-Aug-2009 Phil Dubach <phillipd@google.com> am 3b7521b5: CTS: Add application security tests to makefile

Merge commit '3b7521b524de694cb9da277fd1d7493fc41aa0f3' into eclair

* commit '3b7521b524de694cb9da277fd1d7493fc41aa0f3':
CTS: Add application security tests to makefile
3b7521b524de694cb9da277fd1d7493fc41aa0f3 20-Aug-2009 Phil Dubach <phillipd@google.com> CTS: Add application security tests to makefile

Change-Id: I51291d338cca88fed68247efbecbaf747306c6b7
asks/cts.mk
23f70ffd9d67de4fbf856f9cb71b5315a39033ba 27-Jul-2009 Kenny Root <kenny@the-b.org> Update prelink map for libFLAC
relink-linux-arm.map
40ea53098cc0829abee3cfa7abfafc735f27e93b 24-Aug-2009 Scott Su <scott.su@myriadgroup.com> Remove frameworks/base/im from build path
athmap.mk
dd6c1e11c5ce3177320ab689b6d531bdaf141892 22-Aug-2009 Phil Dubach <phillipd@google.com> am 7c463e4b: Merge change 21778 into donut

Merge commit '7c463e4b0565f752bc06feb98962ab1536937aa1' into eclair

* commit '7c463e4b0565f752bc06feb98962ab1536937aa1':
CTS: Enable Python description/plan generator
5e3ab04d97d561d0d7d4a81e4743ce638fca45b2 14-Aug-2009 Phil Dubach <phillipd@google.com> CTS: Enable Python description/plan generator

This enables the new description/plan generator added in change
21366.
asks/cts.mk
a3f7c20f907dca3e8de5664bf8c3e7dec4f0db05 19-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21912 into eclair

* changes:
Bump platform version to 4.
28fcfdd7dd8752bc9accf800306d82a3a8d138da 19-Aug-2009 Raphael <raphael@google.com> Fix broken server Windows SDK build.

I removed these lines because for some reason building under Windows
fails for me when they are present. However the build server breaks
so I'll rolling them back and I'll try to understand that later.
ain.mk
f6ff4c5acf428d4b0cba828b836f1e11fa1442b4 18-Aug-2009 Raphael <raphael@google.com> Windows: Fix platform build.
efinitions.mk
ain.mk
e34fdc0113477e2022bda8834b37338c57884f48 19-Aug-2009 Dianne Hackborn <hackbod@google.com> Bump platform version to 4.

Not sure why this didn't get integrated from Donut.
ersion_defaults.mk
9af298ec82fb93d0259e2080ce022204fe49e640 13-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21127

* changes:
Remove 'ctor-dtor-privacy' warning, as it's not very usefull.
7f0a18f771111f67f69f95d070a5326a301715d3 13-Aug-2009 Marco Nelissen <marcone@google.com> Remove 'ctor-dtor-privacy' warning, as it's not very usefull.
onfig.mk
fab87998b50c997ba4e506a080d01f606615eb19 13-Aug-2009 Sriram Raman <sriramkraman@google.com> Fix the platform version (1.6 now) and sdk version (4)
ersion_defaults.mk
5b5f82b635697159aeca23ceb0ec9d692c5a04f0 13-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 21000 into donut

* changes:
Update the platform-version-codename
20572dd35245ceaf13a10dd8f31b916351bc8adb 13-Aug-2009 Sriram Raman <sriramkraman@google.com> Update the platform-version-codename
ersion_defaults.mk
a37bdef67a81eeb048d4631af2893a2dd3ca5f50 12-Aug-2009 Dianne Hackborn <hackbod@google.com> am 6929fb57: Merge change 20880 into donut

Merge commit '6929fb57a5afb90606feb8c35c8c2cda170adfe4'

* commit '6929fb57a5afb90606feb8c35c8c2cda170adfe4':
Fix issue #2048267: Run zipalign on all prebuilts
cac4dccb0a12e4be95acbd0d3f091c86c35895ca 12-Aug-2009 Raphael <raphael@google.com> am 31a8ac22: BUG 1993354 : Add zipalign to Windows SDK

Merge commit '31a8ac22585b2a8263892487bd38b64783402e06'

* commit '31a8ac22585b2a8263892487bd38b64783402e06':
BUG 1993354 : Add zipalign to Windows SDK
6929fb57a5afb90606feb8c35c8c2cda170adfe4 12-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20880 into donut

* changes:
Fix issue #2048267: Run zipalign on all prebuilts
9c0c4b7a588b3afe80dc16c133921fee991f53d3 12-Aug-2009 Dianne Hackborn <hackbod@google.com> Fix issue #2048267: Run zipalign on all prebuilts
efinitions.mk
rebuilt.mk
378a5884da9115d679b8d4c310c3b09fc732f74c 12-Aug-2009 Phil Dubach <phillipd@google.com> am c539dbe6: CTS: Add missing integration of 147397 to fix VM tests

Merge commit 'c539dbe6a2810818ac22f180e64bdc0256557532'

* commit 'c539dbe6a2810818ac22f180e64bdc0256557532':
CTS: Add missing integration of 147397 to fix VM tests
31a8ac22585b2a8263892487bd38b64783402e06 12-Aug-2009 Raphael <raphael@google.com> BUG 1993354 : Add zipalign to Windows SDK
ain.mk
c539dbe6a2810818ac22f180e64bdc0256557532 07-Aug-2009 Phil Dubach <phillipd@google.com> CTS: Add missing integration of 147397 to fix VM tests

For host side test packages, the name of the jar file containing the tests is
declared in the packages Android.mk. The name of the make file needs to be
passed to the description generator so that it can pick up this information.
The makefile was not passing on the parameter containing the make file name.
asks/cts.mk
8510a1e0d7d45179e5fa19bebf26d022ec4c4e91 08-Aug-2009 Doug Zongker <dougz@android.com> use *_PARTITION_SIZE instead of *_MAX_SIZE

Make BoardConfig.mk store the size of the partition rather than the
maximum size of the image that can be flashed there, because the
function used to do the conversion isn't available when BoardConfig.mk
is read any more.
akefile
efinitions.mk
3366c07e56cdb6ad7b1184388b5f25cf819de579 08-Aug-2009 Joe Onorato <joeo@android.com> Tweak the product graph formatting.
asks/product-graph.mk
630b7d3ffaac72873f5b91e7e215daa9c2818935 08-Aug-2009 Brian Swetland <swetland@google.com> build: do not attempt to build recovery.img for TINY_ANDROID builds

Signed-off-by: Brian Swetland <swetland@google.com>
akefile
edd731f430323fe733b94832af19042a5b93fb85 07-Aug-2009 Doug Zongker <dougz@android.com> am f7c8b9ad: reenable ranlib transform for prebuilts

Merge commit 'f7c8b9adb4b65fafac786e77f6dd7c3411344dba'

* commit 'f7c8b9adb4b65fafac786e77f6dd7c3411344dba':
reenable ranlib transform for prebuilts
f7c8b9adb4b65fafac786e77f6dd7c3411344dba 07-Aug-2009 Doug Zongker <dougz@android.com> reenable ranlib transform for prebuilts

An extra blank line detached the ranlib commands from the rules they
were supposed to be for.
rebuilt.mk
85416153ae789406fe648999c20abc1cabcb5d3a 07-Aug-2009 Doug Zongker <dougz@android.com> am d0a44722: add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk

Merge commit 'd0a44722be82319e45b6616267011d4dd17e767b'

* commit 'd0a44722be82319e45b6616267011d4dd17e767b':
add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk
d0a44722be82319e45b6616267011d4dd17e767b 07-Aug-2009 Doug Zongker <dougz@android.com> add LOCAL_PREBUILT_STRIP_COMMENTS to clear_vars.mk
lear_vars.mk
80f820ca1afafbdf747fc6762ea8dc1276e1354b 07-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> am 01bf5684: Merge change 20313 into donut

Merge commit '01bf5684b448623d7eb054b6d717bb77af05de33'

* commit '01bf5684b448623d7eb054b6d717bb77af05de33':
add feature to strip "# comment" lines from prebuilt files
e9024b3ee1daf5bf1efacf3fe60c056acd58b1b7 06-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 20172

* changes:
Add back a few libraries for backward-compability with the donut skia
1046d20624318563aba92cfdd7eb7d39ecc44703 06-Aug-2009 Doug Zongker <dougz@android.com> add feature to strip "# comment" lines from prebuilt files

Change things so that when $(LOCAL_PREBUILT_STRIP_COMMENTS) is
nonempty, we copy the source file using sed to strip out all the "#
line"-style comments and blank lines, saving considerable system image
space in the case of some wifi configurations.

Bug: 2036961
efinitions.mk
rebuilt.mk
dc1a728fb89677589bf3b5e3a5aab58164c9be6b 04-Aug-2009 Joe Onorato <joeo@android.com> Rewrite findleaves.sh in python

This cuts the make startup time by about 30 seconds. Python is faster
than bash in this case, and also we can now supply multiple directories
to prune, and skip the .repo directory, which is, uh, big.

This is from my mac laptop:

$ time build/tools/findleaves.sh --prune="./out" . Android.mk > /dev/null

real 0m29.186s
user 0m0.550s
sys 0m5.897s

$ time build/tools/findleaves.py --prune="./out" . Android.mk > /dev/null

real 0m4.701s
user 0m0.645s
sys 0m1.294s

$ time build/tools/findleaves.py --prune="./out" --prune="./.repo" . Android.mk > /dev/null
real 0m0.176s
user 0m0.094s
sys 0m0.080s
efinitions.mk
ain.mk
0082bbfb7de4564c0c10cd704fa12ad4833decef 06-Aug-2009 Jean-Baptiste Queru <jbq@google.com> Add back a few libraries for backward-compability with the donut skia
relink-linux-arm.map
fe77558c21b8a526f653c9cd9260b54c37a698c2 05-Aug-2009 Jean-Baptiste Queru <jbq@google.com> Add libacc.so to prelink map for forward-compatibility
relink-linux-arm.map
123f82cb0b02c36cab6031a60605819d9e83693a 03-Aug-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
1de66889ec97300eb92166e849c4f9251e0290c6 30-Jul-2009 Joe Onorato <joeo@android.com> Don't check build tools versions (including javac) every time make is run.

This trims off another 1/3 of a second from incremental build times.
VERSION_CHECK_SEQUENCE_NUMBER can be incremented to force a check.
ain.mk
ead9646f1f7ab91fd5738471acc706faeb99dc72 30-Jul-2009 Joe Onorato <joeo@android.com> Don't run findleaves.sh if we're doing ONE_SHOT_MAKEFILE.

This cuts the minimum mmm time from 17 seconds to 5 seconds on my mac pro.
ain.mk
e7faad965f24c0d51c60982fae4582922293663f 30-Jul-2009 Phil Dubach <phillipd@google.com> am 951f3d89: CTS: Add telephony and webkit test cases to CTS makefile

Merge commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3'

* commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3':
CTS: Add telephony and webkit test cases to CTS makefile
a86afb626f7fdd28683cdf6c452268f468087509 30-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am c16c0a41: Merge change 8942 into donut

Merge commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af'

* commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af':
Add CTS permission2 test package to cts.
7227ea76192636994a862d314a2bb487d78be095 29-Jul-2009 Jean-Baptiste Queru <jbq@google.com> merge from donut
951f3d89fb8c61264a20f9e44b7882e6f562e1d3 15-Jul-2009 Phil Dubach <phillipd@google.com> CTS: Add telephony and webkit test cases to CTS makefile
asks/cts.mk
7b5edc3e8ae96b4e696d74068e949982c9e9db3e 29-Jul-2009 Brett Chabot <brettchabot@google.com> Add CTS permission2 test package to cts.
asks/cts.mk
cffab816863c7532582242348d0091e77cc04616 29-Jul-2009 Joe Onorato <joeo@android.com> Make the product graph slightly more readable.
asks/product-graph.mk
7c07cf9a82f3ba211883a9ee4a1ce4cf8c286015 26-Jul-2009 Jean-Baptiste Queru <jbq@google.com> Merge korg/donut into korg/master

Conflicts:

core/apicheck_msg_current.txt
core/combo/linux-arm.mk
core/prelink-linux-arm.map
tools/droiddoc/src/ClassInfo.java
4387b348395bd3d2a42fc5ac424a11ced2eaa2c6 25-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 8494

* changes:
Fix issue 2001204: libaudiopolicy.so and libaudiopolicygeneric.so libraries must be pre-linked.
7b02ff0fdc3f362616982987bb9d4d65720599d4 25-Jul-2009 Sriram Raman <sriramkraman@google.com> am 1e96ac84: Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed. Don\'t have to re-specify exclusion list for the patch file construction.

Merge commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce'

* commit '1e96ac8430da922332e4c85e7eed0e95442ff2ce':
Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
1e96ac8430da922332e4c85e7eed0e95442ff2ce 24-Jul-2009 Sriram Raman <sriramkraman@google.com> Make the recovery.img construction (from boot.img) logic depend on whether recovery.img was installed.
Don't have to re-specify exclusion list for the patch file construction.
akefile
9c3b0d58c8ca64fc619b445ed30426798d92fe9c 24-Jul-2009 Android Git Automerger <android-git-automerger@android.com> Merge commit '66ae61670d3ea69dd1cf72cf529c29654c07405e'
c41bda63a31ca052d828b0e6ee2b9bbe77294319 24-Jul-2009 Android Git Automerger <android-git-automerger@android.com> Merge commit '3455a3d4a1b5f59ccbcc2ac7268d11b03861c229'
dabee36b796c5e0dc0667cada79d92b517b43656 24-Jul-2009 Android Git Automerger <android-git-automerger@android.com> Merge commit 'b003d89ee3a6d39a0ad3ca6e9c8a61f39ef3b92a'
cb69dabbddc6060ae6164cdf34f7e680470989c8 24-Jul-2009 Android Git Automerger <android-git-automerger@android.com> Merge commit '22bc517cdfb6b7ee5f90f61de425516c1d7b0245'
72e108a1d46219bb81f05ca66cbacfea607c1469 24-Jul-2009 Android Git Automerger <android-git-automerger@android.com> Merge commit '7a7cd0d8a3ee6d061d7b505583cb791eec6124f5'
358a48e12a5d557b2417baf245b63f0e62c879ec 24-Jul-2009 Android Git Automerger <android-git-automerger@android.com> merge 73ef8257ce54ce1ddc2d4cfc3b3814ca734c0e11 from donut (resolved conflicts)
66ae61670d3ea69dd1cf72cf529c29654c07405e 24-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 8517 into donut

* changes:
Fix generic-userdebug build (don't build OTA for this target).
b11428e53bc05165f372ff1786d39379ce6df679 24-Jul-2009 Sriram Raman <sriramkraman@google.com> Fix generic-userdebug build (don't build OTA for this target).
akefile
90c23aa130d76db2c9e1c9c7285f65d310cc4e83 24-Jul-2009 James Dong <jdong@google.com> DO NOT MERGE TO MASTER
remove opencore avc encoder DSO
bug 2001900
relink-linux-arm.map
4cb0ae10ec4a85d62f1750a4fd3b9f4403def0db 24-Jul-2009 Eric Laurent <elaurent@google.com> Fix issue 2001204: libaudiopolicy.so and libaudiopolicygeneric.so libraries must be pre-linked.
relink-linux-arm.map
ef9f4ea0b8e14aefdce5ba25f68393c78e5d0d4c 24-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 4d7c4348: Merge change 8295 into donut

Merge commit '4d7c4348077b0f1a713ebffe59b458a5d95fba11'

* commit '4d7c4348077b0f1a713ebffe59b458a5d95fba11':
applypatch changes for patching recovery image
3455a3d4a1b5f59ccbcc2ac7268d11b03861c229 24-Jul-2009 Doug Zongker <dougz@android.com> don't try to build recovery patch in generic build
akefile
b003d89ee3a6d39a0ad3ca6e9c8a61f39ef3b92a 24-Jul-2009 Doug Zongker <dougz@android.com> make path explicit when running imgdiff

The build servers don't run "lunch" before building, so they don't
have the same path as everyone else. Explicitly set it when running
imgdiff.
akefile
22bc517cdfb6b7ee5f90f61de425516c1d7b0245 24-Jul-2009 Doug Zongker <dougz@android.com> fix imgdiff/bsdiff dependencies

These should be regular dependencies, not order-only ones.
akefile
7a7cd0d8a3ee6d061d7b505583cb791eec6124f5 24-Jul-2009 Doug Zongker <dougz@android.com> fix system size calculation for SDK build

The SDK build doesn't have recovery, don't try to generate a patch or
include it in the system image size calculation. Also there's a
dependency on bsdiff that was omitted.
akefile
8c0a4655e78db02cf123e334e4ad2c83b53909a3 24-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 8404

* changes:
add librs and librs_jni to the prelink map.
511569b76e281b94d7682db3eb012ca15887bf15 24-Jul-2009 Jason Sams <rjsams@android.com> add librs and librs_jni to the prelink map.
relink-linux-arm.map
73ef8257ce54ce1ddc2d4cfc3b3814ca734c0e11 24-Jul-2009 Doug Zongker <dougz@android.com> use a binary patch to install recovery from system

Instead of storing the whole recovery image in system in order to
flash it on first boot, we instead use an imgdiff patch from the boot
image to create the recovery image. This is substantially smaller
since it effectively only stores the recovery binary and UI images
(the kernel and the init binary are identical to that of the boot
image).

This change modifies the OTA-building script to create and install
these patches, and changes the calculation of the system image size in
the Makefile to reflect the new scheme.
akefile
cfcbcf28566887625fad1024bb730f59c6df27ee 23-Jul-2009 Jesse Wilson <jessewilson@google.com> Merge commit '289d80ee' into manualmerge2

Conflicts:
tools/droiddoc/src/DroidDoc.java
tools/droiddoc/test/stubs/func.sh
6c770467fb4faad2c252c9c1b881ec0f253a3059 23-Jul-2009 Doug Zongker <dougz@android.com> applypatch changes for patching recovery image

Make some changes needed to applypatch in order to store the recovery
image in the system partition as a binary patch relative to the boot
image:

- make applypatch use shared libraries, so it's smaller. It will
need to be on the main system so it can install the recovery
image. Make an applypatch_static binary for use in recovery
packages (still needed for updating cupcake devices to donut).

- output the results of patching to an in-memory buffer and write
that to the partition; there's no convenient /tmp for us to us.
(This should be basically a no-op in recovery, since /tmp is a
ramdisk anyway.)
akefile
289d80eee416dca7585783a584cbfcf4061a662c 21-Jul-2009 Jesse Wilson <jessewilson@google.com> Adding version information to DroidDoc. Rather than pulling the version from
@since tags in the code, it's pulled from the API XML files also used by
apicheck.

The code now reads the apicheck XML, and applies it's versions to the DroidDoc
class models. The models output the version to HDF, and that's picked up by
the CS templates.

The clearsilver templates will be changed to be pretty in a follow up change.

Conflicts:
tools/droiddoc/src/DroidDoc.java
roiddoc.mk
b7c41aaad02e39e692362d0f2eed86c3e2008271 20-Jul-2009 Joe Onorato <joeo@android.com> Add a separate version of the docs build that only does the stubs.

That way we don't have to wait for clearsilver to write the thousands
of html files during every build.

(This is the build change, there is also a frameworks/base change)
ain.mk
dce85e32ecbc8802d78dc997eb378851aab5e6b8 20-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 6ef19dad: Merge change 7040 into donut

Merge commit '6ef19dadbf1f2e35551d2bf559b0d533f77b366d'

* commit '6ef19dadbf1f2e35551d2bf559b0d533f77b366d':
CTS: Add media test cases to CTS makefile
36cb84fcae92e583e08954bfc6fe16b94db23212 18-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7774

* changes:
enable cortex branch predition errata workaround for armv7-a builds
f2bce89880db7e88e68085d399392564b3d2dbf2 18-Jul-2009 Joe Onorato <joeo@android.com> am e334d255: Speed up the full build.

Merge commit 'e334d255dc8f85d610f4d0339227a0b985494811'

* commit 'e334d255dc8f85d610f4d0339227a0b985494811':
Speed up the full build.
c12c5183792280f00739eff8b07f58d147a3c2e4 18-Jul-2009 Erik Gilling <konkers@android.com> enable cortex branch predition errata workaround for armv7-a builds

Signed-off-by: Erik Gilling <konkers@android.com>
ombo/arch/arm/armv7-a.mk
ombo/linux-arm.mk
ombo/select.mk
6ef19dadbf1f2e35551d2bf559b0d533f77b366d 18-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7040 into donut

* changes:
CTS: Add media test cases to CTS makefile
e334d255dc8f85d610f4d0339227a0b985494811 17-Jul-2009 Joe Onorato <joeo@android.com> Speed up the full build.

Now, by default, instead of fully building everything,
we skip dexing the modules that aren't going to be included
in the current build.

This will slow down some of the incremental builds (like tests),
but it improves the regular eng build from 27.5 minutes on my
Mac Pro to 25 minutes. That's not as much of an improvement
as I had hoped for, but it's still better.

There is also a change in here that puts the java-source-list
file which is used to get around limited command line lengths
in the proper directory. Before this change, it was an
accident that the directory for that file existed!
ase_rules.mk
lear_vars.mk
efinitions.mk
ava.mk
ain.mk
04418dc32c00afb484d3c5b8c34fb1023996864f 17-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 7583

* changes:
Modify libqcamera to be called liboemcamera
a5b5ea9d6d1e042686d1fa8292c4c4710416a343 16-Jul-2009 Rebecca Schultz Zavin <rebecca@android.com> Modify libqcamera to be called liboemcamera

This will allow us to support non qualcomm cameras in the prelink map.

Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
relink-linux-arm.map
582dcbd7d12359456423f218e66ac5971339c544 16-Jul-2009 Mike Reed <reed@google.com> add HAVE_VFP flag
ombo/arch/arm/armv7-a.mk
571d0f299f1814adb6b3aa3c936235f64f914193 13-Jul-2009 Phil Dubach <phillipd@google.com> CTS: Add media test cases to CTS makefile
asks/cts.mk
1935a3a3f6ad71b4db884386ddecc0befcb77a49 14-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6928

* changes:
set -fpu=neon so we can use arm_neon.h
e4aaa368b3c58c72a771c23de81e46b729bc736c 14-Jul-2009 Marco Nelissen <marcone@google.com> Apparently the build server uses a different compiler, one that doesn't understand '-fdiagnostics-show-option'
onfig.mk
bac9a7f18eecc4de0a42c662ba134f4bdcad8cf3 14-Jul-2009 Marco Nelissen <marcone@google.com> Enable some more useful warnings, and treat some particularly bad ones (that we don't have currently) as errors.
onfig.mk
8ce877a3ab066da6795c344b03f33ce128a87d56 13-Jul-2009 Mike Reed <reed@google.com> set -fpu=neon so we can use arm_neon.h
ombo/arch/arm/armv7-a.mk
06f88f578976fc5fe75cede1b556185931406186 11-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6571

* changes:
Since we're using gcc 4.4 in master, we can use the -Werror= option to make not having a virtual destructor in classes with virtual methods an error. I already fixed all code that had this problem, so now it's a matter of turning the option on. Also, as long as we don't have any C-specific options, it's probably best to copy the CPP flags from the C flags. We can always break them out later.
a14deb7eaf2d524cabb4b40aaad7b935b142bdb3 10-Jul-2009 Mike Reed <reed@google.com> rename libsgl/libscorecg to libskia
relink-linux-arm.map
ff328a9409727ba3529fb69227f7ed7232287928 09-Jul-2009 Shin-ichiro KAWASAKI <shinichiro.kawasaki.mg@hitachi.com> added linux-sh.mk to support SuperH architecture
ombo/linux-sh.mk
73a075d8b2e91dd154123117105095ee3cf35e3a 09-Jul-2009 Marco Nelissen <marcone@google.com> Since we're using gcc 4.4 in master, we can use the -Werror= option
to make not having a virtual destructor in classes with virtual
methods an error. I already fixed all code that had this problem,
so now it's a matter of turning the option on.
Also, as long as we don't have any C-specific options, it's
probably best to copy the CPP flags from the C flags. We can
always break them out later.
onfig.mk
60175aadcd677b976a5627a4f0917b305b601b42 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6444

* changes:
Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."
c8e545b405fc474f6b69cce277c29aac30b4b7df 08-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am e41accf6: Merge change 6412 into donut

Merge commit 'e41accf68eedfd17bc569aee8480cf8c48d82e61'

* commit 'e41accf68eedfd17bc569aee8480cf8c48d82e61':
Pass compiler flags for C++ too, and add a flag that enables warnings about missing virtual destructors
b17199ee41f84a830b8eeee4066630e486e242ba 08-Jul-2009 Doug Zongker <dougz@android.com> am 742fa575: fix problems with new image size calculations

Merge commit '742fa575d09272f1e06616fc208a1e08830c8f82'

* commit '742fa575d09272f1e06616fc208a1e08830c8f82':
fix problems with new image size calculations
e41accf68eedfd17bc569aee8480cf8c48d82e61 08-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 6412 into donut

* changes:
Pass compiler flags for C++ too, and add a flag that enables warnings about missing virtual destructors
742fa575d09272f1e06616fc208a1e08830c8f82 08-Jul-2009 Doug Zongker <dougz@android.com> fix problems with new image size calculations

The build servers have GNU coreutils 5.93, where stat does not output
a newline. Ubuntu hardy has GNU coreutils 6.10, where it does.
Lacking a newline messes up the summing of the sizes. Fix
get-file-size to remove the newline if present, and make the total
calculation in assert-max-file-size more robust.

Also, if the image was too big, it was not actually making the build
fail (because /bin/false was not the last thing called). Fix that so
it does.
ombo/linux-x86.mk
efinitions.mk
8e879ba1c5fe11623b4048cf318afca47a3433c5 08-Jul-2009 San Mehat <san@google.com> Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."

This reverts commit ff2c9deb7966f79572d502a7048a3e6f0f9939b8.

This breaks SD cards on the device (always installs the emulator vold.conf)
ain.mk
b6d89448a938c63ded10c4ee25791b810ed9a459 08-Jul-2009 Doug Zongker <dougz@android.com> am 8cebf1ff: fix mislaid \'if\' in recovery

Merge commit '8cebf1ff7836a5dc365e49f7a14d7546a651d9c7'

* commit '8cebf1ff7836a5dc365e49f7a14d7546a651d9c7':
fix mislaid 'if' in recovery
8cebf1ff7836a5dc365e49f7a14d7546a651d9c7 08-Jul-2009 Doug Zongker <dougz@android.com> fix mislaid 'if' in recovery

When I moved the building of the recovery image upwards in the file, I
moved an 'endif' surrounding it but not the matching 'if'. How did
this ever work?
akefile
97f696cdaab83107afb7b0d4903e8b2350cd8734 08-Jul-2009 Doug Zongker <dougz@android.com> am 4647f12a: fix image size tests

Merge commit '4647f12a4ff9dc54247184f17ff3de1cc423f213'

* commit '4647f12a4ff9dc54247184f17ff3de1cc423f213':
fix image size tests
79005e03cced503d7fd42d5c8053e1fae377be53 07-Jul-2009 Marco Nelissen <marcone@google.com> Pass compiler flags for C++ too, and add a flag that enables warnings about missing virtual destructors
onfig.mk
04edc95a328d509b8a51123f891d396256bc409c 06-Jul-2009 Jean-Baptiste Queru <jbq@google.com> Merge branch 'master' of git://android.git.kernel.org/platform/build into merge_korg_master

Conflicts:
core/apicheck_msg_current.txt
45ae88c2a2899154cb27794f9843de82307b228b 03-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 92c8ecbf: Merge change 5929 into donut

Merge commit '92c8ecbf99daf492a24408686017609763429251'

* commit '92c8ecbf99daf492a24408686017609763429251':
Add the JNI library of CertTool for handling certificates.
4647f12a4ff9dc54247184f17ff3de1cc423f213 02-Jul-2009 Doug Zongker <dougz@android.com> fix image size tests

There are currently two errors in the way we test the size of built
images against the size of the partition on the hardware:

- the limits in BoardConfig.mk are set with the data size only, but
images contain an extra 64 bytes per 2048-byte page. This means we
think the partition is about 1/32 smaller than it really is.

- when we deliver a build via OTA, the system partition ends up with
one more file than when it's flashed via fastboot. That file is a
copy of the recovery image. In order to be able to OTA a build, we
need to make sure the system partition has enough room for all the
system files plus the recovery image as well.

For the kila system partition, these errors are roughly the same order
of magnitude -- about 2MB, one in the "safe" direction, one in the
"unsafe" direction. This change fixes both to give us a more accurate
notion of how close we are to the limit.

Make the build emit a warning (but not fail) when the size is within
32kb of the limit.

Also, include the values of the partition size limits in an info file
in the target-files package, so post-processing tools can use them
without parsing the BoardConfig.mk file.
akefile
efinitions.mk
c74bbeecd059ae7cdeb14508e068111ccbc713dd 01-Jul-2009 Chung-yih Wang <cywang@google.com> Add the JNI library of CertTool for handling certificates.
relink-linux-arm.map
810e4c9d54aff044d9a1d77e8fed036552366f35 30-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am c898974b: Merge change 5553 into donut

Merge commit 'c898974bcc3e6adfc2900c2a01bde5f83a0591d6'

* commit 'c898974bcc3e6adfc2900c2a01bde5f83a0591d6':
Change cts makefile to bundle junit.jar.
c898974bcc3e6adfc2900c2a01bde5f83a0591d6 29-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5553 into donut

* changes:
Change cts makefile to bundle junit.jar.
67bae7fc6842db2c2718fd668dde173321ed9b0b 26-Jun-2009 Brett Chabot <brettchabot@google.com> Change cts makefile to bundle junit.jar.
asks/cts.mk
f4f85a277e0e998fb8d8fce50dbc5d7f85c17a16 25-Jun-2009 Patrick Scott <phanna@android.com> Fix the simulator build by setting TARGET_PRELINK_MODULE before including
BoardConfig.mk
onfig.mk
3fbb580c10ee501b8358a4b4b978357097262482 24-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5099

* changes:
Move the BoardConfig.mk search and inclusion to core/config.mk.
31424d6420a6a08b5016d335cfaa654385899f28 24-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 5082

* changes:
pass correct -s and -m options to release tools
4179f16e4825fe572064c1b94c5ff2e62f241abf 24-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4992

* changes:
Change to add the 4.4.0 toolchain directory to PATH.
87c86573e051602ddc2759857c961fe5124bc22a 23-Jun-2009 Patrick Scott <phanna@android.com> Move the BoardConfig.mk search and inclusion to core/config.mk.

This allows TARGET_ARCH_VARIANT to be set by the vendor before we choose the
architecture in core/combo/select.mk.

Also add a primitive armv7-a.mk for turning on hardware floating point.
ombo/arch/arm/armv7-a.mk
onfig.mk
ain.mk
659fc55e4495d1dfc88e93c7a1cd291518dc7cd3 23-Jun-2009 Doug Zongker <dougz@android.com> pass correct -s and -m options to release tools

When building an OTA package, TARGET_RELEASETOOLS_EXTENSIONS can be
set (in BoardConfig.mk) to specify where the device-specific
releasetools code is located. (The default location is the common
directory for the device's vendor.) The TARGET_OTA_SCRIPT_MODE can be
used to override the default script mode ("auto") for a particular
device.
akefile
6178e239e6c5932173c467bd761d998f4771d165 23-Jun-2009 Joe Onorato <joeo@android.com> am 9d9f3678: Java 1.5 is required. Enforce it.

Merge commit '9d9f367895655411c42123177ae1c32f104b3c01'

* commit '9d9f367895655411c42123177ae1c32f104b3c01':
Java 1.5 is required. Enforce it.
9d9f367895655411c42123177ae1c32f104b3c01 23-Jun-2009 Joe Onorato <joeo@android.com> Java 1.5 is required. Enforce it.
ain.mk
e01100c7ac15bd884ca02c64f42b908b93e37c26 20-Jun-2009 Doug Zongker <dougz@android.com> generalize the definition of a "radio image"

Non-HTC devices may have multiple files constituting their "radio
image". Generalize the INSTALLED_RADIOIMAGE_TARGET variable a bit:
initially define it as empty, then let AndroidBoard.mk files add to
it. Provide a convenience function add-radio-image for them to call
to add files. Put all those files into the target_files zip for use
in OTA and fastboot package construction.

Note that for HTC devices, this changes the name of the radio image in
the target_files zip: instead of "RADIO/image" it will be
"RADIO/radio.img". Tools that use the target_files zip will need to
be changed.
akefile
efinitions.mk
f28c6fabb6605950baffcb13139f808b71bda85a 23-Jun-2009 Jing Yu <jingyu@google.com> Change to add the 4.4.0 toolchain directory to PATH.

Since we have switched the default toolchain from 4.2.1 to 4.4.0,
we need to change the paths to add from 4.2.1 to 4.4.0.
nvsetup.mk
24254dbd6f807a2b5abfe6143dea18ea69bd7c27 18-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am edb6829f: Merge change 4654 into donut

Merge commit 'edb6829f832bb79ba2e96ada74b3b971b73ad9a7'

* commit 'edb6829f832bb79ba2e96ada74b3b971b73ad9a7':
Put the java source file list files somewhere where they don't
edb6829f832bb79ba2e96ada74b3b971b73ad9a7 18-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4654 into donut

* changes:
Put the java source file list files somewhere where they don't conflict with the .class files that are getting zipped up, and delete them when we're done with them.
ac4920a90bff0362eec8f424a3b45b47479c287b 18-Jun-2009 Doug Zongker <dougz@android.com> resolved conflicts for merge of c494d7ce to master
c494d7cee85d980647ca915ea64355b71fe817eb 18-Jun-2009 Doug Zongker <dougz@android.com> generate OTA packages that use edify

Split the details of generating script syntax into a generator class:
one for amend (whose output should be equivalent to the current
output), and one for edify.

Fix 'otatools' build rule to build imgdiff.
akefile
483d92412fe81de0dcee0b9b90c4834acce296d5 18-Jun-2009 Joe Onorato <joeo@android.com> Put the java source file list files somewhere where they don't
conflict with the .class files that are getting zipped up, and
delete them when we're done with them.
efinitions.mk
d6fb2d40b58b7b13cc63190c2ac88d0a30005617 18-Jun-2009 Doug Zongker <dougz@android.com> am 602a84e0: fix releasetools for non-linux architectures

Merge commit '602a84e0bbf1807a9403cfa50184241f6fc035c4'

* commit '602a84e0bbf1807a9403cfa50184241f6fc035c4':
fix releasetools for non-linux architectures
602a84e0bbf1807a9403cfa50184241f6fc035c4 18-Jun-2009 Doug Zongker <dougz@android.com> fix releasetools for non-linux architectures

The ota and img building scripts contained some hardcoded 'linux-x86'
paths. Remove and replace with a slightly redefined -p option.
Modify Makefile to pass correct -p when building.
akefile
d67bb8630a5cae71cbe6543d0bc6304d7d8a495d 18-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 4496

* changes:
Switch default toolchain to 4.4.0 in master.
daadaaa3088c807467a9d83f626bf4b8d557b2d2 18-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 1a28c1a4: Merge change 4541 into donut

Merge commit '1a28c1a4c1ad0c4adf0c63bb36f47394e9509360'

* commit '1a28c1a4c1ad0c4adf0c63bb36f47394e9509360':
remember in the target-files package what version of the API recovery uses
1bc6248b35ab8577466fa9e10a11d4a53725f0f5 18-Jun-2009 Sriram Raman <sriramkraman@google.com> Fix the build name. Previously "DONUT-BURGER"; Now "Donut"
uild_id.mk
b1134dd04900416e74bc1ee51f65d4e066d90334 18-Jun-2009 Doug Zongker <dougz@android.com> remember in the target-files package what version of the API recovery uses
akefile
b845c2fe206263e8a3d3051c35ac82ee57c343c0 17-Jun-2009 Jing Yu <jingyu@google.com> Switch default toolchain to 4.4.0 in master.
ombo/linux-arm.mk
38a649f873da8d4df7df14619cbd967570d2de9b 17-Jun-2009 Doug Zongker <dougz@android.com> handle BOARD_KERNEL_BASE in releasetools

Some devices define a BOARD_KERNEL_BASE argument which must be given
as an argument to mkbootimg when building a bootable image. Store the
value of this var (if any) in the target-files zip and use it when
building images.
akefile
157064f0b687accfbcef6f434cceb241f8af47cf 16-Jun-2009 The Android Open Source Project <initial-contribution@android.com> manual merge of dddd957c, explicitly list SDK image dependencies

Merge commit 'dddd957c'
dddd957c74ead7246026e618ab40edf92037aad4 16-Jun-2009 Doug Zongker <dougz@android.com> explicitly list SDK image dependencies

The SDK build used to have the update package as a dependency, in
order to force various image files to be built. Now the the update
package can't be built for sdk-eng, list the individual images needed
instead.
akefile
93521c42e4e91136b3506ce4f472411dc420a29a 16-Jun-2009 The Android Open Source Project <initial-contribution@android.com> manual merge of 367910fc, don't build ota or update packages for sdk or sim

Merge commit '367910fc'
367910fc6dd41e1d84789b305e6bd9cbafb78fbc 16-Jun-2009 Doug Zongker <dougz@android.com> don't build ota or update packages for sdk or sim
akefile
61ceba259d738e04fb1701a1ef79d08040492a32 16-Jun-2009 The Android Open Source Project <initial-contribution@android.com> manual merge of 37c0e274, fix building of otacerts.zip

Merge commit '37c0e274'
6be991f074838d2d9402e448486774a20d3c6228 16-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am cf348b97: Merge change 4232 into donut

Merge commit 'cf348b97bdb52b7ffe7be0d17318b1fda425a211'

* commit 'cf348b97bdb52b7ffe7be0d17318b1fda425a211':
use releasetools scripts to build update and OTA packages
37c0e274d16b1b340f1fe1bd7d11e19aa2e73e26 16-Jun-2009 Doug Zongker <dougz@android.com> fix building of otacerts.zip

Was using a variable which was only defined inside the rule, outside
the rule. Change to use the correct variable.
akefile
8678df4c064a17575137bbacf8f5856052dd5bd7 15-Jun-2009 Doug Zongker <dougz@android.com> use releasetools scripts to build update and OTA packages

Use the python scripts in build/tools/releasetools (that are used to
build signed releases) to build packages within the Makefile as well.
akefile
622a564e8fdb0c7c89cdc64bb41a6c602452e215 15-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 03474237: Merge change 4054 into donut

Merge commit '0347423753fb5d7207aa1ea93a8429f59468eb41'

* commit '0347423753fb5d7207aa1ea93a8429f59468eb41':
build 'updater' binary for use in OTA packages
Add VpnServices to PRODUCT_PACKAGES.
a406c1e7a1ae22945d2b8bb766d46b7e3544e039 13-Jun-2009 Doug Zongker <dougz@android.com> build 'updater' binary for use in OTA packages
akefile
e3eb0fae9994c809afdab720f26fee478b66c368 11-Jun-2009 Jason Sams <rjsams@android.com> joeo here. This localize command is unused and causes that execve error.
asks/localize.mk
9305cf95a8ce769967c844348879af4e9af761ad 12-Jun-2009 Chung-yih Wang <cywang@google.com> am 67647752: Add keystore in the pathmap of frameworks base.

Merge commit '676477525bc40f7ccf196a6580480b9d44adabd8'

* commit '676477525bc40f7ccf196a6580480b9d44adabd8':
Add keystore in the pathmap of frameworks base.
7e09fc130c4096cf5579c1b21cfd10ac5f574f9a 12-Jun-2009 Jean-Michel Trivi <jmtrivi@google.com> am 4175bb90: Removing "tts" from the list of directories containing source code under frameworks/base. This directory doesn\'t exist anymore after change 3730 which moved the TTS code to frameworks/base/packages/TtsService/.

Merge commit '4175bb90ae8e454416a956b3885995e59ac0454e'

* commit '4175bb90ae8e454416a956b3885995e59ac0454e':
Removing "tts" from the list of directories containing source code
676477525bc40f7ccf196a6580480b9d44adabd8 10-Jun-2009 Chung-yih Wang <cywang@google.com> Add keystore in the pathmap of frameworks base.
athmap.mk
4175bb90ae8e454416a956b3885995e59ac0454e 11-Jun-2009 Jean-Michel Trivi <jmtrivi@google.com> Removing "tts" from the list of directories containing source code
under frameworks/base. This directory doesn't exist anymore after
change 3730 which moved the TTS code to frameworks/base/packages/TtsService/.
athmap.mk
da7f6c3d5faa16743a6fb1bea376417b66f9c5de 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3569

* changes:
Fix the is_sdk_build check when installing the apns.
63b5064d44449454138fd064d6b692d4fe1d46d4 11-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 3830

* changes:
joeo here. This localize command is unused and causes that execve error.
7c805e8ee8d2a940c8fc67a6e13c612b937cfc7e 11-Jun-2009 Jason Sams <rjsams@android.com> joeo here. This localize command is unused and causes that execve error.
asks/localize.mk
0942768af1afc3f42384f60e3efc52f29662786e 06-May-2009 Jaikumar Ganesh <jaikumar@google.com> Bluez4 changes

Rename hcid to bluetoothd, modify include paths, add cleanspec
athmap.mk
relink-linux-arm.map
d9f7a05830e48f42669df1fca0be03e279b12dc0 10-Jun-2009 Sriram Raman <sriramkraman@google.com> am f1a55f8b: Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip

Merge commit 'f1a55f8bfbaa1a68d96e229b4e73c9e9209d82cf'

* commit 'f1a55f8bfbaa1a68d96e229b4e73c9e9209d82cf':
Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip
f1a55f8bfbaa1a68d96e229b4e73c9e9209d82cf 10-Jun-2009 Sriram Raman <sriramkraman@google.com> Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip

This should fix the common problem when googlelogin-client and google-framework are both included
efinitions.mk
1f04a3b8f4c4e886e8abd9a5a1076334ae12124e 09-Jun-2009 Patrick Scott <phanna@android.com> Fix the is_sdk_build check when installing the apns.

This will install the big list of apns on non-sdk eng builds. This is very
helpful after a wipe data for those of us on Cingular.
ain.mk
e7382b8652574025649f772ade3e9bb38f0dabfa 09-Jun-2009 Tammo Spalink <tammo@google.com> am 0bb9ce9e: fix build -- aidl was not finding vpn imports

Merge commit '0bb9ce9ec3d744444019f8ea191bb63f0ba3b2d4'

* commit '0bb9ce9ec3d744444019f8ea191bb63f0ba3b2d4':
fix build -- aidl was not finding vpn imports
0bb9ce9ec3d744444019f8ea191bb63f0ba3b2d4 09-Jun-2009 Tammo Spalink <tammo@google.com> fix build -- aidl was not finding vpn imports
athmap.mk
6c8cafac168e2cc2425a944717082ebe68795df7 07-Jun-2009 Android Code Review <code-review@android.com> Merge change 8253

* changes:
Update the current.xml error message.
81d04d57f25e69dc95848590a584865bf47c0948 05-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am a0bad432: Merge change 3237 into donut

Merge commit 'a0bad432f38f3b5105d79a1dadc1ccda061934b6'

* commit 'a0bad432f38f3b5105d79a1dadc1ccda061934b6':
Add archquery to the windows make
d8a6ac100009f2fb158e26d9f7199d800eb57887 05-Jun-2009 Raphael <raphael@google.com> Add archquery to the windows make
ain.mk
3585e959180d0f8cc8fae50230b08df3cbec6a73 29-May-2009 David 'Digit' Turner <digit@google.com> Fix armv5te-vfp build. Aargh
ombo/arch/arm/armv5te-vfp.mk
d53c81d7c590d777fd0fe768b136423da07b1ec3 29-May-2009 David 'Digit' Turner <digit@google.com> Rename TARGET_ARCH_VERSION to TARGET_ARCH_VARIANT +
Move arch-specific definitions into core/combo/arch/arm/<variant>.mk
ombo/arch/arm/armv4t.mk
ombo/arch/arm/armv5te-vfp.mk
ombo/arch/arm/armv5te.mk
ombo/linux-arm.mk
ca85166e8a4ac967b0b91299ec91b4b7ae930544 29-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2703

* changes:
add libGLES_android.so to the prelink map, this will replace libagl.so eventually
0f36b46bc083b9a8d75a78beb33e37398ab30db4 29-May-2009 Mathias Agopian <mathias@google.com> add libGLES_android.so to the prelink map, this will replace libagl.so eventually
relink-linux-arm.map
fe626b775f1a82b628bacb12a28301240b064b47 29-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2631

* changes:
Added support for TARGET_ARCH_VERSION=armv5te-vfp.
8f51a2ad06ab52b6d3f8af96190cbe0bc679df62 28-May-2009 Andy McFadden <fadden@android.com> Added support for TARGET_ARCH_VERSION=armv5te-vfp.

This is currently a copy & paste of the armv5te parameters. I don't
know if there's a better way to encode this, or to what extent we will
need to specialize it vs. armv5te in a future build (e.g. to enable fp
instruction use in code gen).

Currently the only effect is to select the VFP-enabled mterp sources in
Dalvik.
ombo/linux-arm.mk
0c72f970b0f0dc96a5184cf129980411186bf531 28-May-2009 Dima Zavin <dima@android.com> am 46e9beca: core: Add support for static libraries to include other whole static libs.

Merge commit '46e9beca50057bd4ff375b35fd5958c05ce5bcb7'

* commit '46e9beca50057bd4ff375b35fd5958c05ce5bcb7':
core: Add support for static libraries to include other whole static libs.
46e9beca50057bd4ff375b35fd5958c05ce5bcb7 28-May-2009 Dima Zavin <dima@android.com> core: Add support for static libraries to include other whole static libs.

Currently, if LOCAL_WHOLE_STATIC_LIBRARIES is specified, its values is
ignored. This patch addresses this limitation and works as follows:
For every whole lib specified, it extracts the archive into a sub-directory
under the target lib's intermediate, and then seeds the initial target
archive with all the members.

Signed-off-by: Dima Zavin <dima@android.com>
ase_rules.mk
efinitions.mk
tatic_library.mk
f55791f72066e6c178d187ee717bed1c4163793c 28-May-2009 Doug Zongker <dougz@android.com> am 8b70e8c6: use minigzip instead of system gzip in the build

Merge commit '8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78'

* commit '8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78':
use minigzip instead of system gzip in the build
8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78 27-May-2009 Doug Zongker <dougz@android.com> use minigzip instead of system gzip in the build

Use zlib's minigzip utility, built as part of our source tree, instead of
whatever installation of GNU gzip happens to be on the user's machine.
Using zlib's deflater, which is nicely available as a library (unlike
GNU gzip's deflater) will ultimately let us do binary patches to the
boot and recovery images.
akefile
onfig.mk
9a272228828a25798ca97b8a941f6a29a151427f 25-May-2009 The Android Open Source Project <initial-contribution@android.com> merged 866a6d399e0ec2a0604c3d64e372f827a87ec843 with conflicts in core/binary.mk
866a6d399e0ec2a0604c3d64e372f827a87ec843 25-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 1642 into donut

* changes:
Allow the build system to build Objective-C sources.
4afb4f20fcedb5fee6af9faf2bf361808d183132 23-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 3026e96d: Merge change 2245 into donut

Merge commit '3026e96dcea7893d762d3ad1532c3775dfe01b60'

* commit '3026e96dcea7893d762d3ad1532c3775dfe01b60':
Define TARGET_CPU_ABI for finding native code in .apks
3026e96dcea7893d762d3ad1532c3775dfe01b60 23-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2245 into donut

* changes:
Define TARGET_CPU_ABI for finding native code in .apks
e7a6072d2ea23b94a633cf56fcd1cb3b6c5785bd 23-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 6941562e: Merge change 2288 into donut

Merge commit '6941562ed3b2ca8fe315ce95bf15a0e57efb4a81'

* commit '6941562ed3b2ca8fe315ce95bf15a0e57efb4a81':
Adding in the path the new android.tts package.
ecc70d705ab8ad6461f23d8be97791227f4219ea 22-May-2009 Dianne Hackborn <hackbod@google.com> Define TARGET_CPU_ABI for finding native code in .apks
akefile
ain.mk
3110264149c37c0d8cbf41d5268a1e100da84459 22-May-2009 Jack Palevich <jackpal@google.com> Add libacc to the prelink map.

Libacc is a tiny subset of C intended for use as a scripting language for
a 3D UI.
relink-linux-arm.map
fbd10d940d9dca8aba940f91fceade4098c6cb92 20-May-2009 Robert Greenwalt <robdroid@android.com> Add PRODUCT_DEFAULT_WIFI_CHANNELS build var.

Allows the build to specify the default number of allowed
WIFI channels. Part of the fix for 1625953.
akefile
roduct.mk
roduct_config.mk
e1da30426fabc834e10b348fa3b9483c6cf4c66f 22-May-2009 Jean-Michel Trivi <jmtrivi@google.com> Adding in the path the new android.tts package.
athmap.mk
3659b92a55c80b6cbd778d5a99c1d61dd9922c17 21-May-2009 Mike Lockwood <lockwood@android.com> am 051672bc: Update the error message that occurs when current.xml needs regenerating.

Merge commit '051672bc6c41a5a24ed4057f9d78f5e9caaf7aef'

* commit '051672bc6c41a5a24ed4057f9d78f5e9caaf7aef':
Update the error message that occurs when current.xml needs regenerating.
051672bc6c41a5a24ed4057f9d78f5e9caaf7aef 21-May-2009 Mike Lockwood <lockwood@android.com> Update the error message that occurs when current.xml needs regenerating.

We are no longer using p4 for source control and there are no longer OWNERS files.

Signed-off-by: Mike Lockwood <lockwood@android.com>
picheck_msg_current.txt
5d72f8501dddf9044c19bba1297923b5eeab4ecf 20-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 2060

* changes:
add an entry for libbinder in the prelink map
5dbb529de9f84e731e26b83525f3f599f1914aca 14-May-2009 David 'Digit' Turner <digit@google.com> Allow the build system to build Objective-C sources.

This is needed to move our modified SDL sources under external/qemu/distrib.
As per joeo's request, this change also enables target Objective-C compilation, letting it error at build time.
inary.mk
efinitions.mk
33e8306d2e54f16bf3aaa4bd6571e1feb4b11726 19-May-2009 Mathias Agopian <mathias@google.com> add an entry for libbinder in the prelink map
relink-linux-arm.map
d033d57f409d8df2ddda319e191da7ee71009362 20-May-2009 Patrick Scott <phanna@android.com> Change PRIVATE to LOCAL for additional dependencies.

This change will be used by webcore_test in a separate change.
ase_rules.mk
inary.mk
678ea423074d58fa421529d4ce5f7f3aabf620aa 18-May-2009 The Android Open Source Project <initial-contribution@android.com> merge 9bd5404a9d30b82ba3d2750c0cb8cae88b33f82d w/conflict
9bd5404a9d30b82ba3d2750c0cb8cae88b33f82d 16-May-2009 Dianne Hackborn <hackbod@google.com> Use new aapt feature to add default version info to .apks.
efinitions.mk
ersion_defaults.mk
50ca1cf796d867d6f378d55fc98a3bb5f69630df 16-May-2009 Ed Heyl <edheyl@google.com> cherry-pick bd215ed9749f8199085b27ab4f21e687c07e9633
ombo/linux-arm.mk
a3072e5ae5556858a3159fe81734d05798a3c5bc 15-May-2009 Joe Onorato <joeo@android.com> am eefd0212: Print the platform version and version codename in the big build header.

Merge commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5'

* commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5':
Print the platform version and version codename in the big build header.
eefd0212f10ec83b21d1792130b4cad02d2ce4d5 13-May-2009 Joe Onorato <joeo@android.com> Print the platform version and version codename in the big build header.
nvsetup.mk
ain.mk
bd215ed9749f8199085b27ab4f21e687c07e9633 14-May-2009 Doug Kwan <dougkwan@google.com> Rollback to gcc-4.2.1
ombo/linux-arm.mk
a7e0325cd6f50b5dba9fae539eecfc56ffb2af93 13-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 3de1fe6: Merge change 1529 into donut

Merge commit '3de1fe627073608270f844714f24ed83ed4266db'

* commit '3de1fe627073608270f844714f24ed83ed4266db':
Fix makefile to be compatible with findbugs v 1.3.8
ab1e594c5d5cf65db54ad3c19d0abc1a99d4071e 13-May-2009 Dianne Hackborn <hackbod@google.com> Update build version to Eclair.
ersion_defaults.mk
cef9ed98ac83981f6b12a552b83eb2cf37571349 13-May-2009 Andrew Stadler <stadler@android.com> Fix makefile to be compatible with findbugs v 1.3.8
modified: core/java.mk
ava.mk
502e9c8437315fa5f731efd1272a6c8ab1e04c8d 11-May-2009 Phil Dubach <nobody@android.com> am 233728d: am 9e35a86: AI 148675: CTS: Copy only the \'startcts\' scrip

Merge commit '233728de06f3ce711c0be94d5a3427bc007674a3'

* commit '233728de06f3ce711c0be94d5a3427bc007674a3':
AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
233728de06f3ce711c0be94d5a3427bc007674a3 11-May-2009 Phil Dubach <nobody@android.com> am 9e35a86: AI 148675: CTS: Copy only the \'startcts\' script into the cts

Merge commit '9e35a86b833c8bd520c9f889be3f2859a5ed7b45' into donut

* commit '9e35a86b833c8bd520c9f889be3f2859a5ed7b45':
AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
9e35a86b833c8bd520c9f889be3f2859a5ed7b45 11-May-2009 Phil Dubach <nobody@android.com> AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
Before CL 148645, 'startcts' called the 'cts' script. This is no longer the
case, so we want to exclude the 'cts' script from the distribution to avoid
confusion. The 'cts' script is only used when running cts directly on a
fully built source tree.

Automated import of CL 148675
asks/cts.mk
0a6d796829d4c831c12cf7178d77434cec0f7018 08-May-2009 Dianne Hackborn <hackbod@google.com> am 9537884: Add new property for dev codename, update version to Donut.

Merge commit '9537884b0dabe81bf612c79d12c7b4bf40de10a5'

* commit '9537884b0dabe81bf612c79d12c7b4bf40de10a5':
Add new property for dev codename, update version to Donut.
9537884b0dabe81bf612c79d12c7b4bf40de10a5 08-May-2009 Dianne Hackborn <hackbod@google.com> Add new property for dev codename, update version to Donut.
akefile
ersion_defaults.mk
93a2620946de421af9d58bb92af49ce7ecdd9f87 08-May-2009 Dima Zavin <dima@android.com> am 6ea3b88: core: Recovery image should have the custom kernel base as w

Merge commit '6ea3b8856d656752c0310ca237ed99e7451be83b'

* commit '6ea3b8856d656752c0310ca237ed99e7451be83b':
core: Recovery image should have the custom kernel base as well.
6ea3b8856d656752c0310ca237ed99e7451be83b 08-May-2009 Dima Zavin <dima@android.com> core: Recovery image should have the custom kernel base as well.

Signed-off-by: Dima Zavin <dima@android.com>
akefile
c2e63593e5771a3c418388f4a77aeda39750f4cb 08-May-2009 Dima Zavin <dima@android.com> am 1e0847c: core: Allow the board config to specify the kernel base addr

Merge commit '1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec'

* commit '1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec':
core: Allow the board config to specify the kernel base address for mkbootimg
1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec 08-May-2009 Dima Zavin <dima@android.com> core: Allow the board config to specify the kernel base address for mkbootimg

Signed-off-by: Dima Zavin <dima@android.com>
akefile
9b659a23b0b9f725534d7e1fd8e6196a9a4deb8c 07-May-2009 Jorg Pleumann <nobody@android.com> am 1f61dc3: am 6178820: AI 148430: Adding a new CTS test runner that is

Merge commit '1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0'

* commit '1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0':
AI 148430: Adding a new CTS test runner that is basically
1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0 07-May-2009 Jorg Pleumann <nobody@android.com> am 6178820: AI 148430: Adding a new CTS test runner that is basically

Merge commit '6178820340ccca2656fab0953bbe77da2e3e4bb7' into donut

* commit '6178820340ccca2656fab0953bbe77da2e3e4bb7':
AI 148430: Adding a new CTS test runner that is basically
6178820340ccca2656fab0953bbe77da2e3e4bb7 07-May-2009 Jorg Pleumann <nobody@android.com> AI 148430: Adding a new CTS test runner that is basically
a copy of the old one, but resides in android/cts
and is built and installed as part of the CTS.
This makes sure we always have the correct test
runner on a device, so we should see the various
improvements also on off-the-shelf Cupcake phones.
BUG=1537738

Automated import of CL 148430
asks/cts.mk
e36c4a5b0b595dad95b25c5fff35ca88439ed1b6 07-May-2009 San Mehat <san@google.com> am 6ffb159: prelink: Add libsysutils to prelink map

Merge commit '6ffb159a8be65e2a63f17cc35f57e79e3e26809b'

* commit '6ffb159a8be65e2a63f17cc35f57e79e3e26809b':
prelink: Add libsysutils to prelink map
6ffb159a8be65e2a63f17cc35f57e79e3e26809b 06-May-2009 San Mehat <san@google.com> prelink: Add libsysutils to prelink map

Signed-off-by: San Mehat <san@google.com>
relink-linux-arm.map
8acd8483200499a690635a5f8784fa31e398a01d 06-May-2009 Dave Bort <dbort@android.com> Merge commit '9528248' into master

Conflicts:
core/combo/linux-arm.mk

Signed-off-by: Dave Bort <dbort@android.com>
952824843b868560713f668887e1961de534a250 24-Apr-2009 Dave Bort <dbort@android.com> core: Don't debug native modules when TARGET_BUILD_TYPE==debug

Don't make the simulator default to debug mode.

Remove all global "debug" {C,CPP}FLAGS, which are no longer used.
inary.mk
ombo/linux-arm.mk
ombo/select.mk
onfig.mk
roduct_config.mk
e159bea824e5c3d4129e982f4f68f249818f701a 05-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 954

* changes:
Extend build system to compile generated "C" files.
e7b3e2c62eddf9c31062fa8a0c9a31e1ef749afd 04-May-2009 Jack Palevich <jackpal@google.com> Extend build system to compile generated "C" files.

Until now only generated assembly or C++ files would be compiled. This patch extends the build
system to compile generated C files as well. The new rule is modeled on the existing rules for
compiling generated C++ files and the existing rule for compiling ordinary C files.
inary.mk
b41e725eae02e825c181f17e863dec5d9d6089c8 04-May-2009 James Dong <jdong@google.com> merged 2d2a9acac29650e23e025fdbce831c0bfa9667df with conflicts....
relink-linux-arm.map
6062815e2e5db38ad90d580782bd733e23d027f2 01-May-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 859 into donut

* changes:
Change 77 from git master branch: change the prelink-linux-arm.map to include OC 2.0 new shared libs - remove redundant share lib from the map - remove 2way share lib from the map
2d2a9acac29650e23e025fdbce831c0bfa9667df 01-May-2009 James Dong <jdong@google.com> Change 77 from git master branch:
change the prelink-linux-arm.map to include OC 2.0 new shared libs
- remove redundant share lib from the map
- remove 2way share lib from the map
relink-linux-arm.map
6fa370418773e046eb9c11e5904a79f90a0441c6 01-May-2009 Doug Kwan <dougkwan@google.com> am 8c9bef6: switch compiler to gcc-4.3.1

Merge commit '8c9bef616666ee8c6d5cc9243f3d89c44d15d216'

* commit '8c9bef616666ee8c6d5cc9243f3d89c44d15d216':
switch compiler to gcc-4.3.1
2f5b79ef04c01d80961b7963d7816d2dd6f2c00a 01-May-2009 Joe Onorato <joeo@android.com> am 7b2845a: Don\'t rebuild the NOTICE files when building with mm, mmm, e

Merge commit '7b2845ab1a47324a6fb25261048510e79656a732'

* commit '7b2845ab1a47324a6fb25261048510e79656a732':
Don't rebuild the NOTICE files when building with mm, mmm, etc.
8c9bef616666ee8c6d5cc9243f3d89c44d15d216 30-Apr-2009 Doug Kwan <dougkwan@google.com> switch compiler to gcc-4.3.1

Switch default ARM compiler to gcc-4.3.1 for Neon support.
ombo/linux-arm.mk
7b2845ab1a47324a6fb25261048510e79656a732 30-Apr-2009 Joe Onorato <joeo@android.com> Don't rebuild the NOTICE files when building with mm, mmm, etc.
akefile
6cdbde948934caaa9c5b25eec9d4655391b9b429 29-Apr-2009 Phil Dubach <> am e3a5777: am ccd2def: AI 147847: CTS: Fix core test dependencies in CT

Merge commit 'e3a5777a67b09bd54500c1b78c714972fa4793ef'

* commit 'e3a5777a67b09bd54500c1b78c714972fa4793ef':
AI 147847: CTS: Fix core test dependencies in CTS makefile
4fa1f8e3bc910e9e97eaa59d178bc0d3bf19bd3e 29-Apr-2009 Bill Napier <> am e468abd: am f22b9a0: AI 147775: Also add ApiDemos to make sure it get

Merge commit 'e468abda1c64923908ae711743d3e8c9f1b4a477'

* commit 'e468abda1c64923908ae711743d3e8c9f1b4a477':
AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
56d4db7d7a957c7ea3afa20a64494a68d935ea31 29-Apr-2009 Jorg Pleumann <> am ecc08d0: am b3e0126: AI 147731: Forgot to submit the build changes fo

Merge commit 'ecc08d02b18f67a84df2f69e0d807761fc8dad15'

* commit 'ecc08d02b18f67a84df2f69e0d807761fc8dad15':
AI 147731: Forgot to submit the build changes for the
12ff9f39252aeec0f3942430dd3f0fc377cd0d50 29-Apr-2009 Bill Napier <> am 41ddfa9: am f23f5b4: AI 147479: Update list of CTS test packages.

Merge commit '41ddfa903fe4e91e51d978d30bbbe6748ed1f100'

* commit '41ddfa903fe4e91e51d978d30bbbe6748ed1f100':
AI 147479: Update list of CTS test packages.
bf1de8cbc9d4d4e60b17b06004fde7859e9b2822 29-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> am a47b47a: Merge change 530 into donut

Merge commit 'a47b47ad120b6410b2159722680907c53217c09c'

* commit 'a47b47ad120b6410b2159722680907c53217c09c':
Remove obsolete activitycreator from windows SDK makefile.
e3a5777a67b09bd54500c1b78c714972fa4793ef 29-Apr-2009 Phil Dubach <> am ccd2def: AI 147847: CTS: Fix core test dependencies in CTS makefile

Merge commit 'ccd2def288d02ce5adab10bb28878fff05b70aed' into donut

* commit 'ccd2def288d02ce5adab10bb28878fff05b70aed':
AI 147847: CTS: Fix core test dependencies in CTS makefile
e468abda1c64923908ae711743d3e8c9f1b4a477 29-Apr-2009 Bill Napier <> am f22b9a0: AI 147775: Also add ApiDemos to make sure it gets included i

Merge commit 'f22b9a0ad531f66eb0b5710abae1feefecc42c2b' into donut

* commit 'f22b9a0ad531f66eb0b5710abae1feefecc42c2b':
AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
ecc08d02b18f67a84df2f69e0d807761fc8dad15 29-Apr-2009 Jorg Pleumann <> am b3e0126: AI 147731: Forgot to submit the build changes for the

Merge commit 'b3e0126a7a2d32fbae2638e9419739d2d3907c40' into donut

* commit 'b3e0126a7a2d32fbae2638e9419739d2d3907c40':
AI 147731: Forgot to submit the build changes for the
41ddfa903fe4e91e51d978d30bbbe6748ed1f100 29-Apr-2009 Bill Napier <> am f23f5b4: AI 147479: Update list of CTS test packages.

Merge commit 'f23f5b486650a923e58e3e79b8ec23cc725b7b33' into donut

* commit 'f23f5b486650a923e58e3e79b8ec23cc725b7b33':
AI 147479: Update list of CTS test packages.
ccd2def288d02ce5adab10bb28878fff05b70aed 27-Apr-2009 Phil Dubach <> AI 147847: CTS: Fix core test dependencies in CTS makefile
The core test descriptions did not list all dependencies. When building cts
for the first time, the descriptions were generated before the cts
repository was erased.
BUG=1813815

Automated import of CL 147847
asks/cts.mk
f22b9a0ad531f66eb0b5710abae1feefecc42c2b 25-Apr-2009 Bill Napier <> AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
well.
BUG=1810821

Automated import of CL 147775
asks/cts.mk
98dce16df0356a5d43b1c6e201bceba0ce453202 24-Apr-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/donut'
b3e0126a7a2d32fbae2638e9419739d2d3907c40 24-Apr-2009 Jorg Pleumann <> AI 147731: Forgot to submit the build changes for the
luni.AllTests removal.

Automated import of CL 147731
asks/cts.mk
9058e7293e045b576b19101e41b65f67f8f6309b 24-Apr-2009 Raphael <raphael@google.com> Remove obsolete activitycreator from windows SDK makefile.
ain.mk
f23f5b486650a923e58e3e79b8ec23cc725b7b33 23-Apr-2009 Bill Napier <> AI 147479: Update list of CTS test packages.

Automated import of CL 147479
asks/cts.mk
0a4c2b02d0f435a472c8b2e49543037a648c6ec6 22-Apr-2009 Phil Dubach <> AI 147397: CTS: Fix VM test description generator

Automated import of CL 147397
asks/cts.mk
8e5df6c0245297ec5a4260f704ed1e0f86443309 19-Apr-2009 Urs Grob <> Merge branch 'readonly-p4-master'
4a27b7649130572861bb46666e6b63bbe6198ffd 19-Apr-2009 Urs Grob <> AI 146827: am: CL 146742 am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
Original author: ursg
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146827
asks/cts.mk
b3c6b2df4855a4d73e2e83db44156971169a2c63 17-Apr-2009 Urs Grob <> AI 146742: am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
Original author: ursg
Merged from: //branches/cupcake/...

Automated import of CL 146742
asks/cts.mk
709b752e3b888331d9d1f172e19a01446fbed69d 17-Apr-2009 Urs Grob <> AI 146710: Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
BUG=1789657

Automated import of CL 146710
asks/cts.mk
1032d83d513043fd5df7cae8337d6fd7cc9c3490 16-Apr-2009 Raphael Moll <> Merge branch 'readonly-p4-master'
a779a05e7eecf91d33590787075a8cbef4c270ac 16-Apr-2009 Raphael Moll <> AI 146498: am: CL 145983 am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
a good start, with the following caveats:
What it does:
- take an input jar, a list of includes, a list of excludes.
- generate actual Java source for the filtered classes.
What it doesn't do yet:
- some more work on filtering inner elements (methods, etc.)
- properly generate inner classes.
- hide synthetic fields.
- some classes body are missing
- directly generate a stubbed bytecode/jar rather than source.
I'll likely want to keep the source generator for debugging
purposes or if we want to integrate with a build system instead.
- classpath will be changed in the final CL to refer to the external
ASM lib rather than the project. I need the source for debugging
rigth now.
- will review comments before submitting.
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146498
ain.mk
e53ceac5e22e29b69d324c6beed7aff094df957a 15-Apr-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/cupcake'
817a7ba786cd2dd80792b23f5faf9857bbcf06bd 14-Apr-2009 Android (Google) Code Review <android-gerrit@google.com> Merge change 77

* changes:
Squashed commit of the following:
7953e3000ffecfacb4bd27f24a37b2c4a1d790bf 14-Apr-2009 Jianhong Jiang <jianhong@google.com> Squashed commit of the following:

commit 191a8bc426782720b38d2af2151f654dc3241ffe
Author: Jianhong Jiang <jianhong@google.com>
Date: Mon Apr 13 11:06:07 2009 -0700

Change tabs into 4 spaces.

commit f47721ac22c353a93ddf56e3bd6ca21c01ad7091
Author: Jianhong Jiang <jianhong@google.com>
Date: Fri Apr 10 14:14:05 2009 -0700

OpenCore 2.02 prelink map change.
relink-linux-arm.map
a190c523afcee348359ff7e6f6487b5b3742a448 14-Apr-2009 Raphael Moll <> AI 145983: am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
a good start, with the following caveats:
What it does:
- take an input jar, a list of includes, a list of excludes.
- generate actual Java source for the filtered classes.
What it doesn't do yet:
- some more work on filtering inner elements (methods, etc.)
- properly generate inner classes.
- hide synthetic fields.
- some classes body are missing
- directly generate a stubbed bytecode/jar rather than source.
I'll likely want to keep the source generator for debugging
purposes or if we want to integrate with a build system instead.
- classpath will be changed in the final CL to refer to the external
ASM lib rather than the project. I need the source for debugging
rigth now.
- will review comments before submitting.
Original author: raphael
Merged from: //branches/cupcake/...

Automated import of CL 145983
ain.mk
50d911553bffaef085dd1f9ce1384bb4006d741e 14-Apr-2009 Joe Onorato <> Merge branch 'readonly-p4-master'
eb19b3e0d1189cc7833f185a067c9f80b5487707 14-Apr-2009 Joe Onorato <> AI 146003: am: CL 145850 am: CL 145512 SDK add-on updates
- rename the directory and zip file
- make it build to the dist directory
Original author: joeo
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 146003
akefile
ain.mk
asks/sdk-addon.mk
801cfe2a50c87ea45692f737564f3e81f73a6fdb 13-Apr-2009 Andy McFadden <> Merge branch 'readonly-p4-master'
743e250b3010408ec92903f7de009f059c61ffb3 13-Apr-2009 Andy McFadden <> AI 145942: Enable type-precise GC on sapphire builds.

Automated import of CL 145942
ain.mk
a7bfb4f382af7c73771282fb395d47f5f374887a 13-Apr-2009 Raphael Moll <> AI 145911: ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
a good start, with the following caveats:
What it does:
- take an input jar, a list of includes, a list of excludes.
- generate actual Java source for the filtered classes.
What it doesn't do yet:
- some more work on filtering inner elements (methods, etc.)
- properly generate inner classes.
- hide synthetic fields.
- some classes body are missing
- directly generate a stubbed bytecode/jar rather than source.
I'll likely want to keep the source generator for debugging
purposes or if we want to integrate with a build system instead.
- classpath will be changed in the final CL to refer to the external
ASM lib rather than the project. I need the source for debugging
rigth now.
- will review comments before submitting.
BUG=1778786

Automated import of CL 145911
ain.mk
681925681a3c6d8a4470e8113297d117b595e793 13-Apr-2009 Joe Onorato <joeo@android.com> Fix the warning about NOTICE files overriding previous targets.

Use a different name for prebuilt libraries based on their LOCAL_MODULE --
they were all colliding using the same name, javalib.jar. These names
are synthetic, since the libraries don't actually exist on the device
as such.
otice_files.mk
03fbe40d5346eb4d5258aa55a00a9a7cb18f8551 13-Apr-2009 Joe Onorato <> AI 145850: am: CL 145512 SDK add-on updates
- rename the directory and zip file
- make it build to the dist directory
Original author: joeo
Merged from: //branches/cupcake/...

Automated import of CL 145850
akefile
ain.mk
asks/sdk-addon.mk
f22bf5166997851e71b83588188d633219fb447c 10-Apr-2009 Mike Lockwood <> Merge branch 'readonly-p4-master'
ed8b386128cdbd603f18bf355e2300d973f596da 10-Apr-2009 Mike Lockwood <> AI 145705: am: CL 145704 Manually integrate change 145576 to donutburger to fix "lunch"
Original author: lockwood

Automated import of CL 145705
roduct_config.mk
8539929a12f135f45de9cd99f9502431f7d2de85 10-Apr-2009 Mike Lockwood <> AI 145704: Manually integrate change 145576 to donutburger to fix "lunch"

Automated import of CL 145704
roduct_config.mk
44a48f7d777a03c67aedd202abb52e4ffee29a2f 10-Apr-2009 Joe Onorato <> Merge branch 'readonly-p4-master'
4c096ad58040294da0f87b74598909245c549103 10-Apr-2009 Joe Onorato <> AI 145659: am: CL 145621 am: CL 145373 remove a debugging printf that sometimes breaks the build
because the commandline is too long
Original author: joeo
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 145659
roiddoc.mk
fbac5ec73164ade2c1647f69f0de7bba4acbf9de 10-Apr-2009 Joe Onorato <> Merge branch 'readonly-p4-master'
214a42bbb6e60f1231aa178c114a55dbe363c845 10-Apr-2009 Joe Onorato <> AI 145655: am: CL 145618 am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
Implement SDK add-ons in the build system.
- Add an option to use the standard javadoc doclet instead
of droiddoc, since droiddocs non-sdk templates aren't
ready for prime time.
- Add the notion of a stubs for a library. It's only
implemented for java libraries, but when we do native
libraries in the NDK or sdk-addons, it will work there too.
Original author: joeo
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 145655
akefile
lear_vars.mk
efinitions.mk
roiddoc.mk
nvsetup.mk
ava.mk
roduct.mk
roduct_config.mk
asks/sdk-addon.mk
92f8a3a7c3f226659d7b691dea90f23ceb979fa1 10-Apr-2009 Joe Onorato <> AI 145621: am: CL 145373 remove a debugging printf that sometimes breaks the build
because the commandline is too long
Original author: joeo
Merged from: //branches/cupcake/...

Automated import of CL 145621
roiddoc.mk
64d85d0d827489c514f6aec075482563c80cda73 10-Apr-2009 Joe Onorato <> AI 145618: am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
Implement SDK add-ons in the build system.
- Add an option to use the standard javadoc doclet instead
of droiddoc, since droiddocs non-sdk templates aren't
ready for prime time.
- Add the notion of a stubs for a library. It's only
implemented for java libraries, but when we do native
libraries in the NDK or sdk-addons, it will work there too.
Original author: joeo
Merged from: //branches/cupcake/...

Automated import of CL 145618
akefile
lear_vars.mk
efinitions.mk
roiddoc.mk
nvsetup.mk
ava.mk
roduct.mk
roduct_config.mk
asks/sdk-addon.mk
ef09681e42fc693d5e3e800467d73e6021172bd9 10-Apr-2009 Dave Bort <> AI 145576: Probe for the proper sed(1) extended regex switch

Automated import of CL 145576
roduct_config.mk
15ca0bd5d0a028fd8e42f72a45f17d8e1ee67485 09-Apr-2009 Joe Onorato <> AI 145512: SDK add-on updates
- rename the directory and zip file
- make it build to the dist directory

Automated import of CL 145512
akefile
ain.mk
asks/sdk-addon.mk
a9cc3ca8be0f2187a70f9f57a419e7236096880a 09-Apr-2009 Joe Onorato <> AI 145373: remove a debugging printf that sometimes breaks the build
because the commandline is too long

Automated import of CL 145373
roiddoc.mk
8bbfe659d76266a8d45e19793d22e34dccfe6610 09-Apr-2009 Joe Onorato <> AI 145333: Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
Implement SDK add-ons in the build system.
- Add an option to use the standard javadoc doclet instead
of droiddoc, since droiddocs non-sdk templates aren't
ready for prime time.
- Add the notion of a stubs for a library. It's only
implemented for java libraries, but when we do native
libraries in the NDK or sdk-addons, it will work there too.

Automated import of CL 145333
akefile
lear_vars.mk
efinitions.mk
roiddoc.mk
nvsetup.mk
ava.mk
roduct.mk
roduct_config.mk
asks/sdk-addon.mk
e34380bea421dcc47bc7df4be74353dbf9f36e06 08-Apr-2009 Jean-Baptiste Queru <jbq@google.com> revert prelink map to match OpenCORE 1.0
relink-linux-arm.map
be8708351ad8de18d7f38590bccc10ef6610db42 31-Mar-2009 Ravi K Yenduri <yenduri@pv.com> Enable OpenCORE on master - part 3
onfig.mk
8f9b9d52fd3f1016093b60b6b138b7db7952d992 07-Apr-2009 Xavier Ducrohet <> Merge branch 'readonly-p4-master'
f3e79f904198f69ca2a954c4750a174c41d1c7a2 07-Apr-2009 Xavier Ducrohet <> AI 144767: am: CL 144765 am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
Merged from: //branches/cupcake/...
Original author: android-build

Automated import of CL 144767
ain.mk
6a769427c85343e85fe733b1a7c6115b3c8ef291 07-Apr-2009 Xavier Ducrohet <> AI 144765: am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
Merged from: //branches/cupcake/...

Automated import of CL 144765
ain.mk
f39ac4218bbe3a0e07738d92675b23cad6484b63 07-Apr-2009 Xavier Ducrohet <> AI 144764: Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
BUG=1761105

Automated import of CL 144764
ain.mk
57d1b2441458ee3dbcc7f8b12052c7f5427bc8b6 06-Apr-2009 Android Code Review <code-review@android.com> Merge change 9452

* changes:
Ensure that /system/etc/vold.conf is created in the "generic" product. This is necessary to let the emulator mount SD Card images properly through the "vold" mounting daemon
d47804e929eaa69a41f04a5acb7aed1dfbfb4388 03-Apr-2009 Sean McNeil <sean.mcneil@windriver.com> Provide LOCAL_DIR as some product variables might need a reference directory (i.e. PRODUCT_COPY_FILES).

Change from LOCAL_DIR to LOCAL_PATH
ode_fns.mk
d9290f2a0f8c1549507b510ca7d17bf2249f4ce5 02-Apr-2009 Doug Zongker <> Merge branch 'readonly-p4-master'
32a27c85770ccf823e6383ddeec5104a8e7f3c2d 02-Apr-2009 Doug Zongker <> AI 144157: Manually integrate 144143 from donut to fix build.

Automated import of CL 144157
akefile
06f93798f4332447f00245f382633696c2cabfe3 02-Apr-2009 Doug Zongker <> Merge branch 'readonly-p4-master'
7cb8e199b45659489c0073d0aecae75d07f92710 02-Apr-2009 Doug Zongker <> AI 144132: am: CL 144130 Don't build OTA package keys into the recovery binary; read
them from an external file in the recovery image. Use the
test-keys for all builds.
Original author: dougz
Merged from: //branches/donutburger/...

Automated import of CL 144132
akefile
roduct_config.mk
934de9b7586940d70bad31cb218c211505183048 02-Apr-2009 Doug Zongker <> AI 144143: Define OTA_PUBLIC_KEYS to be the test keys in the otapackage
target as well.

Automated import of CL 144143
akefile
17c83cf22c426c628b4b21bc65128a0d80866d31 02-Apr-2009 Doug Zongker <> AI 144130: Don't build OTA package keys into the recovery binary; read
them from an external file in the recovery image. Use the
test-keys for all builds.

Automated import of CL 144130
akefile
roduct_config.mk
ff2c9deb7966f79572d502a7048a3e6f0f9939b8 01-Apr-2009 David 'Digit' Turner <digit@android.com> Ensure that /system/etc/vold.conf is created in the "generic" product.
This is necessary to let the emulator mount SD Card images properly through the "vold" mounting daemon
ain.mk
3c9e08a9ffc899e6082022328f8a28d5cb043401 01-Apr-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'goog/readonly-p4-master'
d9b64e1350fabfeac1c4d31c7a773302be01b3bf 01-Apr-2009 Raphael Moll <> AI 143880: am: CL 143879 am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...

Automated import of CL 143880
ain.mk
a401b054a44c3ee72912542d66d41293bdb33b65 01-Apr-2009 Raphael Moll <> AI 143879: am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
Merged from: //branches/cupcake/...

Automated import of CL 143879
ain.mk
e340277c06a67db89d1de1205a8014ee871de2c2 01-Apr-2009 Raphael Moll <> AI 143876: Include hprof-conv in SDK (bug #1640225)
BUG=1640225

Automated import of CL 143876
ain.mk
452c5b35e29bc5fa05f7cbb3d72ff2e7b979eee9 31-Mar-2009 Ravi K Yenduri <yenduri@pv.com> Enable OpenCORE on master - part 3
onfig.mk
e3a08f2a1fb16b4b734ebf26b6253154bc7ac649 27-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Fix build: disable OpenCORE by default.

Fixes http://b.android.com/2308

This is not meant to be a permanent fix, but since everyone except
a handful of people need this, it's easier to set it for everyone
and have that handful of people unset is locally than to force
everyone to make a local tweak.
onfig.mk
3eb9e181591db8802cecbf44be7621d7513f78f7 27-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Fix build: disable OpenCORE by default.

Fixes http://b.android.com/2308

This is not meant to be a permanent fix, but since everyone except
a handful of people need this, it's easier to set it for everyone
and have that handful of people unset is locally than to force
everyone to make a local tweak.
onfig.mk
8ac438f110d0d6b9a9a8acbf59aa35d7f379a22f 29-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'open_source' into google_internal

Conflicts:
core/build_id.mk
1379256b551751a8c9d6d69a2b33794f2dbf80c7 27-Mar-2009 The Android Open Source Project <initial-contribution@android.com> Merge commit 'korg/cupcake'
35354dc7542fc3efc643e69aa8bcc2bd8172408b 26-Mar-2009 Eric Fischer <> Automated import from //branches/donutburger/...@142719,142719
leanbuild.mk
ynamic_binary.mk
relink-linux-arm.map
7bbec3ab9708d1d1cb578479a582d6f8d12de230 26-Mar-2009 Eric Fischer <> Automated import from //branches/master/...@142758,142758
leanbuild.mk
ynamic_binary.mk
relink-linux-arm.map
436aefc2d01553648ec67d40b742a533ecc4739e 25-Mar-2009 Eric Fischer <> Automated import from //branches/cupcake/...@142639,142639
leanbuild.mk
ynamic_binary.mk
relink-linux-arm.map
b7990f700b77cf945b6c38af3fdbadce4d626a1f 24-Mar-2009 Fredrik Markström <fredrik.markstrom@gmail.com> Modify linux-arm.mk to support the armv4t architecture instead of armv4.
armv4 was only implemented on StrongArm and Arm8 (See http://en.wikipedia.org/wiki/ARM_architecture)
and will be more difficult to support since it does not support the bx instruction.
armv4t on the other hand is used in a wide range of cpu:s.
armv4 is also not supported by bionic or dalvik, but armv4t is.

Thumb-mode is not yet enabled since there are some unresolved abi-issues.
ombo/linux-arm.mk
4bb2b38d7d30b2d87ed35c4f892d1bf4bbef883e 25-Mar-2009 Sriram Raman <> Automated import from //branches/master/...@142411,142411
akefile
ersion_defaults.mk
7b64124f0baabfa7216727a03e23fa1330fc6fad 25-Mar-2009 Sriram Raman <> Automated import from //branches/donutburger/...@142410,142410
akefile
ersion_defaults.mk
867c51aa33e601cbca4321b2d94a9a3ca6e21eaa 25-Mar-2009 Dave Bort <> Automated import from //branches/master/...@141763,141763
roduct_config.mk
d14f6d92d4284ea54520bb29f21411e892ba43ed 25-Mar-2009 Dave Bort <> Automated import from //branches/donutburger/...@141759,141759
roduct_config.mk
09591102d0ee841119be3744698c86b4a0a7d1f3 25-Mar-2009 Sriram Raman <> Automated import from //branches/cupcake/...@142409,142409
akefile
ersion_defaults.mk
bd46b21c31463701b6a38fda70c70b5394c1bf9d 25-Mar-2009 Joe Onorato <> Automated import from //branches/donutburger/...@140982,140982
ava.mk
1e7b6d490b9fa75838f9b37cd84adcfc02ea887e 25-Mar-2009 Joe Onorato <> Automated import from //branches/master/...@140984,140984
ava.mk
0c56ccb7cca8c67327496102273793922a3c823e 25-Mar-2009 Sriram Raman <> Automated import from //branches/cupcake/...@141670,141670
uild_id.mk
14c8a23990d8cfd35101023a03c65a3a821965c4 25-Mar-2009 Sriram Raman <> Automated import from //branches/cupcake/...@141669,141669
uild_id.mk
b87fef6336c180077e7941d39e26f94a8d69c480 20-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@141571
uild_id.mk
ava.mk
1fc1b4b05c31b222b31edd425af99bec1933c7d4 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import //branches/master/...@140412
uild_id.mk
a7e72e17dfed8adf5905ccc1b0245460727f53aa 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import //branches/donutburger/...@140359
uild_id.mk
f122bec404e695a2306dc23dd2c05d85f51ca1ba 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
uild_id.mk
ccf4b83b029e9463b3d5c6605d1c202aa0283f22 19-Mar-2009 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake' into cupcake_to_master

Conflicts:
core/prelink-linux-arm.map
6bce2058567443a02cf80ee3692ff97139b63579 13-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@138607
uild_id.mk
ain.mk
fdd3a1020cc63c9f2440f3cff814318d11d6c773 11-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137873
rmelf.x
rmelf.xsc
ain.mk
asks/cts.mk
93f49670cf102321eade94a7e5371a1d73202443 10-Mar-2009 Ravi K Yenduri <yenduri@pv.com> Allow prebuilt libraries and the associated makefile to be in
different directories.
ulti_prebuilt.mk
2f31293ba78695cb48ac5a1cab835197ace58d47 09-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137197
ase_rules.mk
ain.mk
ackage.mk
roduct_config.mk
asks/cts.mk
6a5f7f068b54c5cc083a3e8224c010060aab24e9 05-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@136594
ombo/linux-arm.mk
ode_fns.mk
roduct.mk
asks/cts.mk
asks/product-graph.mk
88b607994a148f4af5bffee163e39ce8296750c6 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
akefile
picheck_msg_current.txt
picheck_msg_last.txt
rmelf.x
rmelf.xsc
rmelflib.x
ase_rules.mk
inary.mk
uild_id.mk
hecktree
leanbuild.mk
lear_vars.mk
ombo/darwin-x86.mk
ombo/javac.mk
ombo/linux-arm.mk
ombo/linux-x86.mk
ombo/select.mk
ombo/target_linux-x86.mk
ombo/windows-x86.mk
onfig.mk
opy_headers.mk
efinitions.mk
evice.mk
istdir.mk
roiddoc.mk
ynamic_binary.mk
nvsetup.mk
xecutable.mk
ilter_symbols.sh
ind-jdk-tools-jar.sh
ost_executable.mk
ost_java_library.mk
ost_prebuilt.mk
ost_shared_library.mk
ost_static_library.mk
ava.mk
ava_library.mk
ey_char_map.mk
ain.mk
ulti_prebuilt.mk
ode_fns.mk
otice_files.mk
ackage.mk
athmap.mk
rebuilt.mk
relink-linux-arm.map
rocess_wrapper.sh
rocess_wrapper_gdb.cmds
rocess_wrapper_gdb.sh
roduct.mk
roduct_config.mk
aw_executable.mk
aw_static_library.mk
oot.mk
hared_library.mk
tatic_java_library.mk
tatic_library.mk
asks/apicheck.mk
asks/cts.mk
asks/localize.mk
ersion_defaults.mk
05806d7af62e07c6225b2e7103a1b115ecf6c9ad 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
akefile
picheck_msg_current.txt
picheck_msg_last.txt
rmelf.x
rmelf.xsc
rmelflib.x
ase_rules.mk
inary.mk
uild_id.mk
hecktree
leanbuild.mk
lear_vars.mk
ombo/darwin-x86.mk
ombo/javac.mk
ombo/linux-arm.mk
ombo/linux-x86.mk
ombo/select.mk
ombo/target_linux-x86.mk
ombo/windows-x86.mk
onfig.mk
opy_headers.mk
efinitions.mk
evice.mk
istdir.mk
roiddoc.mk
ynamic_binary.mk
nvsetup.mk
xecutable.mk
ilter_symbols.sh
ind-jdk-tools-jar.sh
ost_executable.mk
ost_java_library.mk
ost_prebuilt.mk
ost_shared_library.mk
ost_static_library.mk
ava.mk
ava_library.mk
ey_char_map.mk
ain.mk
ulti_prebuilt.mk
ode_fns.mk
otice_files.mk
ackage.mk
athmap.mk
rebuilt.mk
relink-linux-arm.map
rocess_wrapper.sh
rocess_wrapper_gdb.cmds
rocess_wrapper_gdb.sh
roduct.mk
roduct_config.mk
aw_executable.mk
aw_static_library.mk
oot.mk
hared_library.mk
tatic_java_library.mk
tatic_library.mk
asks/apicheck.mk
asks/cts.mk
asks/localize.mk
ersion_defaults.mk
094268cf8cb37b9d904c8a1e3559cdd46d73cf66 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@132589
akefile
leanbuild.mk
efinitions.mk
ain.mk
relink-linux-arm.map
asks/cts.mk
a9b22497534d404bf956cdcc0941e20057219a2a 03-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@137055
akefile
leanbuild.mk
efinitions.mk
ain.mk
relink-linux-arm.map
asks/cts.mk
8c3ad517eb4621e5b9aa788d0745dd70941baf01 24-Feb-2009 Garret Pick <pickgr@pv.com> OpenCORE 2.1 update
relink-linux-arm.map
4d23ccc023c8b98eb97a7cce820aa80bff2f3522 20-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132569
akefile
leanbuild.mk
ombo/darwin-x86.mk
ombo/linux-x86.mk
ain.mk
roduct_config.mk
41977d7cd2f0676a1b135a0991545721d6dce3ef 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
akefile
ain.mk
asks/apicheck.mk
dca10d536dc63f1901fa37fbb823cc6f8f6365a3 13-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@131421
asks/cts.mk
475fa12adef8fc2b08290555a33dc8a9fef05be4 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
akefile
uild_id.mk
leanbuild.mk
onfig.mk
istdir.mk
ain.mk
ackage.mk
relink-linux-arm.map
roduct.mk
roduct_config.mk
asks/cts.mk
ersion_defaults.mk
4cf7606d7ea96bd7f40c4320bceff462005441e8 30-Jan-2009 Angus Lees <alees@google.com> Remove bashism from find-jdk-tools-jar.sh
ind-jdk-tools-jar.sh
aeb2fa61cfaf660b509c3b3e13f6059ff7672c59 22-Jan-2009 Brock Atchison <batchison@pv.com> Changes required to accommodate OpenCORE 2.0
relink-linux-arm.map
b33e7b0cb085a1937c1a2e5b81eb78d6059bf6bc 22-Jan-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'cupcake'
35cfb08c588ba0af98ad0845ced6a9eeeeca4054 22-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127436
akefile
ain.mk
d58b8f6065266e370ad0efec2c2eec2b71be0e53 20-Jan-2009 Jean-Baptiste Queru <jbq@google.com> Update the current.xml error message.

The previous message contained some perforce-isms that aren't applicable
in the git world.
picheck_msg_current.txt
e914857b89f5b78aabdc8f0e644734541783eb2c 20-Jan-2009 The Android Open Source Project <initial-contribution@android.com> Merge branch 'cupcake'
ed18741e07c5e344ff3375a293100ffb29f19b51 20-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@127101
akefile
efinitions.mk
ackage.mk
0c2b8bfb87532631e9b3ecd1896ec30c01391b7e 16-Jan-2009 android-build SharedAccount <android-build@undroid16.corp.google.com> Merge branch 'cupcake'
66339ad5cebeae8f4cbf7e335c67368abbb91223 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
akefile
ase_rules.mk
lear_vars.mk
onfig.mk
efinitions.mk
ava.mk
ain.mk
ackage.mk
athmap.mk
relink-linux-arm.map
roduct.mk
roduct_config.mk
45bf3d242467b41e1bc04d8c75a688b8948b67b1 14-Jan-2009 Sriram Raman <sriramkraman@google.com> Fix make dist to create img and other zip files on master.
ain.mk
70b813ec57a5b4042a62e69cac5b77015f0110e4 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
4f85cc54b3347e00e32a07cae4fd5473987b71af 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
ombo/javac.mk
ombo/linux-arm.mk
onfig.mk
efinitions.mk
ain.mk
athmap.mk
asks/apicheck.mk
179d2bf01ac59314cafc185fa339c3b905098550 19-Dec-2008 Jean-Baptiste Queru <jbq@google.com> Merge commit 'remotes/korg/cupcake'

Conflicts:
core/api/1.xml
core/api/current.xml
core/main.mk
dcc08f073b6873c69ab891d4f69f7c568e282df7 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
akefile
pi/1.xml
pi/current.xml
picheck_msg_current.txt
ase_rules.mk
inary.mk
uild_id.mk
lear_vars.mk
ombo/javac.mk
ombo/linux-x86.mk
ombo/select.mk
ombo/target_linux-x86.mk
onfig.mk
efinitions.mk
istdir.mk
nvsetup.mk
ava.mk
ain.mk
ackage.mk
athmap.mk
relink-linux-arm.map
roduct.mk
roduct_config.mk
aw_executable.mk
hared_library.mk
asks/apicheck.mk
asks/cts.mk
asks/localize.mk
ersion_defaults.mk
d3aa4000e42fd1036e0e3286843c5132f905d754 21-Nov-2008 Jean-Baptiste Queru <jbq@google.com> Reflect the change in the original media.AudioSystem API so that API-validation continues to work
pi/1.xml
pi/current.xml
d1fa901ebb59a5042e9597d8975689919363770d 21-Nov-2008 Jean-Baptiste Queru <jbq@google.com> Reflect the change in the original media.AudioSystem API so that API-validation continues to work
pi/1.xml
pi/current.xml
6942cfff6c694865fa27fba50ea91bfd62f218bb 19-Nov-2008 Dave Bort <dbort@android.com> Fix "make dist"

Remove a dependency on the OTA package for now.
ain.mk
7572f52897146d6435db7bdcbc05f3f6559e207a 04-Nov-2008 Dave Bort <dbort@android.com> Install apns-conf_sdk.xml if no other apns-conf.xml is specified

This should make data work in generic emulator builds.
ain.mk
e03f0237f7ca3394b25db78cc5ec3357517c12cf 30-Oct-2008 Ben Leslie <ben.leslie@gmail.com> This is the first set of build system changes to support
architecture versions other than ARMv5TE.

The general approach is to provide TARGET_ARCH_VERSION, to complement
TARGET_ARCH. This defaults to the current armv5te. The variable
values should match the architectures as defined by gcc.

There is a block of defines for each supported architecture version
(currently ARMv5TE and ARMv4). Each block defines a set of features
using ARCH_ARM_HAVE_<x> variables. It also specifies a set of c
preprocessor defines to pass to the compiler. Finally it defines a
default CPU. (As for architecture versions, the default CPU should
match a CPU that gcc knows about.)

Support is added for architectures that do not support THUMB. Specifically
we change the 'thumb compile' target to simply compile as ARM code
instead, and we change the interworking flag passed to the compiler.

Finally, we ensure that the system/core/include/arch/linux-arm directory
is added to the default include path, which allows the use of asm/macros.h
header file described in review #1626. The way in which this done is
considerably unclean/hacky, if someone can suggest a better way please
let me know.
ombo/linux-arm.mk
d858fe8e02e6b25c1ea229864d743176c4ac9362 28-Oct-2008 Bill Napier <napier@google.com> Changed dexpreopt/Config.mk to use new (correct) path.
akefile
8c1fc1a3b86350f8b83bae0810ebd51f95d73365 25-Oct-2008 Jeff Hamilton <jham@android.com> Fix the build by hand apling JBQs current.xml change because my attempt to merge failed.
pi/current.xml
6dbec6f8447b5c33786edc0d41fabf822fac84d8 25-Oct-2008 Brian Swetland <swetland@google.com> revive the TINY_ANDROID build option

- update core/main.mk to include the right top-level directories
- disable tasks/apicheck.mk in TINY_ANDROID builds to prevent failure
ain.mk
asks/apicheck.mk
3c9065eeaa8722f151cbc2b300955ed210e8f304 24-Oct-2008 Jeff Hamilton <jham@android.com> Fix the build with a proper current.xml API file.
pi/current.xml
2303bf0499d66bdbef54181c3fd5306b507ef1b2 24-Oct-2008 Joe Onorato <joeo@android.com> add build system design doc
uild-system.html
a2121e9247422d1c50af70b34f559cba8890fd53 24-Oct-2008 Joe Onorato <joeo@android.com> ftb (fix the build)
pi/current.xml
128ce209ba461583d7abe66d5865293f1391bfc2 23-Oct-2008 Cliff Spradlin <cliff_spradlin@htc.com> Added broadcasts for external power events.
pi/current.xml
3caa7cfa04804479481e5042bfe9b57d1478a9b6 22-Oct-2008 Rod Whitby <rod@whitby.id.au> Detect a missing javac and provide a slightly more helpful error message.

Note the hyphens in the error message are required because the output of
this scripts is used directly in a Makefile target.

Signed-off-by: Rod Whitby <rod@whitby.id.au>
ind-jdk-tools-jar.sh
b6c1cf6de79035f58b512f4400db458c8401379a 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
akefile
pi/1.xml
pi/current.xml
picheck_msg_current.txt
picheck_msg_last.txt
rmelf.x
rmelf.xsc
rmelflib.x
ase_rules.mk
inary.mk
uild_id.mk
hecktree
leanbuild.mk
lear_vars.mk
ombo/darwin-x86.mk
ombo/javac.mk
ombo/linux-arm.mk
ombo/linux-x86.mk
ombo/select.mk
ombo/windows-x86.mk
onfig.mk
opy_headers.mk
efinitions.mk
evice.mk
istdir.mk
roiddoc.mk
ynamic_binary.mk
nvsetup.mk
xecutable.mk
ilter_symbols.sh
ind-jdk-tools-jar.sh
ost_executable.mk
ost_java_library.mk
ost_prebuilt.mk
ost_shared_library.mk
ost_static_library.mk
ava.mk
ava_library.mk
ey_char_map.mk
ain.mk
ulti_prebuilt.mk
ode_fns.mk
otice_files.mk
ackage.mk
athmap.mk
rebuilt.mk
relink-linux-arm.map
rocess_wrapper.sh
rocess_wrapper_gdb.cmds
rocess_wrapper_gdb.sh
roduct.mk
roduct_config.mk
aw_executable.mk
aw_static_library.mk
oot.mk
hared_library.mk
tatic_java_library.mk
tatic_library.mk
asks/apicheck.mk
asks/localize.mk
ersion_defaults.mk