Wink Saville
43c1533988
Merge "DO NOT MERGE: resolved conflicts for merge of 15e199c8
to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-08-19 09:28:34 -07: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
Wink Saville
cd34366886
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
2011-08-17 11:27:01 -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
7d9fe51747
Merge "Add sdk/rule_api to the Windows build paths."
2011-08-17 11:06:39 -07:00
Wink Saville
15e199c857
DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2.
...
Change-Id: Ib30bf10669119b588c691e4cebdc8093f402e3e4
2011-08-17 10:03:51 -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
Ying Wang
6d38bdfc7b
resolved conflicts for merge of a74a4811
to honeycomb-plus-aosp
...
Change-Id: I8400ac2bead6aa1a9902d44bf65906084ad353ad
2011-08-11 16:55:00 -07:00
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
c55ebf232e
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.
2011-08-02 17:09:58 -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
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
Raphael Moll
dceb46559e
Merge "Add sdk/assetstudio to the Windows build paths."
2011-07-29 13:50: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
Kenny Root
3146eb76cf
am 1708a6f7: am 4880b436: am 62a2b188: Merge "Avoid complaining about empty directories"
...
* commit '1708a6f74bf36ad6d520476895695c26bdaf7306':
Avoid complaining about empty directories
2011-07-18 13:48:43 -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
1b61d1ba7b
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
2011-07-18 12:01:29 -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
5cc2e94fa8
am cb255e51: am 8985d033: am 88dcfccb: Merge "Add bash completion to envsetup"
...
* commit 'cb255e514093eaa839b1ac2487bdc2ec60797415':
Add bash completion to envsetup
2011-07-15 14:55:26 -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
8264e8f0f2
am 46db7b79: am fbfd654f: Switch Unbundled apps from generic.mk to full.mk.
...
* commit '46db7b791af1ec1d086f7dd73c737a79322e3e3e':
Switch Unbundled apps from generic.mk to full.mk.
2011-07-14 09:18: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
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
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
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