openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
12,242 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

2972 Commits

Author SHA1 Message Date
Ying Wang 989d211b68 am f99f5e89: am d0b1977f: am 0138951e: Collapse multiple --extra-packages into one. 
* commit 'f99f5e89a15cada28dc692a5a7ce3413bdd965b4':
  Collapse multiple --extra-packages into one.
 2012-11-08 15:43:13 -08:00
Ying Wang 95221cac12 Collapse multiple --extra-packages into one. 
Change-Id: Icbdd56fa104c03e0a6cc58e441e60286a7f25bb2
 2012-11-08 10:46:49 -08:00
Elliott Hughes 334423b749 am d125adca: am ef9744f7: Merge "Remove manual WITH_JIT setting from build/." 
* commit 'd125adca42283777f08abae3171623048fa94b8a':
  Remove manual WITH_JIT setting from build/.
 2012-11-07 18:36:33 -08:00
Elliott Hughes d125adca42 am ef9744f7: Merge "Remove manual WITH_JIT setting from build/." 
* commit 'ef9744f7ee4fd2315f41c58ba48906d9d79363dd':
  Remove manual WITH_JIT setting from build/.
 2012-11-07 18:31:35 -08:00
Ying Wang f99f5e89a1 am d0b1977f: am 0138951e: Collapse multiple --extra-packages into one. 
* commit 'd0b1977f7d12736a99a99893061948c622b5d8f3':
  Collapse multiple --extra-packages into one.
 2012-11-07 16:33:08 -08:00
Ying Wang 0138951eaf Collapse multiple --extra-packages into one. 
Change-Id: Icbdd56fa104c03e0a6cc58e441e60286a7f25bb2
 2012-11-07 14:07:34 -08:00
Elliott Hughes 07a6db8733 Remove manual WITH_JIT setting from build/. 
This is now done automatically by dalvik/, since
patch 272a54f8553e13b87bf819542ddc6701fc1232cc.

Change-Id: I57709538f20188417c014630442e897401d7ace0
 2012-11-06 16:41:52 -08:00
Nick Sanders 1a849d4f2e am 278dbf3c: am 9af26ddd: Merge "Disable factory build under PDK" into jb-mr1-aah-dev 
* commit '278dbf3c6be3ba3149190823ea1028667059a24d':
  Disable factory build under PDK
 2012-11-02 18:51:39 -07:00
Nick Sanders 278dbf3c6b am 9af26ddd: Merge "Disable factory build under PDK" into jb-mr1-aah-dev 
* commit '9af26dddb39e5d87c8a455eb462eb3039e45ad69':
  Disable factory build under PDK
 2012-11-02 18:48:59 -07:00
Nick Sanders a1712eea02 Disable factory build under PDK 
Phantasm PDK support doesn't work with the factory build.
It's not needed for eng support so we'll disable it.

Change-Id: I9b65cdbb20bbcff601600d6b0cac7cc98f6f614c
Signed-off-by: Nick Sanders <nsanders@google.com>
 2012-11-02 12:55:56 -07:00
Ying Wang 3d5f399d87 Merge "NOTICE file only module" 2012-11-02 09:27:11 -07:00
Ying Wang 13d6950ef8 NOTICE file only module 
To pick up a NOTICE file in LOCAL_PATH and attach it to
/system/lib/libfoo.so, use the following syntax:

include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := NOTICE_FILES
LOCAL_INSTALLED_MODULE := $(PRODUCT_OUT)/system/lib/libfoo.so
include $(BUILD_NOTICE_FILE)

Bug: 7460213
Change-Id: Ie692be72deab37be04d1b578578c131a0885a090
 2012-11-01 17:29:10 -07:00
Tim Murray bad8550ccc Merge "Add support for RS in C++." 2012-11-01 15:32:20 -07:00
Tim Murray a7aa8005d2 Add support for RS in C++. 
Change-Id: Ib8008d6301584bd0a2cd91c4c1294e0df8ac3b73
 2012-11-01 15:07:27 -07:00
Ying Wang 92cd50c416 Remove nonexistent modules from PRODUCT_PACKAGES 
and revert back to fatal error if sdk has nonexistent modules.

Change-Id: Ic7185128b0253b3591592b4167ea1e26cee1aa84
 2012-10-31 11:55:53 -07:00
Joe Onorato c9b12129b4 am 9a6a326c: Fix broken dependencies with the layers.txt files. 
* commit '9a6a326ccd975af6aa27f5d4043dfd04d85f9c16':
  Fix broken dependencies with the layers.txt files.
 2012-10-26 18:16:39 -07:00
Joe Onorato 9a6a326ccd Fix broken dependencies with the layers.txt files. 
When a device java module was using the layers.txt files, and that device java module depenended on
a host java module, when building the host java module, the layer checker tried to run and would
fail, complaining about the host module.

The problem was that since the value wasn't set for the host module, it would be inherited from its
dependent module (a make "feature") and would cause the layer checker to run.  So this change makes
it explicitly set PRIVATE_JAVA_LAYERS_FILE for host java modules too.

Change-Id: Ifbc085295d0995a2da5d6d63d8cb379ef2631cc4
 2012-10-26 16:38:14 -07:00
Joe Onorato 47c4d6d096 Fix broken dependencies with the layers.txt files. 
When a device java module was using the layers.txt files, and that device java module depenended on
a host java module, when building the host java module, the layer checker tried to run and would
fail, complaining about the host module.

The problem was that since the value wasn't set for the host module, it would be inherited from its
dependent module (a make "feature") and would cause the layer checker to run.  So this change makes
it explicitly set PRIVATE_JAVA_LAYERS_FILE for host java modules too.

Change-Id: Ifbc085295d0995a2da5d6d63d8cb379ef2631cc4
 2012-10-26 16:35:56 -07:00
Ying Wang 84da5c55dd Filter out the overridden packages before doing required module expansion. 
Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
 2012-10-26 14:17:06 -07:00
Ying Wang 7bfda2c798 am 41824825: am 0d211eb9: Merge "Split to multiple bash commands." 
* commit '4182482522c15e8268605a4e903951072df4756d':
  Split to multiple bash commands.
 2012-10-26 10:57:24 -07:00
Ying Wang 4182482522 am 0d211eb9: Merge "Split to multiple bash commands." 
* commit '0d211eb9f4a2bb508f7c0cc649faf99b4815bfc7':
  Split to multiple bash commands.
 2012-10-26 10:54:52 -07:00
Ying Wang d9a88d585f Split to multiple bash commands. 
This can fix the error "/bin/bash: Argument list too long", if we get a
really long apk list.
Bug tracker Link: http://code.google.com/p/android/issues/detail?id=38937

Change-Id: I72258125c4297dfd9f8f502a96dbfa5a08f3cc50
 2012-10-26 09:40:07 -07:00
Mike Lockwood 0cbacc4b21 am 86e2fd92: am daf5e22d: Add new embedded target for a super minimal android build 
* commit '86e2fd9215faaffed47ab0373b2955d9a1892113':
  Add new embedded target for a super minimal android build
 2012-10-26 08:47:40 -07:00
