Commit graph

6326 commits

Author SHA1 Message Date
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
Ying Wang
fbfd654f67 Switch Unbundled apps from generic.mk to full.mk.
Change-Id: Ib0b84e041275a5ad389a122f0349a85008496be2
2011-07-11 09:57:08 -07:00
Jean-Baptiste Queru
18a298e7bc Merge "Add PhotoEditor in AOSP builds" 2011-07-11 09:49:25 -07:00
The Android Automerger
2bd173316f HLK11
Change-Id: I0b2c58dcfde3f50f0ec06e42a114b6b431b347d3
2011-07-11 07:21:08 -07:00
The Android Automerger
9df71bc059 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-07-11 07:21:01 -07:00
android-merger
d794d5f2d0 GRJ90G - yes another test build
Change-Id: I75d42417e550e3e8007e83f474d2804375ddac70
2011-07-10 21:19:29 -07:00
android-merger
fc9b15a5df GRJ90F
Change-Id: Ib4361e14ab7483a96a87923de1f7fe74572ecb25
2011-07-10 11:41:18 -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
Joe Malin
2ed3603ad9 am dcca65cb: am 2c97d30f: am 8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit 'dcca65cb1d1ca1ae108b417ebd7241f397012b45':
  DOC CHANGE: Change GTV icons for home page
2011-07-08 17:53:03 -07:00
Scott Main
7c32eebac5 am 040221a9: am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2
* commit '040221a9949c9f158cb7fc20b70b065289fcbbb1':
  docs: fix xss vulnerability bug 5008593
2011-07-08 17:45:38 -07:00
Scott Main
040221a994 am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2
* commit '1e03253bf263472ea0028d2518292beaf4cbe01a':
  docs: fix xss vulnerability bug 5008593
2011-07-08 17:44:08 -07:00
Scott Main
1e03253bf2 Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2 2011-07-08 17:42:40 -07:00
Scott Main
76a62f2deb docs: fix xss vulnerability
bug 5008593

the fix deletes some code that was originally there to handle side nav
highlighting for inter-doc links. This code is no longer necessary (or at least
should not be) because side nav links should not be inter-doc links, but
should always be to their own document (no two sidenav links should go
to separate sections of the same doc).

Change-Id: If77d6fe869e6a44bae2f194c9de26222e6ad9419
2011-07-08 16:27:20 -07:00
Jean-Baptiste Queru
297d0ac0b5 Add PhotoEditor in AOSP builds
Change-Id: If0a302701c4b6d2ebfb6b5dd6896d6717411553b
2011-07-08 16:19:42 -07:00
android-merger
3b1bc47f02 GRJ90E - more testing
Change-Id: I6bc1b5bc79b83d722f9915050c40d16ba1267be8
2011-07-08 15:46:13 -07:00
android-merger
5df26cbff2 GRJ90D
Change-Id: I06e6933f75493c64cea797bca4e1a47edcc2fa94
2011-07-08 12:16:35 -07:00
Jaikumar Ganesh
981c1de41a am eb0a62cb: (-s ours) am b399f5e8: Merge "Rename health shared library."
* commit 'eb0a62cb26d7bed289df823e2d68e422c39b5659':
  Rename health shared library.
2011-07-08 12:12:14 -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
Joe Malin
dcca65cb1d am 2c97d30f: am 8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit '2c97d30fefed3430daa356418146d2cbb1f23c8f':
  DOC CHANGE: Change GTV icons for home page
2011-07-08 10:38:37 -07:00
Jaikumar Ganesh
ac82cdda8c Merge "Add Bluetooth health to the PRODUCT_PACKAGE." 2011-07-08 09:40:27 -07:00
Joe Malin
2c97d30fef am 8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit '8cf99f0ccee8ecc95183f939d633a514e7eebdfb':
  DOC CHANGE: Change GTV icons for home page
2011-07-08 09:29:29 -07:00
David 'Digit' Turner
09636e1771 merge intel x86 patches into gingerbread branch 2011-07-08 18:19:01 +02:00
The Android Automerger
ea440d8eaf HLK08
Change-Id: I1fdedea62d41405b4e16139c60c2f54ae0db45e5
2011-07-08 07:20:51 -07:00
The Android Automerger
1af4ff8354 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-07-08 07:20:45 -07:00
Jaikumar Ganesh
d849b65d91 Add Bluetooth health to the PRODUCT_PACKAGE.
Change-Id: Ifb668f74c09a321eea9d2785f7574cd637aff092
2011-07-07 18:08:15 -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
Jean-Baptiste Queru
3636cb72a2 Merge "Add VideoEditor to full builds" 2011-07-07 15:48:04 -07:00
Jean-Baptiste Queru
0aeec5e139 Add VideoEditor to full builds
Change-Id: Iaaecaa24b25c67642197d4926aa7f350991abf60
2011-07-07 15:30:15 -07:00
The Android Open Source Project
e4fc9fe78f Reconcile with gingerbread-release honeycomb-mr2-release honeycomb-LTE-release
Change-Id: I8ea53082a2a9d54a8004ff834d2344b989ca0fbf
2011-07-07 15:22:25 -07: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
android-merger
18edf674de GRJ90C - a test build
Change-Id: Ieabc475f7e45db1d79a56036fdb377c52bd8f1ac
2011-07-07 14:45:05 -07:00
Doug Zongker
aa97ed5369 Merge "Prevent "::" in PATH on multiple lunch" 2011-07-07 11:24:41 -07:00
android-merger
3afeba0da6 GRJ90B - a test build
Change-Id: I54aefd71dc35381aed8ab1fbf99280d566520c0c
2011-07-07 10:40:48 -07:00
Ying Wang
4227d02e6f Merge "Enable LOCAL_STRIP_MODULE for prebuilt binaries" 2011-07-07 09:29:19 -07:00
The Android Automerger
834084f8cf HLK07
Change-Id: I9442d2198c19df9fadfcb19868cde304c4088444
2011-07-07 07:19:53 -07:00
The Android Automerger
6c13f89dd2 merge in honeycomb-LTE-release history after reset to honeycomb-LTE 2011-07-07 07:19:47 -07:00
Ji-Hwan Lee
0219e9292e Enable LOCAL_STRIP_MODULE for prebuilt binaries
Currently, prebuilt binaries with debug symbols are installed unstripped.

There are only a few of prebuilt shared library (that I'm trying to fix),
so I can do this manually by making intermediate target and applying
TARGET_STRIP, each of them, one by one.

But dynamic_binary.mk has more features than stripping binaries
(like copying unstripped binaries to symbols directory)
and if I do it manually, they will lose all the benefits.

Note that this doesn't change anything when LOCAL_STRIP_MODULE is not set.
I actually tried to force strip every BUILD_PREBUILT'ed modules,
but there were a few problems:

- Some packages are not installed (i.e. not in PRODUCT_PACAKGES)
  but are built (i.e. in ALL_MODULES).  And some of them are built in spite
  that they do not have appropriate prebuilt shared library for TARGET_ARCH.
  Stripping them causes "unknown format".

- Some prebuilt modules set LOCAL_MODULE_CLASS incorrectly.
  Example is default.supp of external/valgrind/main, which should be ETC,
  not SHARED_LIBRARY.

Both are better fixed, but I concluded that it's better to be conservative.

Bug: 4585734
Change-Id: If71723b1d76007d45b02429ea5161a8265dd5b6d
2011-07-07 11:07:18 +09: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