Commit Graph

121 Commits

Author SHA1 Message Date
Ben Cheng 054ffd2e7c Define TARGET_GCC_VERSION in target specific make files.
So that GCC refresh can be performed in a target specific way.

Change-Id: I867e8b8fd671bef8c5af300e657a6da4fface032
2012-12-11 14:03:18 -08: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
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 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 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
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
Ying Wang 54fdb473b6 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
2012-08-14 11:58:13 -07:00
Ying Wang 7f8d0ba6bd Adopt the new prebuilts/ndk/<number> paths.
Bug: 6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
2012-08-14 11:55:46 -07:00
Jean-Baptiste Queru 049d97d778 am 2387857d: am 968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '2387857dad06b3437ffcf0c14e2bc9f5956a5888':
  MIPS support to *.mk files and envsetup.sh
2012-08-10 12:43:59 -07:00
Raghu Gandham 8da4310646 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>
2012-08-10 09:15:38 -07:00
Ying Wang 0d570a7163 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
2012-06-18 18:45:40 -07:00
Ying Wang ffb36ede8f am a1ff6290: Now current is also a valid prebuilt SDK.
* commit 'a1ff6290e1e14d48dc42d1eacf804172c5913916':
  Now current is also a valid prebuilt SDK.
2012-05-10 18:11:23 -07:00
Ying Wang a1ff6290e1 Now current is also a valid prebuilt SDK.
Change-Id: Id05d20f17a4b46e19df88516f50e58f6cdb62c1c
2012-05-10 18:07:33 -07:00
Elliott Hughes b788e87dab am 9264e4a5: The \'localize\' tool is dead.
* commit '9264e4a5f63352cd6abc3d81b18be779a33c7b10':
  The 'localize' tool is dead.
2012-05-09 01:45:01 -07:00
Elliott Hughes 9264e4a5f6 The 'localize' tool is dead.
Change-Id: I75c43ce064664412e45c304c15f363015c0a4697
2012-05-07 17:33:19 -07:00
Elliott Hughes 559ffeb2ef am 8e67348b: Merge "Track libnativehelper move for PDK." into jb-dev
* commit '8e67348b515636ec8314da44b3f583c5d053e81a':
  Track libnativehelper move for PDK.
2012-05-04 16:50:41 -07:00
Elliott Hughes 89898dff4e Track libnativehelper move for PDK.
Bug: 6369821
Change-Id: I4dfd9eece9f6912a37c3caee77bd0eadb9313160
2012-05-04 15:36:42 -07:00
Jean-Baptiste Queru 30f6db7e31 Move stuff from prebuilt/ to prebuilts/misc
Change-Id: Ia13f5d09b24e3540042b6924ead6c96e94983ff4
2012-04-29 11:50:18 -07:00
Dima Zavin 06e758a966 config: add documentation for managing kernel-headers
Change-Id: I6dc6ede4703cbe88c356656a1a6b86a4ffaafa3b
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-30 10:46:28 -07:00
Dima Zavin 8e4042cc79 Revert "core: the device/board/product kernel headers will be auto-generated"
This reverts commit 992a52990c.

Change-Id: I9919f13705509a793f856da8ef7207b3feb47092
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-30 10:46:28 -07:00
James Dong 98f7c37601 Merge "Added /frameworks/av/include to the default include search path" 2012-03-25 16:40:57 -07:00
James Dong c49ee7139f Added /frameworks/av/include to the default include search path
o related-to-bug: 6214141