Mike Lockwood 86e2fd9215 am daf5e22d: Add new embedded target for a super minimal android build 
* commit 'daf5e22dbac03e174e22c8209ed97c44c3a2a2c9':
  Add new embedded target for a super minimal android build
 2012-10-26 08:45:36 -07:00
Mike Lockwood daf5e22dba Add new embedded target for a super minimal android build 
Remove obsolete BUILD_TINY_ANDROID

Change-Id: Ic0f3a5b3250ea80529f5099653068f118a13b12e
 2012-10-25 15:28:37 -07:00
Torne (Richard Coles) 63afdc12d5 Use GYP instead of NONE as the module class for gyp. 
The Chromium makefile generator used to use module class NONE for the
meta-targets in the gyp files; this was changed to GYP in order to make
it more obvious where they come from in the build. Update the build
system's handling of NOTICE files to reflect this change.

Change-Id: Iff7d4487f3024ec83db0c2a896ec0caf8fb18b24
 2012-10-25 15:49:39 +01:00
Andrew Hsieh a5b28e2d92 am 267b07b2: am 7176e801: Merge "Add TARGET_GCC_VERSION" 
* commit '267b07b2aafede64d212402c3554fc2888821c98':
  Add TARGET_GCC_VERSION
 2012-10-23 17:29:45 -07:00
Andrew Hsieh 267b07b2aa am 7176e801: Merge "Add TARGET_GCC_VERSION" 
* commit '7176e8013bb2e563c3e3e56af4c04c50de3a7f37':
  Add TARGET_GCC_VERSION
 2012-10-23 17:15:01 -07:00
Andrew Hsieh 06b63baedc Add TARGET_GCC_VERSION 
Default to 4.6, but can overwritten to something else in
prebuilts/gcc/$os/$arch/$arch-linux-android*-$ver

Change-Id: I16f99d642b8ff8e831d392261a0c536041107051
 2012-10-23 12:06:01 +08:00
Nick Kralevich 24903f02c8 am 7c56556d: am d883749e: Merge "x86: add --warn-shared-textrel" 
* commit '7c56556d183c7103bdd58884071fdb134eb82956':
  x86: add --warn-shared-textrel
 2012-10-22 11:06:18 -07:00
Nick Kralevich 7c56556d18 am d883749e: Merge "x86: add --warn-shared-textrel" 
* commit 'd883749e600a34b5eb4db542d24946b25aa5c9fb':
  x86: add --warn-shared-textrel
 2012-10-22 11:04:24 -07:00
Joe Onorato 7aff0a751e am 0cf8969b: am 2e5d317c: make packages respect LOCAL_ADDITIONAL_DEPENDENCIES 
* commit '0cf8969bebcc40ee0ba1d720a4cc3c0003ac1265':
  make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
 2012-10-20 19:22:35 -07:00
Joe Onorato 537ea6be79 resolved conflicts for merge of 50462d67 to master 
Change-Id: I8652008641a3eb3bc98e0225d2a80997c11b1465
 2012-10-20 19:05:12 -07:00
Joe Onorato 0cf8969beb am 2e5d317c: make packages respect LOCAL_ADDITIONAL_DEPENDENCIES 
* commit '2e5d317c3ba36a7184b95cc77c87e116210ddc07':
  make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
 2012-10-20 19:00:08 -07:00
Joe Onorato 50462d67e9 am 8858d2a7: Add a tool to let you enforce layering between packages in a java module. 
* commit '8858d2a731f432786b7548b5f63ac93be81eb986':
  Add a tool to let you enforce layering between packages in a java module.
 2012-10-20 18:15:18 -07:00
Joe Onorato 2e5d317c3b make packages respect LOCAL_ADDITIONAL_DEPENDENCIES 
Change-Id: I2595040f77f8ebb4d7c89140394a6060f167aee5
 2012-10-20 18:13:57 -07:00
Joe Onorato 8858d2a731 Add a tool to let you enforce layering between packages in a java module. 
And build system support for it too.

Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
 2012-10-20 17:25:55 -07:00
Nick Kralevich 4f2f16da14 x86: 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)

Change-Id: I2d169c7ce3600d02e25591f3ec15aba363730298
References: http://www.akkadia.org/drepper/textrelocs.html
 2012-10-19 13:36:49 -07:00
Nick Kralevich 077007e872 arm: turn on -Wl,--fatal-warnings 
Third time's the charm.  :-)

In b238210c01, we added
-Wl,--warn-shared-textrel to TARGET_GLOBAL_LDFLAGS. This generated
a warning whenever we created a shared library with a text
relocation.  At the time, we wrote:
=====
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)
=====

All code which uses text relocations has either been fixed, or
we've temporarily worked around the issue so the code can still
compile.

Enable --fatal-warnings.

This reverts commit 942167dab8.

Change-Id: I578701692ead7e7cd60d73d2070a5bed366e2c6c
 2012-10-19 08:40:56 -07:00
Nick Kralevich 942167dab8 Revert "arm: turn on -Wl,--fatal-warnings" 
This reverts commit 3ab011bccd.
 2012-10-18 14:03:49 -07:00
Nick Kralevich 2f2afb93b7 Merge "arm: turn on -Wl,--fatal-warnings" 2012-10-18 13:33:31 -07:00
Nick Kralevich 3ab011bccd arm: turn on -Wl,--fatal-warnings 
In b238210c01, we added
-Wl,--warn-shared-textrel to TARGET_GLOBAL_LDFLAGS. This generated
a warning whenever we created a shared library with a text
relocation.  At the time, we wrote:
=====
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)
=====

All code which uses text relocations has either been fixed, or
we've temporarily worked around the issue so the code can still
compile.

Enable --fatal-warnings.

This reverts commit 4dc781657b.

Change-Id: I81b96477f1c11069637f28cfd8fb98d42b39be5e
 2012-10-18 12:03:30 -07:00
Ying Wang 057eba07b8 Use PRIVATE_WARNINGS_ENABLE 
Before this LOCA_WARNINGS_ENABLE never worked :-(

Change-Id: I129a0bbbbb68e4179454b0827b0b0d18d6de67a0
 2012-10-18 10:54:49 -07:00
Joe Onorato 0eccce99d7 Add a tool to let you enforce layering between packages in a java module. 
And build system support for it too.

Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
 2012-10-18 10:21:46 -07:00
Kenny Root a7fa6a4607 resolved conflicts for merge of 37868329 to master 
Change-Id: I437f42a7197d1716b4783749f2b27e19c8721395
 2012-10-16 17:41:33 -07:00
Kenny Root 37868329b2 am 2e0d1af7: Merge changes I58d43128,Ie34c958f 
* commit '2e0d1af767f64996f47de2a84b685ddcfa02e686':
  Remove HAVE_SELINUX guards, part 2
  Remove HAVE_SELINUX guard
 2012-10-16 17:34:42 -07:00
Nick Kralevich 4dc781657b Revert "arm: turn on -Wl,--fatal-warnings" 
This reverts commit edfee7250f.
 2012-10-16 13:51:02 -07:00
Kenny Root 92ca0197ed Remove HAVE_SELINUX guards, part 2 
Change-Id: I58d43128447ef3be0f70ff2479af2e61fe4c5849
 2012-10-16 13:43:08 -07:00
Nick Kralevich 118d9eff86 Merge "arm: turn on -Wl,--fatal-warnings" 2012-10-16 13:38:38 -07:00
Ying Wang e215ed52c6 Add BOARD_DONT_BUILD_USERDATA_IMG 
So board config can choose to not build userdata.img.

Change-Id: I1e6024abb7806492468801e49075fa24c05d2dd1
 2012-10-15 15:16:34 -07:00
Nick Kralevich edfee7250f arm: turn on -Wl,--fatal-warnings 
In b238210c01, we added
-Wl,--warn-shared-textrel to TARGET_GLOBAL_LDFLAGS. This generated
a warning whenever we created a shared library with a text
relocation.  At the time, we wrote:

=====
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)
=====

