Commit Graph

1690 Commits

Author SHA1 Message Date
Raphael Moll
cfdfad3fca 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.
2011-08-17 11:29:48 -07:00
Raphael Moll
807c79802d am 7d9fe517: Merge "Add sdk/rule_api to the Windows build paths."
* commit '7d9fe5174787a5638993a15b165bc9115c16da0f':
  Add sdk/rule_api to the Windows build paths.
2011-08-17 11:26:07 -07:00
Raphael Moll
408c7f8a8f Add sdk/rule_api to the Windows build paths.
Change-Id: I4976b50d829e4b26b4f9935a1a184937dd115198
2011-08-16 19:40:03 -07:00
Raphael Moll
dd9e8477e6 am 266a571f: am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit '266a571fbd557c402e937130922ced8c523dd451':
  Add sdk/assetstudio to the Windows build paths.
2011-07-29 13:59:23 -07:00
Ying Wang
9b5447df85 am 24cad7d4: Add iptables and ip6tables to core.mk.
* commit '24cad7d4f7962d3413d520791cb2b8a5a5266f58':
  Add iptables and ip6tables to core.mk.
2011-07-29 13:58:43 -07:00
Raphael Moll
266a571fbd am dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit 'dceb46559eb8077553d1bd4d738fb4b325af9396':
  Add sdk/assetstudio to the Windows build paths.
2011-07-29 13:56:51 -07:00
Ying Wang
24cad7d4f7 Add iptables and ip6tables to core.mk.
Change-Id: I1cb2be8a28013b20d1032a8d766021a2f4aca9e1
2011-07-29 13:47:23 -07:00
Raphael Moll
667ec86a33 Add sdk/assetstudio to the Windows build paths.
Change-Id: Ide8d418aa25cf39852a25e08fd2a27c7882586e7
2011-07-29 13:04:53 -07:00
David 'Digit' Turner
d19750e87f 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
  ...
2011-07-11 11:55:35 -07:00
David 'Digit' Turner
36331f8455 resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp
Change-Id: If2b21def45b5de222e560af442a0ff9f56da5a35
2011-07-11 20:48:41 +02:00
Jaikumar Ganesh
eb0a62cb26 am b399f5e8: Merge "Rename health shared library."
* commit 'b399f5e81e2a644776f163e499df5bd0a38fe272':
  Rename health shared library.
2011-07-08 11:34:46 -07:00
Jaikumar Ganesh
19efd6f11f Rename health shared library.
Change-Id: Ibd95333433bc2fb12322a9683bb3e0c0176dbce9
2011-07-08 11:20:49 -07:00
David 'Digit' Turner
9fb131a9b6 sdk-addon.mk: Copy image files to ABI-specific dir
Change-Id: I39ad022a5bb03ea39fc41c134d1d4855dc491deb
2011-07-08 01:56:51 +02:00
David 'Digit' Turner
3248bb2e07 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
2011-07-07 23:57:22 +02:00
Bruce Beare
63152fd929 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>
2011-07-07 03:45:57 +02:00
Bruce Beare
f844ec96dd 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>
2011-07-07 03:45:57 +02:00
Jean-Baptiste Queru
8a545e04ee Truly default to the full config.
It is much better than generic for emulator-based work.

Orig-Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
2011-07-07 03:45:57 +02:00
Bruce Beare
ecabf85f32 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>
2011-07-07 03:45:56 +02:00
Bruce Beare
f7e4141f0e Display the TARGET_ARCH_VARIANT
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07 03:45:56 +02:00
Bruce Beare
f7661706b0 Allow TARGET_ARCH to be set from BoardConfig.mk
Orig-Change-Id: I66aed78b763d238719822257c1f4f35301247df6
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07 03:45:56 +02:00
Bruce Beare
c101e27d54 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>
2011-07-07 03:45:56 +02:00
David 'Digit' Turner
11e1d5fb3a am 6236d356: am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"
* commit '6236d356a01150bc517bd639398df704735cc0fc':
  sdk: provide ABI-dependent atree files
2011-06-23 13:13:20 -07:00
David 'Digit' Turner
6236d356a0 am b92c7a2c: am cac8e557: Merge "sdk: provide ABI-dependent atree files"
* commit 'b92c7a2c1293d2921739a4d7210b4a0d1c99156b':
  sdk: provide ABI-dependent atree files
2011-06-23 13:08:35 -07:00
David 'Digit' Turner
cac8e55714 Merge "sdk: provide ABI-dependent atree files" 2011-06-23 12:18:49 -07:00
David 'Digit' Turner
77ec16ae9e 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
2011-06-23 12:49:02 +02:00
Raphael
2ec35cc88f 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.
2011-06-22 19:10:23 -07:00
Raphael
4aed64341c am 0b6ece9d: SDK: properly strip all SDK llvm-rs-cc linux binaries.
* commit '0b6ece9dafcf6f06dd4418829434cdc4376375a3':
  SDK: properly strip all SDK llvm-rs-cc linux binaries.
