OSDN Git Service
Jean-Baptiste Queru [Thu, 29 Sep 2011 19:35:07 +0000 (12:35 -0700)]
am
fcf0ede1: Ignore
013607f9 from gingerbread (already here)
* commit '
fcf0ede16257136760821976b185c3ac44f961ab':
emulator: enable opengl emulation modules
Jean-Baptiste Queru [Thu, 29 Sep 2011 19:32:32 +0000 (12:32 -0700)]
Ignore
013607f9 from gingerbread (already here)
Change-Id: I550c04403877cd2cf301a496746f1e9fdbb19de1
David 'Digit' Turner [Thu, 29 Sep 2011 17:21:15 +0000 (10:21 -0700)]
Merge "emulator: enable opengl emulation modules" into gingerbread
David 'Digit' Turner [Fri, 23 Sep 2011 06:01:17 +0000 (23:01 -0700)]
am
fdb13fcc: am
0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit '
fdb13fccfecdf526549ad453a20e8136253edb51':
sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
David 'Digit' Turner [Fri, 23 Sep 2011 05:59:07 +0000 (22:59 -0700)]
am
0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit '
0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2':
sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
David 'Digit' Turner [Fri, 23 Sep 2011 05:58:04 +0000 (22:58 -0700)]
Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
Doug Zongker [Tue, 20 Sep 2011 16:27:07 +0000 (09:27 -0700)]
am
25863d73: build the sqlite3 binary for use by the OTA tools
* commit '
25863d738ca171015a57a2154ff6ebe4ae8f5483':
build the sqlite3 binary for use by the OTA tools
Doug Zongker [Mon, 19 Sep 2011 22:02:03 +0000 (15:02 -0700)]
build the sqlite3 binary for use by the OTA tools
Change-Id: I2c6cc02dec74fdcedd3e2a6f3ddb1dfba657a883
David 'Digit' Turner [Fri, 16 Sep 2011 16:03:20 +0000 (18:03 +0200)]
emulator: enable opengl emulation modules
This patch defines BUILD_EMULATOR_OPENGL to 'true' to
enable the OpenGLES emulation modules under
development/tools/emulator/opengl to be built.
Change-Id: I130b5026909ce43578ead8bebe889075d90c4486
Brian Muramatsu [Thu, 8 Sep 2011 18:15:38 +0000 (11:15 -0700)]
am
89ba0f7e: am
1615c2fc: Rename generic_arm5 to generic_armv5
* commit '
89ba0f7e62e94fbe010bcf9aab3e1be035ffb44a':
Rename generic_arm5 to generic_armv5
Brian Muramatsu [Thu, 8 Sep 2011 18:13:50 +0000 (11:13 -0700)]
am
1615c2fc: Rename generic_arm5 to generic_armv5
* commit '
1615c2fcb60c7164cd8629e8c78cef551ebd329a':
Rename generic_arm5 to generic_armv5
Brian Muramatsu [Thu, 8 Sep 2011 17:36:03 +0000 (10:36 -0700)]
Rename generic_arm5 to generic_armv5
Bug
5267392
Change-Id: I5129d5ba283e711a2cb5840fc0c9b707f653936a
Brian Muramatsu [Thu, 8 Sep 2011 17:26:29 +0000 (10:26 -0700)]
am
9d014e65: am
9353a3be: Disable Dexpreopt for generic_arm5
* commit '
9d014e6570deb3861b503833823e56e1c589626c':
Disable Dexpreopt for generic_arm5
Brian Muramatsu [Thu, 8 Sep 2011 17:24:14 +0000 (10:24 -0700)]
am
9353a3be: Disable Dexpreopt for generic_arm5
* commit '
9353a3be5fca8a83c3a60e890fbca323f9fb0e04':
Disable Dexpreopt for generic_arm5
Brian Muramatsu [Thu, 8 Sep 2011 01:12:22 +0000 (18:12 -0700)]
Disable Dexpreopt for generic_arm5
Bug
5267392
After coming across another place where I would have to use
package.apk.unaligned, I decided maybe it is best to just
disable dexpreopt as was previously suggested.
Use package.apks in the CTS Makefile task.
Change-Id: Iec839a72f4b53441337523b8a9cccda657eec8e8
Brian Muramatsu [Thu, 8 Sep 2011 00:13:30 +0000 (17:13 -0700)]
am
372a1e0b: am
31e27eeb: generic_arm5 product
* commit '
372a1e0ba362ba509d44a1ed4b8eb554b1da7180':
generic_arm5 product
Brian Muramatsu [Thu, 8 Sep 2011 00:12:16 +0000 (17:12 -0700)]
am
31e27eeb: generic_arm5 product
* commit '
31e27eebc3108d788d040228e5143df3e87b1424':
generic_arm5 product
Brian Muramatsu [Wed, 7 Sep 2011 20:03:49 +0000 (13:03 -0700)]
generic_arm5 product
Bug
5267392
Copied the prior generic product but tried to include
Makefiles from the generic product when possible to
avoid drifting.
Change-Id: I7893adb65c37c1257bcb5224848f4cd7cd93d2f9
Ying Wang [Wed, 7 Sep 2011 18:25:42 +0000 (11:25 -0700)]
am
ba35b2d6: resolved conflicts for merge of
162991be to gingerbread-plus-aosp
* commit '
ba35b2d61531a071533891307904e6ad7f81fb65':
Allow uninstallable APPs.
Ying Wang [Wed, 7 Sep 2011 18:20:28 +0000 (11:20 -0700)]
resolved conflicts for merge of
162991be to gingerbread-plus-aosp
Change-Id: I06edde6c517b4c4e2bd03e2d1d44da52ee3066d5
Ying Wang [Wed, 7 Sep 2011 17:21:42 +0000 (10:21 -0700)]
Allow uninstallable APPs.
Bug:
5264671
This is needed by cts tests.
It's harmless to existing modules.
Change-Id: I0083471f80d483559b27523d4b88190d7913f6f1
Brian Muramatsu [Fri, 2 Sep 2011 23:56:07 +0000 (16:56 -0700)]
am
08b8e002: am
2306106d: Use package.apk.unaligned in CTS Build
* commit '
08b8e0024812ea907cf3938bcd07b8dca6188eaf':
Use package.apk.unaligned in CTS Build
Brian Muramatsu [Fri, 2 Sep 2011 23:53:43 +0000 (16:53 -0700)]
am
2306106d: Use package.apk.unaligned in CTS Build
* commit '
2306106d3e2cd774ef0b2cd782442f90c402341f':
Use package.apk.unaligned in CTS Build
Brian Muramatsu [Fri, 2 Sep 2011 22:29:10 +0000 (15:29 -0700)]
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
David 'Digit' Turner [Tue, 30 Aug 2011 22:43:07 +0000 (00:43 +0200)]
sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
This patch fixes the broken builds for PRODUCT-google_sdk-sdk_addon
and PRODUCT-google_sdk_x86-sdk_addon.
Change-Id: Iba0f23a03c143cd38aaba98b0bd0d52686330ed6
Ying Wang [Fri, 26 Aug 2011 19:12:48 +0000 (12:12 -0700)]
am
4b398749: am
c5033a33: Merge "x86: remove obsolete comments"
* commit '
4b3987498eb15dc654fe572aadf53396aac36479':
x86: remove obsolete comments
Ying Wang [Fri, 26 Aug 2011 19:10:45 +0000 (12:10 -0700)]
am
c5033a33: Merge "x86: remove obsolete comments"
* commit '
c5033a3357b824a8285da67357a0d289750f4a72':
x86: remove obsolete comments
Ying Wang [Fri, 26 Aug 2011 17:41:16 +0000 (10:41 -0700)]
Merge "x86: remove obsolete comments"
David 'Digit' Turner [Thu, 25 Aug 2011 21:30:00 +0000 (14:30 -0700)]
am
80d41e4b: am
a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"
* commit '
80d41e4b7555aed399c7bd23647947d7eade3fe6':
sdk: add DLL_EXTENSION as an atree variable
David 'Digit' Turner [Thu, 25 Aug 2011 21:23:32 +0000 (23:23 +0200)]
resolved conflicts for merge of
7be88d00 to honeycomb-plus-aosp
Change-Id: I2f1b26f737dcc521e5a81a660356468eca6d2717
David 'Digit' Turner [Thu, 25 Aug 2011 19:14:35 +0000 (12:14 -0700)]
am
a2cc9b22: Merge "sdk: add DLL_EXTENSION as an atree variable"
* commit '
a2cc9b227ae01803dfc4bc1987071fd6eee08bb6':
sdk: add DLL_EXTENSION as an atree variable
David 'Digit' Turner [Thu, 25 Aug 2011 19:14:33 +0000 (12:14 -0700)]
am
77c6261f: Merge "emulator: Enable GLES emulation libraries"
* commit '
77c6261fb074d87b75d669dd9fb9ab5a12a52cc9':
emulator: Enable GLES emulation libraries
David 'Digit' Turner [Thu, 25 Aug 2011 19:03:03 +0000 (12:03 -0700)]
Merge "sdk: add DLL_EXTENSION as an atree variable"
David 'Digit' Turner [Thu, 25 Aug 2011 19:02:34 +0000 (12:02 -0700)]
Merge "emulator: Enable GLES emulation libraries"
David 'Digit' Turner [Thu, 25 Aug 2011 12:28:03 +0000 (14:28 +0200)]
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
David 'Digit' Turner [Tue, 23 Aug 2011 20:25:13 +0000 (22:25 +0200)]
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
Ying Wang [Fri, 19 Aug 2011 16:35:50 +0000 (09:35 -0700)]
am
4651ee5d: am
7c7a8f02: Merge "Sort the results of findleaves again."
* commit '
4651ee5db200772921bad828c280d165ff3997c3':
Sort the results of findleaves again.
Ying Wang [Fri, 19 Aug 2011 16:32:40 +0000 (09:32 -0700)]
am
7c7a8f02: Merge "Sort the results of findleaves again."
* commit '
7c7a8f023af38e7e8be7cbb6acbe1ab770cdd704':
Sort the results of findleaves again.
Wink Saville [Fri, 19 Aug 2011 16:28:34 +0000 (09:28 -0700)]
Merge "DO NOT MERGE: resolved conflicts for merge of
15e199c8 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Ying Wang [Fri, 19 Aug 2011 16:24:44 +0000 (09:24 -0700)]
Merge "Sort the results of findleaves again."
Ishida, Haruyasu [Mon, 20 Dec 2010 14:37:54 +0000 (15:37 +0100)]
Sort the results of findleaves again.
Commit
d36e945 changed findleaves.py to sort the output files so that
the order is deterministic and won't cause spurious build errors when
files happen to be listed (and hence read) in different order on
e.g. add/remove the makefiles.
This correction broke after commit
4820a94 because the conversion to
a set with set() in order to remove duplicates came after sort() and
potentially altered the order of the elements.
This commit fixes makes sure findleaves.py is guaranteed to return
a sorted filename list without duplicates.
Change-Id: Ifd96d04d45641fe43d4cc4739f78a2d4d25cc212
Raphael Moll [Wed, 17 Aug 2011 18:29:48 +0000 (11:29 -0700)]
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.
Wink Saville [Wed, 17 Aug 2011 18:18:33 +0000 (11:18 -0700)]
DO NOT MERGE: resolved conflicts for merge of
15e199c8 to honeycomb-plus-aosp
Not merging this change, leaving version at 3.1.4.1.5.9.2.6.5
Change-Id: Ie9efac19da35cb72e8ae636dcfb8962a3c02ac94
Raphael Moll [Wed, 17 Aug 2011 18:26:07 +0000 (11:26 -0700)]
am
7d9fe517: Merge "Add sdk/rule_api to the Windows build paths."
* commit '
7d9fe5174787a5638993a15b165bc9115c16da0f':
Add sdk/rule_api to the Windows build paths.
Raphael Moll [Wed, 17 Aug 2011 18:06:39 +0000 (11:06 -0700)]
Merge "Add sdk/rule_api to the Windows build paths."
Wink Saville [Wed, 17 Aug 2011 17:03:51 +0000 (10:03 -0700)]
DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2.
Change-Id: Ib30bf10669119b588c691e4cebdc8093f402e3e4
Raphael Moll [Wed, 17 Aug 2011 02:40:03 +0000 (19:40 -0700)]
Add sdk/rule_api to the Windows build paths.
Change-Id: I4976b50d829e4b26b4f9935a1a184937dd115198
Ying Wang [Thu, 11 Aug 2011 23:55:00 +0000 (16:55 -0700)]
resolved conflicts for merge of
a74a4811 to honeycomb-plus-aosp
Change-Id: I8400ac2bead6aa1a9902d44bf65906084ad353ad
Ying Wang [Thu, 11 Aug 2011 01:02:15 +0000 (18:02 -0700)]
am
3f5326fd: Merge "sha module is deprecated"
* commit '
3f5326fd9fe2a5c46b4e6643e2b277e7f13cac04':
sha module is deprecated
Ying Wang [Thu, 11 Aug 2011 00:50:05 +0000 (17:50 -0700)]
Merge "sha module is deprecated"
david [Tue, 15 Mar 2011 14:21:38 +0000 (14:21 +0000)]
sha module is deprecated
This patch removes the deprecated warnings from the python
scripts.
Change-Id: I052a0aab3fb28dd1d78de1307edafda6b6c35e5f
Chih-Wei Huang [Wed, 3 Aug 2011 04:16:59 +0000 (12:16 +0800)]
x86: remove obsolete comments
Change-Id: Ifb12892c17a50f85c7700d6413ea295a4dad7047
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:09:58 +0000 (17:09 -0700)]
am
8dd289d3: Ignore from gingerbread
* commit '
8dd289d399e76f90e24383a7ffed4b667db6cbb3':
Updating version to 2.3.7 to reflect some patches.
Bumping version to 2.3.6 to reflect a few patches.
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:04:41 +0000 (17:04 -0700)]
Ignore from gingerbread
We like our AOSP version numbers unchanged and a bit nutty.
Change-Id: Iddfd494bc52f13bdeb90f39393d89f554e2cfb64
Dan Morrill [Tue, 2 Aug 2011 23:46:38 +0000 (16:46 -0700)]
Updating version to 2.3.7 to reflect some patches.
Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
Dan Morrill [Tue, 2 Aug 2011 22:36:05 +0000 (15:36 -0700)]
Bumping version to 2.3.6 to reflect a few patches.
Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
Raphael Moll [Fri, 29 Jul 2011 20:59:23 +0000 (13:59 -0700)]
am
266a571f: am
dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit '
266a571fbd557c402e937130922ced8c523dd451':
Add sdk/assetstudio to the Windows build paths.
Ying Wang [Fri, 29 Jul 2011 20:58:43 +0000 (13:58 -0700)]
am
24cad7d4: Add iptables and ip6tables to core.mk.
* commit '
24cad7d4f7962d3413d520791cb2b8a5a5266f58':
Add iptables and ip6tables to core.mk.
Raphael Moll [Fri, 29 Jul 2011 20:56:51 +0000 (13:56 -0700)]
am
dceb4655: Merge "Add sdk/assetstudio to the Windows build paths."
* commit '
dceb46559eb8077553d1bd4d738fb4b325af9396':
Add sdk/assetstudio to the Windows build paths.
Raphael Moll [Fri, 29 Jul 2011 20:50:50 +0000 (13:50 -0700)]
Merge "Add sdk/assetstudio to the Windows build paths."
Ying Wang [Fri, 29 Jul 2011 20:32:11 +0000 (13:32 -0700)]
Add iptables and ip6tables to core.mk.
Change-Id: I1cb2be8a28013b20d1032a8d766021a2f4aca9e1
Raphael Moll [Fri, 29 Jul 2011 20:04:20 +0000 (13:04 -0700)]
Add sdk/assetstudio to the Windows build paths.
Change-Id: Ide8d418aa25cf39852a25e08fd2a27c7882586e7
Kenny Root [Mon, 18 Jul 2011 20:48:43 +0000 (13:48 -0700)]
am
1708a6f7: am
4880b436: am
62a2b188: Merge "Avoid complaining about empty directories"
* commit '
1708a6f74bf36ad6d520476895695c26bdaf7306':
Avoid complaining about empty directories
Kenny Root [Mon, 18 Jul 2011 20:47:16 +0000 (13:47 -0700)]
am
4880b436: am
62a2b188: Merge "Avoid complaining about empty directories"
* commit '
4880b436656d7cfd00bb82ebde1b408e0bd19bda':
Avoid complaining about empty directories
Kenny Root [Mon, 18 Jul 2011 20:45:15 +0000 (13:45 -0700)]
am
62a2b188: Merge "Avoid complaining about empty directories"
* commit '
62a2b1882fb95e960b5889b46fe8f669ddc7c8ac':
Avoid complaining about empty directories
Kenny Root [Mon, 18 Jul 2011 20:41:25 +0000 (13:41 -0700)]
Merge "Avoid complaining about empty directories"
Kenny Root [Mon, 18 Jul 2011 20:11:34 +0000 (13:11 -0700)]
Avoid complaining about empty directories
Change-Id: If46bffd1c4e6b94f2e476b2d7d506ef337bbf8e1
Kenny Root [Mon, 18 Jul 2011 19:01:29 +0000 (12:01 -0700)]
am
db549686: am
099aa4cf: am
b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '
db5496867968fe592de807e606dc11287ca61c6a':
Only include "[a-z]*.bash" files for completion
Kenny Root [Mon, 18 Jul 2011 18:57:24 +0000 (11:57 -0700)]
am
099aa4cf: am
b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '
099aa4cf4d82218110c6edf3edede0e72450216e':
Only include "[a-z]*.bash" files for completion
Kenny Root [Mon, 18 Jul 2011 18:54:15 +0000 (11:54 -0700)]
am
b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '
b8a1c89b3a848ea343c897b33e77455dc2f98119':
Only include "[a-z]*.bash" files for completion
Kenny Root [Mon, 18 Jul 2011 18:44:26 +0000 (11:44 -0700)]
Merge "Only include "[a-z]*.bash" files for completion"
Kenny Root [Mon, 18 Jul 2011 18:15:31 +0000 (11:15 -0700)]
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
Kenny Root [Fri, 15 Jul 2011 21:55:26 +0000 (14:55 -0700)]
am
cb255e51: am
8985d033: am
88dcfccb: Merge "Add bash completion to envsetup"
* commit '
cb255e514093eaa839b1ac2487bdc2ec60797415':
Add bash completion to envsetup
Kenny Root [Fri, 15 Jul 2011 21:52:57 +0000 (14:52 -0700)]
am
8985d033: am
88dcfccb: Merge "Add bash completion to envsetup"
* commit '
8985d0337814219235a9698c99cf318682367560':
Add bash completion to envsetup
Kenny Root [Fri, 15 Jul 2011 21:50:05 +0000 (14:50 -0700)]
am
88dcfccb: Merge "Add bash completion to envsetup"
* commit '
88dcfccb5b064735177e1a87f578d6c734b47bc7':
Add bash completion to envsetup
Kenny Root [Fri, 15 Jul 2011 21:41:14 +0000 (14:41 -0700)]
Merge "Add bash completion to envsetup"
Kenny Root [Fri, 15 Jul 2011 18:07:06 +0000 (11:07 -0700)]
Add bash completion to envsetup
Change-Id: I0b4d74e72deede42d7e5f229593d79417f16bb55
Ying Wang [Thu, 14 Jul 2011 16:18:31 +0000 (09:18 -0700)]
am
46db7b79: am
fbfd654f: Switch Unbundled apps from generic.mk to full.mk.
* commit '
46db7b791af1ec1d086f7dd73c737a79322e3e3e':
Switch Unbundled apps from generic.mk to full.mk.
Ying Wang [Thu, 14 Jul 2011 05:38:35 +0000 (22:38 -0700)]
am
fbfd654f: Switch Unbundled apps from generic.mk to full.mk.
* commit '
fbfd654f67609d019de8111480ebe374669ffef2':
Switch Unbundled apps from generic.mk to full.mk.
David 'Digit' Turner [Mon, 11 Jul 2011 18:55:35 +0000 (11:55 -0700)]
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
...
David 'Digit' Turner [Mon, 11 Jul 2011 18:20:12 +0000 (20:20 +0200)]
resolved conflicts for merge of
09636e17 to gingerbread-plus-aosp
Change-Id: If2b21def45b5de222e560af442a0ff9f56da5a35
Ying Wang [Mon, 11 Jul 2011 16:57:08 +0000 (09:57 -0700)]
Switch Unbundled apps from generic.mk to full.mk.
Change-Id: Ib0b84e041275a5ad389a122f0349a85008496be2
Scott Main [Sat, 9 Jul 2011 00:45:38 +0000 (17:45 -0700)]
am
040221a9: am
1e03253b: Merge "docs: fix xss vulnerability bug
5008593" into honeycomb-mr2
* commit '
040221a9949c9f158cb7fc20b70b065289fcbbb1':
docs: fix xss vulnerability bug
5008593
Scott Main [Sat, 9 Jul 2011 00:44:08 +0000 (17:44 -0700)]
am
1e03253b: Merge "docs: fix xss vulnerability bug
5008593" into honeycomb-mr2
* commit '
1e03253bf263472ea0028d2518292beaf4cbe01a':
docs: fix xss vulnerability bug
5008593
Scott Main [Sat, 9 Jul 2011 00:42:40 +0000 (17:42 -0700)]
Merge "docs: fix xss vulnerability bug
5008593" into honeycomb-mr2
Scott Main [Fri, 8 Jul 2011 23:19:25 +0000 (16:19 -0700)]
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
Jaikumar Ganesh [Fri, 8 Jul 2011 19:12:14 +0000 (12:12 -0700)]
am
eb0a62cb: (-s ours) am
b399f5e8: Merge "Rename health shared library."
* commit '
eb0a62cb26d7bed289df823e2d68e422c39b5659':
Rename health shared library.
Jaikumar Ganesh [Fri, 8 Jul 2011 18:34:46 +0000 (11:34 -0700)]
am
b399f5e8: Merge "Rename health shared library."
* commit '
b399f5e81e2a644776f163e499df5bd0a38fe272':
Rename health shared library.
Jaikumar Ganesh [Fri, 8 Jul 2011 18:25:33 +0000 (11:25 -0700)]
Merge "Rename health shared library."
Jaikumar Ganesh [Fri, 8 Jul 2011 18:20:23 +0000 (11:20 -0700)]
Rename health shared library.
Change-Id: Ibd95333433bc2fb12322a9683bb3e0c0176dbce9
Joe Malin [Fri, 8 Jul 2011 17:38:37 +0000 (10:38 -0700)]
am
2c97d30f: am
8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit '
2c97d30fefed3430daa356418146d2cbb1f23c8f':
DOC CHANGE: Change GTV icons for home page
Joe Malin [Fri, 8 Jul 2011 16:29:29 +0000 (09:29 -0700)]
am
8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit '
8cf99f0ccee8ecc95183f939d633a514e7eebdfb':
DOC CHANGE: Change GTV icons for home page
David 'Digit' Turner [Fri, 8 Jul 2011 16:19:01 +0000 (18:19 +0200)]
merge intel x86 patches into gingerbread branch
David 'Digit' Turner [Thu, 7 Jul 2011 23:56:51 +0000 (01:56 +0200)]
sdk-addon.mk: Copy image files to ABI-specific dir
Change-Id: I39ad022a5bb03ea39fc41c134d1d4855dc491deb
David 'Digit' Turner [Wed, 15 Jun 2011 23:32:20 +0000 (01:32 +0200)]
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
David 'Digit' Turner [Thu, 23 Jun 2011 10:49:02 +0000 (12:49 +0200)]
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
David 'Digit' Turner [Wed, 15 Jun 2011 13:33:24 +0000 (15:33 +0200)]
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
Bruce Beare [Thu, 8 Jul 2010 21:59:16 +0000 (14:59 -0700)]
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>
Bruce Beare [Wed, 2 Mar 2011 16:29:59 +0000 (08:29 -0800)]
sdk: Add pc-bios files for IA qemu emulator
Orig-Change-Id: Ia919ff57295cd020810989f241da713210bc8720
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Tue, 31 May 2011 20:16:31 +0000 (13:16 -0700)]
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>