We've successfully removed all text relocations from Android's
compiled code, so turn on -Wl,--fatal-warnings .
Some pre-compiled shared libraries continue to have text relocations,
but they will be unaffected by this change.

Change-Id: I505ea23120048afc45f62593704fe1d6d26a352c
 2012-10-15 11:22:31 -07:00
Guang Zhu ea718cdb78 am 0f23979f: am 18daa175: Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev 
* commit '0f23979f29db6b46978b78da4db90df862ffb925':
  DO NOT MERGE: better late than never: fix build id for JB MR1
 2012-10-12 17:08:39 -07:00
Guang Zhu 0f23979f29 am 18daa175: Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev 
* commit '18daa1750ba31b510d07d0f65e8e8007ed90b902':
  DO NOT MERGE: better late than never: fix build id for JB MR1
 2012-10-12 17:06:21 -07:00
Guang Zhu 18daa1750b Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev 2012-10-12 17:04:58 -07:00
Ying Wang 9f31a2bc1b am 57dfd515: am 6a44471c: am abc9d6f2: Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev 
* commit '57dfd515c33bbab26c820c812ebb4bc69c36a38f':
  Delete the unused LOCAL_POST_PROCESS_COMMAND.
 2012-10-12 11:10:16 -07:00
Ying Wang 57dfd515c3 am 6a44471c: am abc9d6f2: Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev 
* commit '6a44471c3b295190125a8ba33a02ec8db3a6aba9':
  Delete the unused LOCAL_POST_PROCESS_COMMAND.
 2012-10-12 11:03:07 -07:00
Joe Onorato bd31f17333 am f9f6084a: Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries. 
* commit 'f9f6084aab34daf4ea7ddb697d84a8b147523763':
  Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
 2012-10-12 11:02:53 -07:00
Stephen Hines daf2ca50dd am d2637573: resolved conflicts for merge of ed38fe6f to jb-mr1-dev-plus-aosp 
* commit 'd26375733992298edc036652d25170e1cd7cbd49':
  Add support for building Filterscript files.
 2012-10-12 11:02:14 -07:00
Stephen Hines d263757339 resolved conflicts for merge of ed38fe6f to jb-mr1-dev-plus-aosp 
Change-Id: If699b3ccf1f3befd4df881e3eef6b90dd7c505bf
 2012-10-11 22:08:57 -07:00
Ying Wang 6a44471c3b am abc9d6f2: Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev 
* commit 'abc9d6f2beca88dbd0ec021d343c68f4b617216d':
  Delete the unused LOCAL_POST_PROCESS_COMMAND.
 2012-10-11 18:03:22 -07:00
Ying Wang abc9d6f2be Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev 2012-10-11 18:01:17 -07:00
Ying Wang cef217d0f1 am 97b56bb1: am 95d861ed: am 72405497: Convert to relative path for CleanSpec.mk 
* commit '97b56bb181910be250eceec966364fed245f5c6c':
  Convert to relative path for CleanSpec.mk
 2012-10-11 17:54:23 -07:00
Joe Onorato f9f6084aab Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries. 
(makes generating code easier)

Change-Id: I1e2e882f7805dbfe4b726955eddc5ff8bc3e0005
 2012-10-11 17:32:44 -07:00
Joe Onorato 71c0d6849f Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries. 
(makes generating code easier)

Change-Id: I1e2e882f7805dbfe4b726955eddc5ff8bc3e0005
 2012-10-11 17:29:59 -07:00
Ying Wang c58b194e78 Delete the unused LOCAL_POST_PROCESS_COMMAND. 
Change-Id: I77785dff6c7b2236880232522d6ed5bc01d5f0ce
 2012-10-11 17:26:07 -07:00
Stephen Hines 0a0cfe95ac Merge "Add support for building Filterscript files." into jb-mr1-dev 2012-10-11 17:25:21 -07:00
Ying Wang 97b56bb181 am 95d861ed: am 72405497: Convert to relative path for CleanSpec.mk 
* commit '95d861ed9beff9e55c3283c1fa47c84ac61fa546':
  Convert to relative path for CleanSpec.mk
 2012-10-11 17:12:05 -07:00
Stephen Hines 0ab6e3e6e6 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
 2012-10-11 15:29:10 -07:00
Ying Wang 7240549748 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
 2012-10-11 12:45:30 -07:00
Ying Wang 57ddcb1bbc 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
 2012-10-10 10:24:26 -07:00
Guang Zhu 9d37c68ead DO NOT MERGE: better late than never: fix build id for JB MR1 
Change-Id: Iaad3002693af683f719832d3c082e7e4dcbf8d29
 2012-10-09 18:45:31 -07:00
Ying Wang 15f116b2bb am 91fd1231: Support to build executables against the NDK 
* commit '91fd1231c3254bc9d0642e5a646b5657bdaedffa':
  Support to build executables against the NDK
 2012-10-08 14:21:37 -07:00
Ying Wang 91fd1231c3 Support to build executables against the NDK 
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).

Bug: 7170098
Change-Id: I4cebeae3355e79a4d2f2f5549ef0613ced77e3f0
 2012-10-08 14:12:41 -07:00
Keun young Park c0871e17c4 am 9dd65d33: am 0b82ffeb: am f6e6bf7e: add mip32 stuffs to clang\'s unknown flag list 
* commit '9dd65d33810b10e876dbe79d2940f1b04688bcc4':
  add mip32 stuffs to clang's unknown flag list
 2012-10-05 14:31:24 -07:00
Keun young Park 9dd65d3381 am 0b82ffeb: am f6e6bf7e: add mip32 stuffs to clang\'s unknown flag list 
* commit '0b82ffeb964bb4da7c7928d5b61c72579b6588b5':
  add mip32 stuffs to clang's unknown flag list
 2012-10-05 14:29:59 -07:00
Jean-Baptiste Queru 4bf886adbe am b8c037ba: Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building" 
* commit 'b8c037ba5f38fd734d89164c9583538104be1ecc':
  Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building
 2012-10-05 13:34:34 -07:00
Jean-Baptiste Queru b8c037ba5f Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building" 2012-10-05 13:32:11 -07:00
Keun young Park f6e6bf7edf 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
 2012-10-05 13:26:19 -07:00
Nick Kralevich 6b1ac2588a am 23025ecd: am f3b02739: am 7653519f: Merge "[MIPS] Makes a build system use PIE flag" 
* commit '23025ecdc0890e9262951627defda77e621fd9e8':
  [MIPS] Makes a build system use PIE flag
 2012-10-04 17:17:11 -07:00
