Commit graph

3502 commits

Author SHA1 Message Date
Ying Wang
a74a4811ae am 3f5326fd: Merge "sha module is deprecated"
* commit '3f5326fd9fe2a5c46b4e6643e2b277e7f13cac04':
  sha module is deprecated
2011-08-10 18:02:15 -07:00
Ying Wang
3f5326fd9f Merge "sha module is deprecated" 2011-08-10 17:50:05 -07:00
david
cad0bb9f62 sha module is deprecated
This patch removes the deprecated warnings from the python
scripts.

Change-Id: I052a0aab3fb28dd1d78de1307edafda6b6c35e5f
2011-08-10 17:48:04 -07:00
Jean-Baptiste Queru
8dd289d399 Ignore from gingerbread
We like our AOSP version numbers unchanged and a bit nutty.

Change-Id: Iddfd494bc52f13bdeb90f39393d89f554e2cfb64
2011-08-02 17:04:57 -07:00
Dan Morrill
6d0f51b44b Updating version to 2.3.7 to reflect some patches.
Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
2011-08-02 16:46:38 -07:00
Dan Morrill
b3eae868dd Bumping version to 2.3.6 to reflect a few patches.
Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
2011-08-02 15:36:05 -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
Raphael Moll
dceb46559e Merge "Add sdk/assetstudio to the Windows build paths." 2011-07-29 13:50:51 -07:00
Raphael Moll
667ec86a33 Add sdk/assetstudio to the Windows build paths.
Change-Id: Ide8d418aa25cf39852a25e08fd2a27c7882586e7
2011-07-29 13:04:53 -07:00
Kenny Root
1708a6f74b am 4880b436: am 62a2b188: Merge "Avoid complaining about empty directories"
* commit '4880b436656d7cfd00bb82ebde1b408e0bd19bda':
  Avoid complaining about empty directories
2011-07-18 13:47:16 -07:00
Kenny Root
4880b43665 am 62a2b188: Merge "Avoid complaining about empty directories"
* commit '62a2b1882fb95e960b5889b46fe8f669ddc7c8ac':
  Avoid complaining about empty directories
2011-07-18 13:45:15 -07:00
Kenny Root
62a2b1882f Merge "Avoid complaining about empty directories" 2011-07-18 13:41:25 -07:00
Kenny Root
7546d613af Avoid complaining about empty directories
Change-Id: If46bffd1c4e6b94f2e476b2d7d506ef337bbf8e1
2011-07-18 13:12:31 -07:00
Kenny Root
db54968679 am 099aa4cf: am b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '099aa4cf4d82218110c6edf3edede0e72450216e':
  Only include "[a-z]*.bash" files for completion
2011-07-18 11:57:24 -07:00
Kenny Root
099aa4cf4d am b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit 'b8a1c89b3a848ea343c897b33e77455dc2f98119':
  Only include "[a-z]*.bash" files for completion
2011-07-18 11:54:15 -07:00
Kenny Root
b8a1c89b3a Merge "Only include "[a-z]*.bash" files for completion" 2011-07-18 11:44:26 -07:00
Kenny Root
85cb556e2e Only include "[a-z]*.bash" files for completion
Some people were using case-insensitive filesystems which broke when
including simply [a-z]* since it matched the uppercase files. Use this
to filter only the actual bash scripts.

Change-Id: Ibfdcf2c091a154f0485545537a044667783a19f7
2011-07-18 11:15:31 -07:00
Kenny Root
cb255e5140 am 8985d033: am 88dcfccb: Merge "Add bash completion to envsetup"
* commit '8985d0337814219235a9698c99cf318682367560':
  Add bash completion to envsetup
2011-07-15 14:52:57 -07:00
Kenny Root
8985d03378 am 88dcfccb: Merge "Add bash completion to envsetup"
* commit '88dcfccb5b064735177e1a87f578d6c734b47bc7':
  Add bash completion to envsetup
2011-07-15 14:50:05 -07:00
Kenny Root
88dcfccb5b Merge "Add bash completion to envsetup" 2011-07-15 14:41:14 -07:00
Kenny Root
52aa81cab9 Add bash completion to envsetup
Change-Id: I0b4d74e72deede42d7e5f229593d79417f16bb55
2011-07-15 11:22:31 -07:00
Ying Wang
46db7b791a am fbfd654f: Switch Unbundled apps from generic.mk to full.mk.
* commit 'fbfd654f67609d019de8111480ebe374669ffef2':
  Switch Unbundled apps from generic.mk to full.mk.
2011-07-13 22:38: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
Ying Wang
fbfd654f67 Switch Unbundled apps from generic.mk to full.mk.
Change-Id: Ib0b84e041275a5ad389a122f0349a85008496be2
2011-07-11 09:57:08 -07: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
b399f5e81e Merge "Rename health shared library." 2011-07-08 11:25:33 -07:00
Jaikumar Ganesh
19efd6f11f Rename health shared library.
Change-Id: Ibd95333433bc2fb12322a9683bb3e0c0176dbce9
2011-07-08 11:20:49 -07:00
David 'Digit' Turner
09636e1771 merge intel x86 patches into gingerbread branch 2011-07-08 18:19:01 +02: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
4b65598642 emulator: Enable dex-preoptimization
Backport from AOSP master.

