Commit graph

1708 commits

Author SHA1 Message Date
Ying Wang
41346ae407 am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp
* commit 'ba35b2d61531a071533891307904e6ad7f81fb65':
  Allow uninstallable APPs.
2011-09-07 11:25:42 -07:00
Ying Wang
ba35b2d615 resolved conflicts for merge of 162991be to gingerbread-plus-aosp
Change-Id: I06edde6c517b4c4e2bd03e2d1d44da52ee3066d5
2011-09-07 11:20:28 -07:00
Ying Wang
162991beb5 Allow uninstallable APPs.
Bug: 5264671
This is needed by cts tests.
It's harmless to existing modules.

Change-Id: I0083471f80d483559b27523d4b88190d7913f6f1
2011-09-07 10:32:39 -07:00
Brian Muramatsu
3eae5b7c1b am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS Build
* commit '08b8e0024812ea907cf3938bcd07b8dca6188eaf':
  Use package.apk.unaligned in CTS Build
2011-09-02 16:56:07 -07:00
Brian Muramatsu
08b8e00248 am 2306106d: Use package.apk.unaligned in CTS Build
* commit '2306106d3e2cd774ef0b2cd782442f90c402341f':
  Use package.apk.unaligned in CTS Build
2011-09-02 16:53:43 -07:00
Brian Muramatsu
2306106d3e Use package.apk.unaligned in CTS Build
Bug 5252989

This prevents dexopt installation failures when trying to
install CTS apks on production devices.

Change-Id: I1eeb0ac567c3be3b831c8c27dee4005ec00fd7cd
2011-09-02 15:29:10 -07:00
Ying Wang
a1b603a556 am 4b398749: am c5033a33: Merge "x86: remove obsolete comments"
* commit '4b3987498eb15dc654fe572aadf53396aac36479':
  x86: remove obsolete comments
2011-08-26 12:12:48 -07:00
Ying Wang
4b3987498e am c5033a33: Merge "x86: remove obsolete comments"
* commit 'c5033a3357b824a8285da67357a0d289750f4a72':
  x86: remove obsolete comments
2011-08-26 12:10:45 -07:00
Ying Wang
c5033a3357 Merge "x86: remove obsolete comments" 2011-08-26 10:41:16 -07:00
David 'Digit' Turner
3db43165b0 am 80d41e4b: am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"
* commit '80d41e4b7555aed399c7bd23647947d7eade3fe6':
  sdk: add DLL_EXTENSION as an atree variable
2011-08-25 14:30:00 -07:00
David 'Digit' Turner
6da54b6e0e resolved conflicts for merge of 7be88d00 to honeycomb-plus-aosp
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
2011-08-25 23:23:32 +02:00
David 'Digit' Turner
80d41e4b75 am a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"
* commit 'a2cc9b227ae01803dfc4bc1987071fd6eee08bb6':
  sdk: add DLL_EXTENSION as an atree variable
2011-08-25 12:14:35 -07:00
David 'Digit' Turner
7be88d00bb am 77c6261f: Merge "emulator: Enable GLES emulation libraries"
* commit '77c6261fb074d87b75d669dd9fb9ab5a12a52cc9':
  emulator: Enable GLES emulation libraries
2011-08-25 12:14:33 -07:00
David 'Digit' Turner
557c51f2ea sdk: add DLL_EXTENSION as an atree variable
This patch defines the DLL_EXTENSION variable to the host
shared library suffix (i.e. either ".so", ".dll" or ".dylib")
when packaging the SDK.

This is required by another patch to sdk/build/tools.atree that
will use ${DLL_EXTENSION} to copy the GLES emulation host libraries
to $SDK/tools/lib

Change-Id: I120d39e905afb453b0702d5f0eb2707f214385cc
2011-08-25 14:28:03 +02:00
David 'Digit' Turner
43dd89d2a0 emulator: Enable GLES emulation libraries
This patch enables the build of OpenGLES emulation libraries
(both in the guest and the host) for any emulator-specific
product config.

+ update core/main.mk to ensure that the right path is parsed
  when building the Windows SDK

Change-Id: Ifde047f8c0ef922504a7286c8c5b57f7c79c71f8
2011-08-23 22:25:13 +02:00
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
Chih-Wei Huang
aa1c321a58 x86: remove obsolete comments
Change-Id: Ifb12892c17a50f85c7700d6413ea295a4dad7047
2011-08-03 12:16:59 +08: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
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