Nick Kralevich 23025ecdc0 am f3b02739: am 7653519f: Merge "[MIPS] Makes a build system use PIE flag" 
* commit 'f3b02739a7abba7c8f4884d49553f8a9f3fcfaf8':
  [MIPS] Makes a build system use PIE flag
 2012-10-04 17:14:17 -07:00
Nick Kralevich f3b02739a7 am 7653519f: Merge "[MIPS] Makes a build system use PIE flag" 
* commit '7653519f4e9efaaef906d2e5d3b109909b6d45c7':
  [MIPS] Makes a build system use PIE flag
 2012-10-04 17:12:46 -07:00
Nick Kralevich 7653519f4e Merge "[MIPS] Makes a build system use PIE flag" 2012-10-04 16:07:47 -07:00
Ying Wang 4d19d2a35d am 195b0653: am 25f77e39: am af4299c5: Merge "Store vendor module owner info on the build server." into jb-mr1-dev 
* commit '195b0653a23545c22bf506ab67bc0674e885b936':
  Store vendor module owner info on the build server.
 2012-10-04 10:07:04 -07:00
Ying Wang 195b0653a2 am 25f77e39: am af4299c5: Merge "Store vendor module owner info on the build server." into jb-mr1-dev 
* commit '25f77e39bc49c3598aa2bc8e27719927a522ccbd':
  Store vendor module owner info on the build server.
 2012-10-04 10:05:00 -07:00
Ying Wang fb03fb3ec0 Store vendor module owner info on the build server. 
Bug: 7048854
Change-Id: I5f0653c71a77774978655f8b5570e170b4a9c4ec
 2012-10-03 17:52:51 -07:00
Elliott Hughes 0b89c64fc4 am 2d17b1ab: resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp 
* commit '2d17b1aba6ea529dc618d50c784f69fb7f1a8141':
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm
 2012-10-03 12:19:35 -07:00
Elliott Hughes 2d17b1aba6 resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp 
Change-Id: I66481eb8b269775716f79e42e9d89c2ebbd45288
 2012-10-03 12:13:38 -07:00
Elliott Hughes 01b2aaaa89 am 69a49f75: Merge changes I21eb93f3,I0be5e272,I158b0d7e 
* commit '69a49f75860b4849fd1c2fe68d97fa2243171131':
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm
 2012-10-03 11:55:24 -07:00
Ying Wang e37c3dc3f6 Build only modules required by the current product. 
Don't build modules_to_check by default.
Instead add "checkbuild" to the command line as a build goal, if you
want to build everything.
We can use the "checkbuild" goal to make sure some build targets on the
build server still build everything.

(cherry-pick of 5a88269ad6ed44fb163f96847954faac21292567.)

Bug: 7253452
Change-Id: I21eb93f3cb430c9531fe41a2f5d7b445c09938b9
 2012-10-03 10:27:31 -07:00
Ying Wang 0c4eb41885 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.

(cherry-pick of 157a5e1695593f935c3223430f4530e21f990378.)

Bug: 7186768,7169854
Change-Id: I0be5e2721efa66a80f112acf8f95e177ebc2f65b
 2012-10-03 10:27:08 -07:00
Ying Wang e113fb1d41 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.

(cherry-pick of 6ea58cb3dc564ce112b28f1a7c6936317168d931.)

Bug: 7186768
Change-Id: I158b0d7e4ecaa773ec3a336cd326e27ee8c26a88
 2012-10-03 10:26:36 -07:00
Conley Owens bda3f9427d am 9b962440: am 672b1893: am 8c37f49f: Merge "Follow symlinks when using find" 
* commit '9b962440b00591ba43dd05977299216d499c84da':
  Follow symlinks when using find
 2012-10-02 16:28:39 -07:00
Conley Owens 9b962440b0 am 672b1893: am 8c37f49f: Merge "Follow symlinks when using find" 
* commit '672b1893688be170fad79dd35c41236d7c0e36c0':
  Follow symlinks when using find
 2012-10-02 16:27:15 -07:00
Conley Owens 672b189368 am 8c37f49f: Merge "Follow symlinks when using find" 
* commit '8c37f49fd02d00b6371fb808d9a9dc836f565e02':
  Follow symlinks when using find
 2012-10-02 16:24:42 -07:00
Conley Owens f435739bac Follow symlinks when using find 
This allows more flexibility with symlinking subtrees within projects.
For example, a build bot with a read-only copy of the src can copy
directories which will be affected by applied patches while symlinking
to directories that will remain untouched.

Change-Id: I9c783180f3ebdd737d8daf17550f562e4f00b200
 2012-10-02 14:34:36 -07:00
Ian Rogers e88d5af2ab am 318330dd: am 9acbbf12: am 76a6dc3a: Fix common typo in comments, warning and error messages. 
* commit '318330dd920977733f20eeda338d3c36892373f6':
  Fix common typo in comments, warning and error messages.
 2012-10-01 17:28:18 -07:00
Ian Rogers 76a6dc3a19 Fix common typo in comments, warning and error messages. 
s/can not/cannot/g

Change-Id: I1bac31157732666deb46f6f20389ff539977ffb9
 2012-10-01 16:36:23 -07:00
Ying Wang d0244b395a Remove build variant "tests" 
Bug: 5368571
Now we have a phony target "tests" instead.
The target can be built in any other build variant (eg userdebug).
For example, "make PRODUCT-full-userdebug tests dist" will build and
put the *-test-* zip file in the dist dir.
The "tests" target will include all modules tagged as "tests" in
addition to other modules in specific target out directories.

Change-Id: I8383097380d8e6846c3e2107d6dd5f68788cfc39
 2012-10-01 10:18:40 -07:00
Ying Wang 2326a37e55 Merge "Build only modules required by the current product." 2012-09-28 15:59:55 -07:00
Ying Wang 54fa8c3ff9 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
 2012-09-28 15:08:12 -07:00
Ying Wang 5a88269ad6 Build only modules required by the current product. 
Don't build modules_to_check by default.
Instead add "checkbuild" to the command line as a build goal, if you
want to build everything.
We can use the "checkbuild" goal to make sure some build targets on the
build server still build everything.

Bug: 7253452
Change-Id: I84b62116131e85d1f32d58a424cdfd9d51fa9755
 2012-09-28 15:04:27 -07:00
Brian Carlstrom 3d5e58bea7 Merge "Support LOCAL_ADDITIONAL_DEPENDENCIES for java" 2012-09-28 11:28:48 -07:00
Ying Wang 7ace236862 Merge "Load only the current product config makefile." 2012-09-28 11:06:01 -07:00
Ying Wang f7592d987d Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev 2012-09-28 10:24:41 -07:00
Ying Wang 9cb3731a77 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
 2012-09-28 10:23:52 -07:00
Brian Carlstrom 6a68e77f51 Support LOCAL_ADDITIONAL_DEPENDENCIES for java 
Change-Id: Iac4b14b73e3c941b2d922e45f5698875c68134e1
 2012-09-28 10:13:30 -07:00
Dianne Hackborn ffdd3bcfca am 2e88b67d: am 0bc03946: Look, up in the sky! It\'s a bird! It\'s a plane! It\'s Android 4.2 API 17! 
* commit '2e88b67d0a5028788358e30d66870ef1ad4dd916':
  Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
 2012-09-28 00:35:27 -07:00