2011-06-22 19:05:16 -07:00
David 'Digit' Turner
a85ebfb059 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
2011-06-22 18:05:06 -07:00
Raphael
0b6ece9daf SDK: properly strip all SDK llvm-rs-cc linux binaries.
Change-Id: Id3f024e90ef04eff4cc13a2202fcc9e94c5ac72f
2011-06-22 17:11:24 -07:00
David 'Digit' Turner
fa112f9822 am c134712f: am 04b49109: Merge "Turn-off implicit GNU Make RC/SCCS rules"
* commit 'c134712ffa9e6617df46334a6293ddd80e05cf98':
  Turn-off implicit GNU Make RC/SCCS rules
2011-06-22 15:53:31 -07:00
David 'Digit' Turner
04b4910971 Merge "Turn-off implicit GNU Make RC/SCCS rules" 2011-06-22 14:40:52 -07:00
Raphael
732936d99a resolved conflicts for merge of 8508a073 to honeycomb-plus-aosp
Change-Id: I376928881adb0e9fd62fabc1e21542bf0d700ca2
2011-06-22 14:35:32 -07:00
David 'Digit' Turner
52d697d432 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
2011-06-22 23:18:57 +02:00
Raphael Moll
8508a07352 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.
2011-06-22 10:40:08 -07:00
Raphael Moll
c639c787a0 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
2011-06-21 06:11:05 -07:00
Jean-Baptiste Queru
cc7dccc815 am 91ba5de8: am 1894085d: Merge "Tweak prelink map even more"
* commit '91ba5de815d7bec3b7e72ddf2c5b063f42b7211b':
  Tweak prelink map even more
2011-06-17 14:12:30 -07:00
Jean-Baptiste Queru
7751f426fe Tweak prelink map even more
Change-Id: I83149194f8c4e0193274f9c74d9718cecba82cb0
2011-06-17 13:20:32 -07:00
Jean-Baptiste Queru
af1b618c0d am c5e5d989: am 9d7590b9: Merge "Tweak prelink map"
* commit 'c5e5d9897f6fc18123a8f5d15a90152019979a22':
  Tweak prelink map
2011-06-17 12:21:37 -07:00
Jean-Baptiste Queru
c5e5d9897f am 9d7590b9: Merge "Tweak prelink map"
* commit '9d7590b93ff549cf8a4b432932fa68799166ed79':
  Tweak prelink map
2011-06-17 11:59:32 -07:00
Jean-Baptiste Queru
36c1f10dee Merge "Relax the constraint of 64bit build environment." 2011-06-17 11:19:14 -07:00
Ying Wang
2914f7f3b3 Relax the constraint of 64bit build environment.
Change-Id: Id349f424b122816f42c99769b629a9447986cf20
2011-06-17 11:18:10 -07:00
Jean-Baptiste Queru
82b96df215 Tweak prelink map
Change-Id: Ic04a67eab8a94a1cbb045dd460e15c2b673392b2
2011-06-17 11:15:00 -07:00
Jean-Baptiste Queru
5e2e09c569 am ee803184: am f771489d: Merge "Tweak prelink map, more"
* commit 'ee8031843e4dc3e9ff60c1acdc516121145fece1':
  Tweak prelink map, more
2011-06-17 08:04:31 -07:00
Jean-Baptiste Queru
ee8031843e am f771489d: Merge "Tweak prelink map, more"
* commit 'f771489d95289bf0d98cb92b504fccbe0a1f5fd7':
  Tweak prelink map, more
2011-06-17 07:57:22 -07:00
Jean-Baptiste Queru
398aaee7d7 Tweak prelink map, more
Change-Id: Ia78df90647029cfec76c7ccb7e71c477a4b6f9e7
2011-06-17 07:33:52 -07:00
Jean-Baptiste Queru
2ba042f9d8 am 40dc95be: am 14273125: Merge "Tweak prelink map"
* commit '40dc95be7744871b5363ae2e21a14343cd666b0f':
  Tweak prelink map
2011-06-16 17:32:11 -07:00
Jean-Baptiste Queru
40dc95be77 am 14273125: Merge "Tweak prelink map"
* commit '142731256afc708f4ec07247bffbe733dcaed0f4':
  Tweak prelink map
2011-06-16 17:09:14 -07:00
Jean-Baptiste Queru
1c594eab70 Tweak prelink map
Change-Id: Id4a3aea8ecc1c04178303c543fa81cecf4cf85f1
2011-06-16 16:17:52 -07:00
Jean-Baptiste Queru
13c7c0234d am eb9fc27d: am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"
* commit 'eb9fc27dbe062248167981d2a4f1aa9e058a2313':
  Switch back to mksh as the default
2011-06-16 13:09:12 -07:00
Jean-Baptiste Queru
eb9fc27dbe am 4c90a648: am 14bf45f3: Merge "Switch back to mksh as the default"
* commit '4c90a648cd0e1310d4b934c54905af3cf40b2770':
  Switch back to mksh as the default
2011-06-16 12:57:33 -07:00