Change-Id: I90de0563298fd9146ac823926426d1cffd815c2d
2012-03-23 18:47:56 -07:00
Mathias Agopian ee6bddc308 move ndk headers to frameworks/native
Change-Id: Ie92ca68bb9f99b2d5a1dbdfc9e57f3f986265386
2012-03-23 14:23:41 -07:00
Stephen Hines 0e4c317c92 Merge "Define a basic llvm-link + clang environment" 2012-03-22 07:28:41 -07:00
yroussel 1319005a2a Define a basic llvm-link + clang environment
Move it from dalvik/vm/translator/runtime/ to build/
Add handling of -march=armv5te and -march=armv5e
2012-03-20 17:39:29 +04:00
Dima Zavin 992a52990c 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>
2012-03-19 12:32:08 -07:00
Dima Zavin f926990ba3 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>
2012-03-19 12:32:08 -07:00
Dima Zavin 4e16f96dbd 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>
2012-03-15 13:22:48 -07:00
Glenn Kasten fefc17ff59 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
2012-03-14 15:30:37 -07:00
Mathias Agopian a7c674b141 Merge "add frameworks/native include paths" 2012-03-08 14:45:28 -08:00
Mathias Agopian bd118e684d add frameworks/native include paths
Change-Id: I1ede8075dc77f77f5a9bc4a53663d4a74842ab36
2012-03-05 16:04:31 -08:00
Brian Muramatsu 7314933ac7 Include CTS Build Rules
Change-Id: Ieacee8ff6215b22222ea9ea6a1e62fce62daad77
2012-03-02 14:37:08 -08:00
Ying Wang df2b4b3aab 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
2012-01-12 16:38:17 -08:00
Ying Wang b50bd7f009 Move the prebuilt NDKs to their own git project prebuilts/ndk/.
Change-Id: If85986da436d412cff139af1fd8426e420bec121
2011-11-29 11:20:16 -08:00
Ying Wang 9978faf8f5 Move prebuilt SDKs to their own git project.
Change-Id: Ie6e9614e43bf82b8dd1f8702968be40cfb76b6c5
2011-11-29 10:24:27 -08:00
Ying Wang d4495e9933 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
2011-11-02 14:12:51 -07:00
Ying Wang 3c21fe5b12 Support for product-specific dev keys.
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
2011-10-04 10:50:08 -07:00
Doug Kwan be3689e981 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
2011-07-14 16:34:26 -07:00
Jeff Brown e33ba4c49e Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
2011-07-11 23:51:37 -07:00
Doug Kwan a6467cc874 Disable gcc-4.6's Wunused-but-set-variables warning.
Change-Id: Ia02fa536410b9200beca1d9d120ec448c82e5ca8
2011-07-08 18:50:10 -07:00
Jean-Baptiste Queru 70776231ee am 45a3ad7d: Merge c1efb060
* commit '45a3ad7d225495367a47440da118609b4940fe71':
  Relax the constraint of 64bit build environment.
2011-06-07 18:20:25 -07:00
Jean-Baptiste Queru 45a3ad7d22 Merge c1efb060
Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
2011-06-07 13:10:06 -07:00
Jean-Baptiste Queru c1efb06045 am 3c60c67a: Merge from open-source gingerbread
* commit '3c60c67ad2a157f5bfb731accfc74f5b42c69851':
  Relax the constraint of 64bit build environment.
2011-06-01 08:07:56 -07:00
Ying Wang 053dccb159 Relax the constraint of 64bit build environment.
Change-Id: Id8be221dcfa07651a4d9a2776b00e907b4ff750e
2011-05-24 15:46:15 -07:00
Jean-Baptiste Queru 772a0f6794 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
2011-05-18 13:49:08 -07:00
Joe Onorato 2a6e052ed0 update to use the new apicheck
Change-Id: I47dfe29957a9a65dddae973640ff9029418ffdc5
2011-04-08 17:32:52 -07:00
Joe Onorato 15ee93bf95 Current.xml and friends are now .txt instead.
(and much much easier to read)

Change-Id: I31832069d4fd78a937802aa20d0b0861bf99768c
2011-04-08 15:03:48 -07:00
Iliyan Malchev b375e71d30 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
2011-03-12 14:59:46 -08:00
Jeff Brown f24495f7da Remove obsolete kcm tool.
Change-Id: Ib5aa60cd9d308ce7c672c57513bdcf78e0f1080d
2011-02-19 05:22:55 -08:00