Ying Wang 157a5e1695 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
 2012-09-27 15:17:41 -07:00
Dianne Hackborn 0bc0394688 Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17! 
Change-Id: I577aa38525b23f297e3e2c4a745819ac87b24f6d
 2012-09-27 15:11:47 -07:00
Miroslav Ignjatovic f1e4df7265 [MIPS] Makes a build system use PIE flag 
Change-Id: I07be4e8ae559dca615b0c59a71d7363adab4f49b
 2012-09-27 13:59:15 -07:00
Ulas Kirazci 696923ac7f Merge "Rely only on NDK libs if built against the NDK." 2012-09-27 12:57:29 -07:00
Ulas Kirazci 478a3808f8 Rely only on NDK libs if built against the NDK. 
Change-Id: Icf0b690181669830d3b2d19aa5b7dd6815b44bfc
 2012-09-26 17:19:01 -07:00
Ying Wang 6ea58cb3dc 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
 2012-09-26 16:00:54 -07:00
Ying Wang c6ffc00b9f Support to build executables against the NDK 
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).

Bug: 7170098
Change-Id: I4cebeae3355e79a4d2f2f5549ef0613ced77e3f0
 2012-09-25 18:33:53 -07:00
Ying Wang b301817223 Don't install all host modules by default. 
Instead we should explicitly set up the dependency, if the module will
be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or
tests if the module is for testing; or add to PRODUCT_PACKAGES if it's
required by a product.

Change-Id: I326e97df6630dee4acc6582ce6cef2dec8289155
 2012-09-24 18:17:26 -07:00
Ying Wang 9394498a93 Merge "Clean up intermediate files for adbd and init in installclean." 2012-09-24 10:01:35 -07:00
Ying Wang 30d2deddb1 am 9766b73c: am f8f2b022: Ignore support library Proguard warning 
* commit '9766b73c8847d85341c18c8e217a28c8de57ba28':
  Ignore support library Proguard warning
 2012-09-24 08:49:05 -07:00
Ying Wang f8f2b022e9 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
 2012-09-23 13:46:58 -07:00
Ying Wang fab760549c Clean up intermediate files for adbd and init in installclean. 
They are really exceptions and we shouldn't do that in general.
Bug: 7170444

Change-Id: I7163181e495c52db9aa62a360309d8973df1985f
 2012-09-21 14:11:41 -07:00
Ying Wang 28521c810e am d4f85b6a: am 20a7c2c1: Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev 
* commit 'd4f85b6a2b213c59f9d95377bda6342c225ce1a8':
  Allow to tag owner to PRODUCT_COPY_FILES
 2012-09-20 20:30:58 -07:00
Zhihai Xu adeea83673 am 0ed78ec7: am d81b9d22: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev 
* commit '0ed78ec7c4b659a1b6b0bd5e39428f882411a0ff':
  ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
 2012-09-20 20:30:57 -07:00
Ying Wang 20a7c2c10d Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev 2012-09-20 17:12:01 -07:00
Zhihai Xu d81b9d220e Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev 2012-09-20 16:42:47 -07:00
Ying Wang 4b0486b4a6 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
 2012-09-20 16:37:55 -07:00
Ying Wang d6ff065b69 am a49a4d34: am 7884dfc6: Merge "Move AndroidConfig.h from system/core to the build project." into jb-mr1-dev 
* commit 'a49a4d3461fba91e9da0049863f812ddb8ffc8e2':
  Move AndroidConfig.h from system/core to the build project.
 2012-09-20 15:46:06 -07:00
Zhihai Xu 3849760809 ISSUE 6849488 Bluedroid stack, remove system/bluetooth. 
remove system/bluetooth stuff.

bug 6849488
Change-Id: I8eb85c6da0aa34aefda2916f2c74e5eae51da27e
 2012-09-20 10:50:56 -07:00
Ying Wang 5bdf305bbe 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
 2012-09-20 10:33:20 -07:00
Jean-Baptiste Queru a068907570 Update version number for AOSP master 
Change-Id: I5bc11420932d62a2f6bc12410fe7c8ac2dca069b
 2012-09-14 07:43:41 -07:00
Andrew Hsieh 907e1b7ffa am feec779e: am 5630521a: resolved conflicts for merge of 3e91f5ad to jb-mr1-dev 
* commit 'feec779ef44f5127b2da851823d840f3dbe9c931':
  Enable stack-protector for x86
 2012-09-12 17:03:41 -07:00
Benoit Goby 4b0c7230e6 am a52d50a2: am 063d0c5d: Merge "Add openssl to TINY_ANDROID build" into jb-mr1-dev 
* commit 'a52d50a235d07229ade4595e0551c1b0409c23be':
  Add openssl to TINY_ANDROID build
 2012-09-12 17:03:31 -07:00
Andrew Hsieh 5630521aba resolved conflicts for merge of 3e91f5ad to jb-mr1-dev 
Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db
 2012-09-12 15:27:59 -07:00
Andrew Hsieh 0f47a94d2e am 7e300d60: Merge "Enable stack-protector for x86" 
* commit '7e300d60bfc325e3cbf3e7656297c14109e513b8':
  Enable stack-protector for x86
 2012-09-12 14:20:11 -07:00
Andrew Hsieh 7e300d60bf Merge "Enable stack-protector for x86" 2012-09-12 13:44:01 -07:00
Benoit Goby bc2406e64c Add openssl to TINY_ANDROID build 
adb depends on it

Change-Id: I79f23315142b45bc7f9a2685fa2b9865b22396ad
 2012-09-11 17:25:05 -07:00
Ying Wang 6a6723a0a9 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.
 2012-09-11 12:12:23 -07:00
Ying Wang 6adcf0180a android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES. 
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
 2012-09-11 11:47:22 -07:00
Ying Wang d43fbfe783 am 23755396: am 55861069: am 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args" 
* commit '23755396f5c1d62103c8a6930e1bad63d26189f6':
  Add transform-d-to-p-args
 2012-09-10 17:14:21 -07:00
Ying Wang 5586106944 am 4595d7d6: am 410420ed: am 9efa5bae: Merge "Add transform-d-to-p-args" 
* commit '4595d7d62c0d594aa3501e4f547563348a3a5eb0':
  Add transform-d-to-p-args
 2012-09-10 10:25:41 -07:00
Ying Wang 410420ed66 am 9efa5bae: Merge "Add transform-d-to-p-args" 
* commit '9efa5bae8645988a0d24af14142df9572bf7bd57':
  Add transform-d-to-p-args
 2012-09-10 10:21:57 -07:00
Ying Wang c23f4efdbb 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
 2012-09-07 17:04:06 -07:00
Ying Wang 2594b9f2d9 am 2790ff11: am 76766114: am 19c06156: am 0ee362ea: am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES" 
* commit '2790ff11ec80345d3553b97ba57dd4225e563ac7':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
 2012-09-05 18:44:02 -07:00
Ying Wang 7676611415 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
 2012-09-05 18:39:55 -07:00
Ying Wang 0ee362ea04 am 478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES" 
* commit '478d0fc6a311b236fddc9d18c9a1b922f8ecf1ea':
  Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
 2012-09-05 18:35:50 -07:00
