Jean-Baptiste Queru
4130c80aa3
Merge "Correct makefile test for stagefright build"
2010-11-19 10:45:27 -08:00
Bruce Beare
885b6b99d3
Correct makefile test for stagefright build
...
Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-11-19 10:45:11 -08:00
Jean-Baptiste Queru
26d8c5896e
Merge "Display the TARGET_ARCH_VARIANT"
2010-11-19 10:29:14 -08:00
Ying Wang
b26a65b59f
Merge "Restrict make version to 3.81"
2010-11-18 11:20:21 -08:00
Ying Wang
4f9269ef75
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
2010-11-18 11:18:52 -08:00
Jean-Baptiste Queru
48ec6d6f81
Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
2010-11-17 15:15:32 -08:00
Johnnie Birch
a4716b2618
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
...
Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e
2010-11-17 15:15:08 -08:00
Xavier Ducrohet
01a9840ba7
Merge "Rename layoutlib_utils into ide_common"
2010-11-11 14:45:05 -08:00
Xavier Ducrohet
2e5ee27e9e
Rename layoutlib_utils into ide_common
...
Change-Id: Iaa8275881dd1ee7d41c30f8b0d481253a6635271
2010-11-11 12:44:16 -08:00
Jean-Baptiste Queru
7b393fd131
Merge "Add version_defaults.mk to be a prerequisite of build.prop"
2010-11-03 10:29:55 -07:00
Chih-Wei Huang
75947ef5ef
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
2010-11-03 18:33:46 +08:00
Jean-Baptiste Queru
892ea1eaad
Merge "build: Add spare size flag to mkyaffs2image"
2010-11-02 09:01:30 -07:00
Naseer Ahmed
53871886bd
build: Add spare size flag to mkyaffs2image
...
Change-Id: Ib3a915ba5296d31f88cdc81e13da02f281dbdb9f
2010-11-02 08:59:39 -07:00
Raphael Moll
4aa7a190bb
Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
2010-10-29 18:53:07 -07:00
Raphael Moll
e6add13d71
Fix "make acp" under Cygwin. DO NOT MERGE.
...
Change-Id: I52ae8d4835b27a712d4795e7f41fa9ca4f3a822d
2010-10-27 19:06:12 -07:00
Jean-Baptiste Queru
54ddcc2724
Merge "Explicitly declare assembly only __ASSEMBLY__ macro for assembly source"
2010-10-19 14:43:38 -07:00
Bruce Beare
8ee0dfdd43
Display the TARGET_ARCH_VARIANT
...
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-10-14 12:26:31 -07:00
Jim Huang
20d1ba602b
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
2010-10-14 16:17:31 +08:00
Bill Napier
fcab84025e
Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
2010-10-11 15:18:04 -07:00
Bill Napier
0e9473acfb
Add in MonkeyRunner target (and dependent libs) to SDK build.
...
Change-Id: I396635324cf9d2e590513228f5de5cea9df4dfd3
2010-10-10 12:06:57 -07:00
Jean-Baptiste Queru
0f085e5a85
Merge "Explicitly request ip-up-vpn"
2010-10-07 14:16:35 -07:00
Xavier Ducrohet
ffd5087ec8
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
2010-09-27 15:51:32 -07:00
Jean-Baptiste Queru
a737b8371d
Explicitly request ip-up-vpn
...
Change-Id: I05c1a3f75e9a2b9040fda3e00f0b659c613968b1
2010-09-26 10:07:09 -07:00
Ying Wang
b368bba41c
Enforce 64-bit build environment
...
We will only support 64-bit build environment beyond froyo/2.2 .
Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
2010-09-22 11:02:09 -07:00
Gary King
1e80c294ff
[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>
2010-09-10 14:29:50 -07:00
Jean-Baptiste Queru
cc84526bce
Merge "Add atom optimization flags"
2010-09-09 14:07:21 -07:00
Ying Wang
42f406593e
Merge "Disable new longjmp in glibc 2.11 and later."
2010-09-02 09:44:39 -07:00
Ying Wang
163fa35fe3
Disable new longjmp in glibc 2.11 and later.
...
Bug: 2967937
Change-Id: I7a5ef082502192f41c26a48632edfe775dea7648
2010-09-01 16:56:25 -07:00
Jean-Baptiste Queru
85fd5030b1
Revert "Fixed problem with keymap files copied to target"
...
This reverts commit c90449f2a8
.
2010-09-01 06:10:40 -07:00
Jean-Baptiste Queru
a160e3169e
Merge "Fixed problem with keymap files copied to target"
2010-08-31 14:52:54 -07:00
Ying Wang
9a8732fb6c
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
2010-08-30 11:52:50 -07:00
Magnus Karlsson
c90449f2a8
Fixed problem with keymap files copied to target
...
Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps
to build/target/board/generic. This causes the keymap files to copied into
the system image of generic and sdk products, but not into the system image
of HW products. Originally the qwerty.kl was copied to target no matter
if the target had a qwerty keyboard or not, which is the case for e.g.
the Nexus One.
Change-Id: I7cd80497632fb3b9e7ce2f3a7888d4924a355f52
2010-08-30 16:51:28 +02:00
Raphael Moll
6ba4b59c90
SDK: add hierarchyviewer2 to windows target list.
...
Change-Id: I282173ab10930a716861f3774804d3d8484a71f3
2010-08-28 15:03:40 -07:00
Thorsten Glaser
3d00a8c5ff
For the generic board, set /system/bin/sh to mksh to test the transition
...
Change-Id: I778bae4060dd404e82fbf9dd5b8a2024c8268402
2010-08-24 18:08:59 -07:00
Thorsten Glaser
2213aab8b9
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
2010-08-24 18:08:47 -07:00
Raphael Moll
ddeb150d8d
Add easymock for list of Windows SDK targets.
...
Also correctly sorted the windows sdk target list.
Change-Id: I4742a0b98ece8e0693a6f346a1f09595253d65c1
2010-08-16 11:17:21 -07:00
Jean-Baptiste Queru
43d406e5c6
Merge "add drm/ directory to include it as part of frameworks"
2010-08-16 08:08:48 -07:00
Xavier Ducrohet
e743c53b88
Package ddmlib-prebuilt with CTS.
...
This ensures that CTS is using a compatible ddmlib.
Change-Id: Iff6d2bfec873949dfd07ccf758bf257350f11298
2010-07-28 11:07:31 -07:00
aimitakeshi
2bdf2653dc
add drm/ directory to include it as part of frameworks
...
Change-Id: I62a6ab77587d88ea960f9ece17dcb75726e7e5a9
2010-07-27 08:34:47 +09:00
Chih-Wei Huang
2467fe24f0
Add atom optimization flags
...
To enable the optimization, set TARGET_ARCH_VARIANT := x86-atom.
Change-Id: I6b7798944bb8262bd83a76712419d8a77d3c34e9
2010-07-26 10:41:38 +08:00
Jean-Baptiste Queru
8339ba912d
Merge "Replaced AlarmClock with DeskClock"
2010-07-23 11:25:51 -07:00
Christian Mehlmauer
5022d63cd2
Replaced AlarmClock with DeskClock
...
Change-Id: I1a9b9ce79b5b16709fe2d89638285633801b6d24
2010-07-23 20:09:54 +02:00
Jeffrey Chyan
7adbf97d11
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
2010-07-20 15:32:21 -07:00
Jean-Baptiste Queru
6c2df3e98b
Add full_x86 product.
...
By inheriting from full, this will be more self-maintaining, and
automatically gets a better-configured variant (e.g. it has locales,
a date format, etc...).
Change-Id: I67b6c2d9f9b7d20cb89154906c3f3d6a5391c838
2010-07-15 14:04:39 -07:00
Jean-Baptiste Queru
af20a6081a
Merge "Move buildspec vars to BoardConfig.mk"
2010-07-12 13:58:59 -07:00
Bruce Beare
6f9318e035
Add generic_x86-eng to the lunch menu
...
Change-Id: Ie4e0f9054c5bc6ad8845b5b885a00174dd8c9534
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 13:55:18 -07:00
Bruce Beare
fe2ef85d5d
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>
2010-07-12 13:47:41 -07:00
Bruce Beare
cce6f923aa
Move buildspec vars to BoardConfig.mk
...
Change-Id: I48ed4b55e91aae51076d9c609b44bf9fa24c3ecd
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 11:32:37 -07:00
Jean-Baptiste Queru
e62f2c263a
Merge "Vendorsetup needs to look in additional places."
2010-07-12 11:18:31 -07:00
Bruce Beare
6f8410b976
Vendorsetup needs to look in additional places.
...
Change-Id: I698856f8e02487322540e804c038bba28cc23532
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 10:31:21 -07:00