This enables the Dex pre-optimization for emulator-specific builds.
The idea is to speed up the initial boot sequence of an SDK AVD by
avoiding the costly on-device preopt pass that is performed otherwise
the first time the AVD is launched.

Benchmarking shows reductions in first boot time from 1m30s to 40s
on a 2.4GHz Xeon when emulating the AOSP master ToT.

Change-Id: Ibf5ebe68aa4d363c9df05d2ffe7cb828ef99f922
Orig-Change-Id: I67a9ce9791220c202817864c6e83dc8fd9cbc027
2011-07-08 00:01:11 +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
David 'Digit' Turner
c7e3877dad emulator: Build emulator platform images as ARMv7-A
Backport from AOSP master.

Now that the emulator supports proper ARMv7 emulation, switch to
building all emulator-specific platform images using this instruction
set, in order to benefit from the noticeable speed boost provided by
Thumb-2 instructions.

Note that we don't build with NEON support because emulated NEON
instructions are currently slow, though they work.

IMPORTANT: You need to have the following emulator patch in your tree
           in order to start these platform builds easily:

           https://review.source.android.com//#change,23798

Otherwise, the alternative is to do these things:

   1/ Telling the emulator to emulate an ARMv7-A CPU, instead of
      an ARMv5TE one. This is normally done with "-qemu cortex-a8"

   2/ Using an ARMv7-A capable kernel image, which is available and
      usable with -kernel prebuilt/android-arm/kernel-qemu-armv7

Note that the emulator has a special hack that automatically enables
1/ if 2/ is being used (i.e. if the kernel image name ends with -armv7,
then emulate an ARMv7-A CPU automatically).

So in reality, only 2/ is required.

Change-Id: Id3ac7cdbda892e519af98aff1f02136f344406b8
Orig-Change-Id: I5c0245ba5e6a2bc34d0d49b2c024fffd317a5eed
2011-07-07 23:46:50 +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
b23e918346 sdk: Add pc-bios files for IA qemu emulator
Orig-Change-Id: Ia919ff57295cd020810989f241da713210bc8720
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
5e2feda773 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...).

Orig-Change-Id: I67b6c2d9f9b7d20cb89154906c3f3d6a5391c838
2011-07-07 03:45:57 +02:00
Bruce Beare
73511b4010 x86: sdk_x86 build target
Orig-Change-Id: I3876246ddf884ffd09ff0f8e3e300dffb4a332f0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07 03:45:57 +02:00
Jean-Baptiste Queru
c30945757c Minor cleanup - DO NOT MERGE
Orig-Change-Id: I0fc4e3c45ae5a545f1a02ed974bc3c7500286e22
2011-07-07 03:45:57 +02:00
Jean-Baptiste Queru
79feb857d0 Clean up full config - DO NOT MERGE
This splits the existing full.mk in two parts:

-One is the device-independent full_base.mk
-The other is the emulator-specific device.mk

This way we'll be able to inherit from full_base.mk
for on-device builds without any emulator-specific
files getting in the way.

Change-Id: I7f8254bf8c1177594fbdfbdb082bdc429a4a5b25
Orig-Change-Id: Ieb1f4ed47988c8fff119ff53f1f374032da3752d
2011-07-07 03:45:57 +02:00
Jean-Baptiste Queru
e050219f1f Make a full list of locales available
Use it for the sim build and full build.

Change-Id: I0050f9ee10aafa96cb89cad5d3f492bb1839e331
Orig-Change-Id: I64dfa7ac1b374529ef5f0c1460dd35171311115e
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
f7f5479b56 generic_x86 builds don't need/use the sparse ext4 format.
Orig-Change-Id: I62973b131a728c3862be4642e2d49d0fa61555ac
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07 03:45:56 +02:00
Bruce Beare
594519e655 Use ext4 file system for generic_x86 userdata partition
Orig-Change-Id: I05710c2bda521b35712513bc219fc73ed00e4617
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07 03:45:56 +02:00
David 'Digit' Turner
88d929b9e4 GB Updates for init.rc and boot command line
Change-Id: Iae0f5b1eda109f99be6c484082abebc7b51adf51
Orig-Change-Id: I0638c8834fccbdc94ec99e7592a75b6972cb53b8
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07 03:45:56 +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
379e127fe4 Add generic_x86-eng to the lunch menu
Orig-Change-Id: Ie4e0f9054c5bc6ad8845b5b885a00174dd8c9534
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-07-07 03:45:56 +02:00
Bruce Beare
28290a0cec Move buildspec vars to BoardConfig.mk
Orig-Change-Id: I48ed4b55e91aae51076d9c609b44bf9fa24c3ecd
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2011-07-07 03:45:56 +02:00
Bruce Beare
93b4c25f00 Vendorsetup needs to look in additional places.
Orig-Change-Id: I698856f8e02487322540e804c038bba28cc23532
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