Ying Wang 619fccf9f3 Remove duplicate src:dest pairs in PRODUCT_COPY_FILES 
Before setting up the rules.

Change-Id: Ifedbc0e988895a899cae315dc730a152bae91ae2
 2012-09-05 18:09:49 -07:00
Doug Zongker 37c9f9dca8 am 037922ab: am 821a54a0: Merge "fix possible build break" into jb-mr1-dev 
* commit '037922abb5a1a3449f80edfe41ca2d66453d00fb':
  fix possible build break
 2012-09-04 14:53:25 -07:00
Doug Zongker 1a09726f68 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
 2012-09-04 14:45:11 -07:00
Ying Wang fb12f71fe7 am 18c8d9eb: am 3a6f7589: Add LOCAL_DONT_DELETE_JAR_META_INF 
* commit '18c8d9eb1e0c0776862d554f0834e7ee3018375a':
  Add LOCAL_DONT_DELETE_JAR_META_INF
 2012-08-30 14:16:31 -07:00
Ying Wang 3a6f7589e8 Add LOCAL_DONT_DELETE_JAR_META_INF 
To support to not delete META_INF directory from the static Java
libraries.

Change-Id: I720bfa059c43dd457a74a0c60bb6797aa408ecaf
 2012-08-30 12:59:42 -07:00
Andrew Hsieh c2fb2391f4 Enable stack-protector for x86 
Change-Id: I7a169075ca49ab831c37625d416c1d4b026bfec3
 2012-08-29 15:13:23 +08:00
Jean-Baptiste Queru f3ca2f3507 am 68d43bfd: am d4ace138: am 4dc6ed96: am 9eb87b8d: Merge "Add pattern to check for GCC 4.6" 
* commit '68d43bfd402a2dc63da91846972262fd3150d3d4':
  Add pattern to check for GCC 4.6
 2012-08-28 13:44:05 -07:00
Jean-Baptiste Queru 3ddaa04cb3 am 2c83b090: am d5096c6a: resolved conflicts for merge of 5c903372 to jb-mr1-dev 
* commit '2c83b09034d5be5369168697eab3e825ef13610d':
  Use gold linker on x86
 2012-08-28 13:44:03 -07:00
Jean-Baptiste Queru d4ace13802 am 4dc6ed96: am 9eb87b8d: Merge "Add pattern to check for GCC 4.6" 
* commit '4dc6ed96a0612d4693cca5ed5674873754bcb37e':
  Add pattern to check for GCC 4.6
 2012-08-28 13:41:09 -07:00
Jean-Baptiste Queru d5096c6a5c resolved conflicts for merge of 5c903372 to jb-mr1-dev 
Change-Id: I4994c77a6570ce654915bfb8c5f6ee4583db86b7
 2012-08-28 13:40:19 -07:00
Jean-Baptiste Queru 4dc6ed96a0 am 9eb87b8d: Merge "Add pattern to check for GCC 4.6" 
* commit '9eb87b8d2011e65462ea42de6899158cd35a492a':
  Add pattern to check for GCC 4.6
 2012-08-28 13:16:59 -07:00
Jean-Baptiste Queru 5c90337229 am 9e2b4718: Merge "Use gold linker on x86" 
* commit '9e2b4718a0e11a723904ba205a5156bae450be30':
  Use gold linker on x86
 2012-08-28 13:16:57 -07:00
Jean-Baptiste Queru 9eb87b8d20 Merge "Add pattern to check for GCC 4.6" 2012-08-28 12:47:34 -07:00
Ying Wang 6f4de4bd13 Allow Java resource in apk. 
Bug: 6892294
Change-Id: Ib7664e3d9e396dc8ccccecbae9103884014f3ddd
 2012-08-28 12:37:27 -07:00
Jean-Baptiste Queru 9e2b4718a0 Merge "Use gold linker on x86" 2012-08-28 12:27:21 -07:00
Evgeniy Stepanov e1d27e210f Split out ASFLAGS from CFLAGS in Clang config. 
Change-Id: I4e3fc3c737fd7c1baff7e30f01d2b26bda557f71
 2012-08-28 10:08:24 -07:00
Pavel Chupin b205b46153 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>
 2012-08-28 13:10:18 +04:00
Andrew Hsieh 26c7805781 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
 2012-08-28 10:49:05 +08:00
Ying Wang 8cd3113ee8 am 94aa427b: am 24559290: Keep the emma classes if emma is enabled. 
* commit '94aa427bc0c2893738e8d12f041f68490515517f':
  Keep the emma classes if emma is enabled.
 2012-08-27 16:21:28 -07:00
Ying Wang 245592908c Keep the emma classes if emma is enabled. 
Change-Id: Ie551d48532c61bf610b12875dc33cfe476625c5e
 2012-08-27 16:10:28 -07:00
Ying Wang 3e500c6356 Automatically add Java resources carried by static Java libraries. 
Bug: 6892294
Change-Id: I3ff71ee3d7b9ccdfde6a5284cc350864fbffa71f

Conflicts:

	core/package.mk
 2012-08-27 15:21:51 -07:00
Ben Cheng 50ad303126 am 0419b446: am 4df0782b: Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev 
* commit '0419b446598f0c3cbf46ef2f2973e043338ac988':
  Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.
 2012-08-27 12:32:32 -07:00
Ben Cheng 4df0782b3a Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev 2012-08-27 12:27:37 -07:00
Ben Cheng cc4822682e Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests. 
Bug 7050760

Change-Id: I05e69b741eaf628ab1d25dec12a953f9f2a3d9a2
 2012-08-27 12:20:36 -07:00
Jean-Baptiste Queru a02f5b9463 am 5cbda9a8: am 414d7e85: am dbf6ad06: am 713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs" 
* commit '5cbda9a80c23125ac1fa7d722d948fd59a79f793':
  ARM: put crtbegin_so.o at the beginning where it belongs
 2012-08-24 14:19:18 -07:00
Jean-Baptiste Queru 414d7e859a 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
 2012-08-24 13:06:42 -07:00
Jean-Baptiste Queru dbf6ad0692 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
 2012-08-24 13:04:48 -07:00
Jean-Baptiste Queru 713bac96d6 Merge "ARM: put crtbegin_so.o at the beginning where it belongs" 2012-08-24 13:00:10 -07:00
Ying Wang dceb47f2e2 am 4084c112: am 2d39468b: Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev 
* commit '4084c112e5d073bd0d6875c45939ed7fba62ed14':
  Filter out the overridden packages before doing required module expansion.
 2012-08-24 09:55:05 -07:00
Ying Wang 489458fa31 Filter out the overridden packages before doing required module expansion. 
Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
 2012-08-23 15:08:34 -07:00
Ying Wang 3ea0a81c2b am d19511a6: am c3a4cfe9: Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev 
* commit 'd19511a6657efc7f1a7e544df04f076223f8fe65':
  Support EMMA_INSTRUMENT in both full and unbundled builds.
 2012-08-22 15:27:37 -07:00
Ying Wang c3a4cfe9b5 Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev 2012-08-22 15:19:28 -07:00
Ying Wang af4800c8a6 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
 2012-08-22 12:11:01 -07:00
Jean-Baptiste Queru eb08c613fd am abe04492: am cd9668ed: am e3479ea5: am 15012c11: Merge "Build on Mac OS X : add experimental SDK versions" 
* commit 'abe0449287b8d7ab5066c579a5dd4263940499ab':
  Build on Mac OS X : add experimental SDK versions
 2012-08-22 10:00:37 -07:00
Jean-Baptiste Queru cd9668edd4 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
 2012-08-22 09:57:30 -07:00
Jean-Baptiste Queru e3479ea503 am 15012c11: Merge "Build on Mac OS X : add experimental SDK versions" 
* commit '15012c115dca7bc0d2edd8dd2689117546b1360e':
  Build on Mac OS X : add experimental SDK versions
 2012-08-22 09:55:25 -07:00
Jean-Baptiste Queru 15012c115d Merge "Build on Mac OS X : add experimental SDK versions" 2012-08-22 09:44:48 -07:00
Ying Wang 0ae743664b am 9ad6a1c5: am b3f83098: Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." into jb-mr1-dev 
* commit '9ad6a1c512bf0280c9db9e6f3f5b575fa9acf768':
  android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
 2012-08-21 13:49:44 -07:00
Ying Wang b3f83098ef Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." into jb-mr1-dev 2012-08-21 13:45:38 -07:00
Andrew Hsieh cd3050c541 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
 2012-08-21 12:58:45 -07:00
Ying Wang 02d75da447 android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES. 
Bug: 7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
 2012-08-21 11:54:49 -07:00
Keun young Park 8b40446646 am 5b2fb5e6: am 10c2ef5c: Merge "change target to androideabi" into jb-mr1-dev 
* commit '5b2fb5e6621e9375901fef04391dc15b2b98fcf6':
  change target to androideabi
 2012-08-21 11:26:12 -07:00
SangWook Han 691e0243ca Build on Mac OS X : add experimental SDK versions 
Change-Id: Ifc67d1745e72fc048cd6e8c8ef0521ab92468086
 2012-08-22 02:59:58 +09:00
Keun young Park 02a2f848b6 change target to androideabi 
- it should be androideabi instead of android
  external/llvm/lib/Support/Triple.cpp

Change-Id: Ied50f2dba930b402d000b5eb3b3ce5ef20731b8b
 2012-08-21 10:20:18 -07:00
Ard Biesheuvel 6c1f9ccfb1 ARM: put crtbegin_so.o at the beginning where it belongs 
Change-Id: I9466fe9277c58a7b8f8a9964b2d578a65e579995
 2012-08-21 10:42:32 +02:00
Andrew Hsieh 31ef1037bf 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
 2012-08-21 14:40:16 +08:00
Doug Zongker a7b3e66f28 am 7a4e83b2: am 85e86626: Merge "include recovery-resource.dat in /system/etc" into jb-mr1-dev 
* commit '7a4e83b235aeec6036440cb3b86311418f2e8c25':
  include recovery-resource.dat in /system/etc
 2012-08-20 15:50:18 -07:00
Doug Zongker 85e86626e9 Merge "include recovery-resource.dat in /system/etc" into jb-mr1-dev 2012-08-20 15:47:07 -07:00
Doug Zongker 565888726b 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
 2012-08-20 15:38:58 -07:00
Keun young Park 07720fd5d3 am 28066de6: am 397d2edb: Merge "add CLANG configurations for MIPS" into jb-mr1-dev 
* commit '28066de6a34e39e635a88f4e6f876f2f643e5dd7':
  add CLANG configurations for MIPS
 2012-08-20 09:45:04 -07:00
Keun young Park 397d2edbb9 Merge "add CLANG configurations for MIPS" into jb-mr1-dev 2012-08-20 09:36:11 -07:00
Andreas Makris ce7731af9f Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building 
This patch adds BOARD_CUSTOM_BOOTIMG_MK. It is needed for some devices like
Sony Xperia S (LT26) because it needs a own bootimg format.
If BOARD_CUSTOM_BOOTIMG_MK is not set the build will be done in the normal
way, so other devices are not affected.

Change-Id: I66c8be6b107988d3238001e1dc612c044ed01aaa
Signed-off-by: Andreas Makris <andreas.makris@gmail.com>
 2012-08-18 18:36:11 +02:00
Joe Onorato 5ad1d7ec00 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"
 2012-08-17 05:46:29 -07:00
Joe Onorato 726d921a47 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"
 2012-08-17 05:43:43 -07:00
Joe Onorato 45cd00cd9e Merge "Install all host modules. Don't filter out ones tagged "optional"" 2012-08-17 05:36:21 -07:00
Joe Onorato 68559da02f Install all host modules. Don't filter out ones tagged "optional" 
Change-Id: I9b3a27a4c84ee748314e98603670eb939ae949e2
 2012-08-17 05:35:23 -07:00
Joe Onorato 2d560de09c am fec412ed: am b68c3f9c: am 763c0801: am 687bde38: Merge "Add all the host tools to the list of prerequisites for the SDK." 
* commit 'fec412ed3fe1b48928393ec14520a492fa2becba':
  Add all the host tools to the list of prerequisites for the SDK.
 2012-08-17 05:23:05 -07:00
Joe Onorato b68c3f9ca5 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.
 2012-08-17 05:08:36 -07:00
Joe Onorato 763c080198 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.
 2012-08-17 04:34:06 -07:00
Joe Onorato 63d56dad65 Add all the host tools to the list of prerequisites for the SDK. 
Change-Id: I3a3e4be8796f761119e29f3be64ad534e48c95ee
 2012-08-17 04:19:38 -07:00
Joe Onorato 769239f299 resolved conflicts for merge of 34539244 to master 
Change-Id: I55b5c4aea999ff3fb5ceaabfe5d658a296f3d971
 2012-08-17 02:51:45 -07:00
Joe Onorato c5fbef5413 resolved conflicts for merge of fab83a3d to jb-mr1-dev 
Change-Id: I97aff2be317fd10b68d933e65259ec48bd5ff6a1
 2012-08-17 01:26:41 -07:00
Joe Onorato fab83a3d62 am 3b4b11a4: Merge "Another error to warning" 
* commit '3b4b11a4701b64df5248e7d86c0c357954a2ca10':
  Another error to warning
 2012-08-17 01:22:31 -07:00
Joe Onorato 0ee86a7429 Another error to warning 
Change-Id: Ifbad63e3eb37d087d88a39e102b4239f305d0ee3
 2012-08-17 01:12:27 -07:00
Joe Onorato 5956db9394 am 6b340ad0: am 7c945d24: Merge "Make error a warning for now" 
* commit '6b340ad06c90ad80894bce720075e05f31b8f4cb':
  Make error a warning for now
 2012-08-17 00:47:42 -07:00
Joe Onorato 6b340ad06c am 7c945d24: Merge "Make error a warning for now" 
* commit '7c945d249956ed3943585b8d417a51a598b175b3':
  Make error a warning for now
 2012-08-17 00:46:36 -07:00
Joe Onorato c31be8f8f2 Make error a warning for now 
Change-Id: I156fb70432cf546650bf11d03a4edc118c665c1c
 2012-08-17 00:46:17 -07:00
Joe Onorato aa816333ae Make error a warning for now 
Change-Id: Idf18957fff2bb4ff31ca6d7d8d1c8d95847b4e00
 2012-08-17 00:36:00 -07:00
Joe Onorato cea08a5220 resolved conflicts for merge of 5836d3b3 to jb-mr1-dev 
Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
 2012-08-17 00:09:27 -07:00
Joe Onorato 5836d3b3d9 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
 2012-08-16 23:50:34 -07:00
Joe Onorato 175f2e0b43 Automatically install all host modules. 
Change-Id: Ifa9cd19e6c17c5ce1f9a25965155194c16926871
 2012-08-16 22:45:57 -07:00
Joe Onorato 3d48122b18 Make the error message for usless tags a little more helpful 
Change-Id: I1c6edd260280d5bab03b0d4c1e49f1bbecfd1a53
 2012-08-16 22:45:56 -07:00
Joe Onorato 88155422f2 More product debugging. 
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
 2012-08-16 22:45:56 -07:00
Joe Onorato 8d0847e924 build system changes for jb-aah-dev merge 
Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
 2012-08-16 22:45:56 -07:00
Joe Onorato e213944da4 Fail when a non-vendor product references a vendor module. 
Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
 2012-08-16 22:45:56 -07:00
Joe Onorato 6a185e453d 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
 2012-08-16 22:45:56 -07:00
Joe Onorato f93f5be23e Dump the user tagged modules. 
Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
 2012-08-16 22:45:56 -07:00
Joe Onorato 918ee311f5 Don't give the user tag to host modules automatically. 
Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
 2012-08-16 22:45:55 -07:00
Joe Onorato 10649c632d Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything. 
Change-Id: Idac551e5c796321e993b94761f5cbf5b55c1a994
 2012-08-16 22:45:55 -07:00
Joe Onorato 8b46e302e6 make product-graph now filtered 
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
 2012-08-16 22:45:55 -07:00
Joe Onorato f3319452ad More product debugging. 
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
 2012-08-16 22:36:41 -07:00
Joe Onorato 26ead966d7 build system changes for jb-aah-dev merge 
Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
 2012-08-16 22:36:41 -07:00
Joe Onorato 75493610b3 Fail when a non-vendor product references a vendor module. 
Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
 2012-08-16 22:36:41 -07:00
Joe Onorato 529302d912 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
 2012-08-16 22:36:41 -07:00
Joe Onorato d23c3235fa Dump the user tagged modules. 
Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
 2012-08-16 22:36:40 -07:00
Joe Onorato f85cb7c936 Don't give the user tag to host modules automatically. 
Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
 2012-08-16 22:36:40 -07:00
Joe Onorato d6b1d628be Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything. 
Change-Id: Idac551e5c796321e993b94761f5cbf5b55c1a994
 2012-08-16 22:36:40 -07:00
Joe Onorato f5debbfee6 make product-graph now filtered 
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
 2012-08-16 22:36:40 -07:00
Ying Wang 3eea132abf am 88ed4fb1: am 732b2ba7: Merge "Don\'t include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev 
* commit '88ed4fb1f3456d6fec4df87a56d66a5c58e2f0d8':
  Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.
 2012-08-16 16:53:39 -07:00
Ying Wang 732b2ba79a Merge "Don't include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev 2012-08-16 16:51:00 -07:00
Ying Wang da4bf42514 Don't include system/core/include/arch/<arch>/Android.mk for apps-only build. 
Bug: 6994483
Change-Id: I76c4d96264cf94a79d59fdeb52bb37c07a9458dd
 2012-08-16 16:45:01 -07:00
Keun young Park 6e86a57b0f add CLANG configurations for MIPS 
Change-Id: I36ed8089c447c20c229c348a096b49ff126552de
 2012-08-16 16:28:04 -07:00
Jean-Baptiste Queru c11108b721 am b2b42bcd: am 2f32c04d: am d77d8906: am 6020d698: Merge "select.mk: Tune ccache options" 
* commit 'b2b42bcd546ec6a36bb464cf53ef35e8d084bb52':
  select.mk: Tune ccache options
 2012-08-16 15:33:13 -07:00
Jean-Baptiste Queru 2f32c04d8c am d77d8906: am 6020d698: Merge "select.mk: Tune ccache options" 
* commit 'd77d8906b8fc4a6e2ecaf9bc5f5b84ddec6dbe7e':
  select.mk: Tune ccache options
 2012-08-16 15:28:47 -07:00
Jean-Baptiste Queru d77d8906b8 am 6020d698: Merge "select.mk: Tune ccache options" 
* commit '6020d698f51132cab374e6c96f7da4902f3aa84f':
  select.mk: Tune ccache options
 2012-08-16 15:27:54 -07:00
Jean-Baptiste Queru 6020d698f5 Merge "select.mk: Tune ccache options" 2012-08-16 14:55:26 -07:00
Andrew Boie 1f93043c86 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>
 2012-08-16 11:11:29 -07:00
Ying Wang bc415dd5eb Support to build emmap_mata.zip in unbundled builds. 
Bug: 6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
 2012-08-16 10:10:11 -07:00
Elliott Hughes 1ae7078d66 am b0a6849a: am a8352cac: am 0fc8d635: am f2a618e1: Merge "The zoneinfo stuff is no longer legacy." 
* commit 'b0a6849a26fd623adc677b8fe13773b6c45151e3':
  The zoneinfo stuff is no longer legacy.
 2012-08-15 20:06:18 -07:00
Elliott Hughes a8352cac8d am 0fc8d635: am f2a618e1: Merge "The zoneinfo stuff is no longer legacy." 
* commit '0fc8d635a7f3712cc24f7a29d97755bc15972a0a':
  The zoneinfo stuff is no longer legacy.
 2012-08-15 20:03:54 -07:00
Elliott Hughes 0fc8d635a7 am f2a618e1: Merge "The zoneinfo stuff is no longer legacy." 
* commit 'f2a618e1df126c6c48622cce948825e923b52dcb':
  The zoneinfo stuff is no longer legacy.
 2012-08-15 20:02:49 -07:00
Elliott Hughes f2a618e1df Merge "The zoneinfo stuff is no longer legacy." 2012-08-15 19:43:41 -07:00
Elliott Hughes e1654eaccb The zoneinfo stuff is no longer legacy. 
Change-Id: I7f76dfc15c0b2febbcdb13f12ff9390dca124585
 2012-08-15 18:34:49 -07:00
Ying Wang 4ec08ee20b Merge "Support to build emmap_mata.zip in unbundled builds." 2012-08-15 15:55:19 -07:00
Ying Wang e1402c5740 Merge "Add LOCAL_CONLYFLAGS." 2012-08-15 14:17:03 -07:00
Keun young Park e50b0035d6 am 7b559162: am a8811fda: fix MIPS build 
* commit '7b559162a2d29a89545561295430dd5f70cc1661':
  fix MIPS build
 2012-08-15 14:05:50 -07:00
Keun young Park a8811fda4f fix MIPS build 
- crtxx.o built under TARGET_OUT_INTERMEDIATE_LIBRARIES,
  not under TARGET_OUT_STATIC_LIBRARIES

Change-Id: Ife05206bd66f691853100bbf17e08a13c287d073
 2012-08-15 13:42:37 -07:00