OSDN Git Service
Alon Albert [Wed, 1 Feb 2012 23:33:12 +0000 (15:33 -0800)]
Add requestsync package
Change-Id: I0429a7cb238b124d3e42927b9dc806bbd5af0622
Scott Main [Tue, 31 Jan 2012 01:24:54 +0000 (17:24 -0800)]
am
a20557fb: am
2032e319: docs: add schema.org sitenavigation scope for sid-navs
* commit '
a20557fb4ddb3f008caf7bdb920c9ab90945ef7f':
docs: add schema.org sitenavigation scope for sid-navs
Scott Main [Tue, 31 Jan 2012 01:23:02 +0000 (17:23 -0800)]
am
2032e319: docs: add schema.org sitenavigation scope for sid-navs
* commit '
2032e31979d0708120b4785bad6ee19ee1c4dc0c':
docs: add schema.org sitenavigation scope for sid-navs
Scott Main [Tue, 31 Jan 2012 00:26:41 +0000 (16:26 -0800)]
docs: add schema.org sitenavigation scope for sid-navs
Change-Id: I0952195223f93bda67af0b951c3a061fe92948ce
Scott Main [Tue, 31 Jan 2012 00:17:13 +0000 (16:17 -0800)]
am
3728f56b: am
939c3f72: docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
* commit '
3728f56bc62f35d576b12180f5bbf33d0c83f00d':
docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
Scott Main [Tue, 31 Jan 2012 00:15:28 +0000 (16:15 -0800)]
am
939c3f72: docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
* commit '
939c3f72280fadbdc192b6bedd97555c2fcd4ef3':
docs: modify css to support sidenav headings with span, instead of h2 because I suspect the h2 is sending mixed signals to search engines for result snippets
Wink Saville [Mon, 30 Jan 2012 23:42:28 +0000 (15:42 -0800)]
Merge "Increase java heap size."
Wink Saville [Mon, 30 Jan 2012 23:30:10 +0000 (15:30 -0800)]
Increase java heap size.
I got an Out of memory while compiling, Andreas Huber suggested that
increasing the heap size, which worked.
Change-Id: Id8293ef100ef814b0fe13aa6e1b891a36a2ee853
Scott Main [Mon, 30 Jan 2012 23:28:24 +0000 (15:28 -0800)]
am
1d5b7c54: am
3652a113: docs: add support for meta descriptions in the <head>
* commit '
1d5b7c5490d256bdaa516db4aaed584e9f0d1469':
docs: add support for meta descriptions in the <head>
Scott Main [Mon, 30 Jan 2012 23:14:07 +0000 (15:14 -0800)]
docs: modify css to support sidenav headings with span, instead of h2
because I suspect the h2 is sending mixed signals to search engines for result snippets
Change-Id: I80f13774f25439efebcade1b9db41c005018d2aa
Scott Main [Mon, 30 Jan 2012 23:14:44 +0000 (15:14 -0800)]
am
3652a113: docs: add support for meta descriptions in the <head>
* commit '
3652a113d1a099ece283e3154188f4a42958c298':
docs: add support for meta descriptions in the <head>
James Dong [Mon, 30 Jan 2012 22:42:27 +0000 (14:42 -0800)]
Merge "Added libstagefright_soft_aacenc to all builds of all products"
The Android Open Source Project [Mon, 30 Jan 2012 21:38:36 +0000 (13:38 -0800)]
am
4e29e398: Reconcile with ics-mr1-release
* commit '
4e29e3986710c4078faaac9ae662d8f79d74d51f':
IMM30
IMM26
IMM25
IMM24
IMM20C
The Android Open Source Project [Mon, 30 Jan 2012 21:36:23 +0000 (13:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iae7c919c7e0b4dcbf024514431421cdfd225a507
The Android Automerger [Mon, 30 Jan 2012 21:26:51 +0000 (13:26 -0800)]
IMM30
The Android Automerger [Mon, 30 Jan 2012 21:21:49 +0000 (13:21 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Scott Main [Mon, 30 Jan 2012 21:03:08 +0000 (13:03 -0800)]
docs: add support for meta descriptions in the <head>
Change-Id: I7ff7a5083a75dde718b4701623e029c225289617
Ying Wang [Mon, 30 Jan 2012 21:00:49 +0000 (13:00 -0800)]
Merge "Build should fail if any proto file fails compiling"
James Dong [Mon, 30 Jan 2012 20:28:19 +0000 (12:28 -0800)]
Added libstagefright_soft_aacenc to all builds of all products
o related-to-bug:
5939000
Change-Id: I938890486ba560d598888a3dd73c8b16d3d82aa0
Ying Wang [Mon, 30 Jan 2012 19:56:07 +0000 (11:56 -0800)]
Build should fail if any proto file fails compiling
When compile multipling proto files to Java in a for loop.
Change-Id: Ie6a9d3972401b0ad6406bf911db916fcbf88037b
Scott Main [Mon, 30 Jan 2012 18:06:28 +0000 (10:06 -0800)]
am
c73e26f3: am
dc7418b2: docs: add images for g+ homepage announcement
* commit '
c73e26f3bd038b17e60e24d0ed4d6e125bc2ef00':
docs: add images for g+ homepage announcement
Scott Main [Mon, 30 Jan 2012 18:04:17 +0000 (10:04 -0800)]
am
dc7418b2: docs: add images for g+ homepage announcement
* commit '
dc7418b282faf264c495e82a5bc3366e8348676c':
docs: add images for g+ homepage announcement
Scott Main [Mon, 30 Jan 2012 17:53:13 +0000 (09:53 -0800)]
docs: add images for g+ homepage announcement
Change-Id: I36430a1885be368218e1c896d6fc008355096a06
Xavier Ducrohet [Sat, 28 Jan 2012 00:45:09 +0000 (16:45 -0800)]
Add missing tools jar to the sdk product modules.
Change-Id: Ifb44f38bd3d5d710fce1b6da11b40a524c3d09d8
Xavier Ducrohet [Fri, 27 Jan 2012 23:45:35 +0000 (15:45 -0800)]
Add annotations to the sdk build.
Change-Id: I4f13648f74c80f7ec13545066cdebd67e805d82e
The Android Automerger [Fri, 27 Jan 2012 02:32:53 +0000 (18:32 -0800)]
IMM26
The Android Automerger [Fri, 27 Jan 2012 02:31:51 +0000 (18:31 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Raphael Moll [Thu, 26 Jan 2012 23:11:46 +0000 (15:11 -0800)]
Move Windows SDK whitelist out of main.mk
This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.
Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git
Change-Id: Id6178b000c464c989da2c7f22977986a60de1f44
The Android Automerger [Wed, 25 Jan 2012 20:11:56 +0000 (12:11 -0800)]
IMM25
The Android Automerger [Wed, 25 Jan 2012 20:07:31 +0000 (12:07 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Wed, 25 Jan 2012 19:21:37 +0000 (11:21 -0800)]
You know back when I said this thing about Ice Cream Sandwich MR2?
What was I thinking?
That would be *ridiculous*.
What sane person would come up with a release like that?!?
I mean... four words! Six if you try to say it! Insane!!
Instead, we shall call you:
Jelly Bean.
Yum.
Change-Id: Ice28fc17b7eb77cf6b708958161339890234d1d8
The Android Automerger [Tue, 24 Jan 2012 21:35:44 +0000 (13:35 -0800)]
IMM24
The Android Automerger [Tue, 24 Jan 2012 21:31:44 +0000 (13:31 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:44:22 +0000 (08:44 -0800)]
am
40101047: am
7a8efe57: Merge "Remove non-existent AlarmProvider to fix SDK build."
* commit '
4010104732bdae0de5027c4241db5d3cb6230252':
Remove non-existent AlarmProvider to fix SDK build.
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:38:57 +0000 (08:38 -0800)]
am
7a8efe57: Merge "Remove non-existent AlarmProvider to fix SDK build."
* commit '
7a8efe57a9505940cd51c7664e8643ec9da9d24d':
Remove non-existent AlarmProvider to fix SDK build.
Jean-Baptiste Queru [Tue, 24 Jan 2012 15:50:01 +0000 (07:50 -0800)]
Merge "Remove non-existent AlarmProvider to fix SDK build."
The Android Automerger [Tue, 24 Jan 2012 00:55:54 +0000 (16:55 -0800)]
IMM20C
Ying Wang [Mon, 23 Jan 2012 18:53:23 +0000 (10:53 -0800)]
Remove non-existent AlarmProvider to fix SDK build.
Change-Id: Ifcd087b9022f29b4b7065a72cafbbc6b3704860b
The Android Open Source Project [Mon, 23 Jan 2012 18:41:27 +0000 (10:41 -0800)]
am
51475183: Reconcile with ics-mr1-release
* commit '
514751834753b30d37eae591ccce2e69e3468602':
IMM20B
IMM20
The Android Open Source Project [Mon, 23 Jan 2012 18:15:33 +0000 (10:15 -0800)]
Reconcile with ics-mr1-release
Change-Id: I6e64890cacfdb167f2f0c7a5e3917284e391ce11
The Android Open Source Project [Sat, 21 Jan 2012 00:37:56 +0000 (16:37 -0800)]
am
c541cd6e: Reconcile with ics-mr1-release
* commit '
c541cd6ecb59fdaa339585c48395d06ccd03867e':
IMM19
The Android Automerger [Sat, 21 Jan 2012 00:31:06 +0000 (16:31 -0800)]
IMM20B
The Android Automerger [Sat, 21 Jan 2012 00:15:22 +0000 (16:15 -0800)]
IMM20
The Android Automerger [Sat, 21 Jan 2012 00:11:14 +0000 (16:11 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Fri, 20 Jan 2012 23:52:13 +0000 (15:52 -0800)]
am
c9054b11: Reconcile with ics-mr1-release
* commit '
c9054b11fa3895fe70b2eaba849c6388df449c1e':
IMM18
IMM13
IMM12
Ying Wang [Fri, 20 Jan 2012 20:22:49 +0000 (12:22 -0800)]
Workaround for lack of "-Wl,--whole-archive" in MacOS's linker.
Change-Id: I2b1de0a253d341bcb7ee05fdc96bdc0d0967985e
The Android Open Source Project [Fri, 20 Jan 2012 18:25:20 +0000 (10:25 -0800)]
Reconcile with ics-mr1-release
Change-Id: I3bdc5d19073e63e031b684bede64b1f5ebdf13e7
The Android Automerger [Fri, 20 Jan 2012 00:31:16 +0000 (16:31 -0800)]
IMM19
The Android Automerger [Fri, 20 Jan 2012 00:27:27 +0000 (16:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Thu, 19 Jan 2012 21:06:25 +0000 (13:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I06332ff4f1ca17df8303819c8ea85cf5f63712ca
Doug Zongker [Thu, 19 Jan 2012 18:43:49 +0000 (10:43 -0800)]
prefer an explicitly-set TARGET_BOARD_INFO_FILE
Change-Id: Ie667a4d0070d1f0bbdfe9fa6d96871bcceb959b8
The Android Automerger [Thu, 19 Jan 2012 05:20:54 +0000 (21:20 -0800)]
IMM18
The Android Automerger [Thu, 19 Jan 2012 05:16:29 +0000 (21:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Doug Zongker [Tue, 17 Jan 2012 18:55:37 +0000 (10:55 -0800)]
add device-specific hooks at start of OTA phases
Change-Id: I47534e6d40e7918ee8cb9e87d76d9030b9273708
The Android Automerger [Sat, 14 Jan 2012 00:21:18 +0000 (16:21 -0800)]
IMM13
The Android Automerger [Sat, 14 Jan 2012 00:16:51 +0000 (16:16 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:20:34 +0000 (11:20 -0800)]
am
da3631db: (-s ours) am
fdbb9f94: am
96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
* commit '
da3631dbd120219b883973bb22b64ebd3ef33078':
Remove mention of layoutopt/uix as they are gone.
Jean-Baptiste Queru [Fri, 13 Jan 2012 01:20:28 +0000 (17:20 -0800)]
am
fdbb9f94: am
96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
* commit '
fdbb9f94bc4b22f60fb46d0babb52c2a0d047aef':
Remove mention of layoutopt/uix as they are gone.
Jean-Baptiste Queru [Fri, 13 Jan 2012 01:18:48 +0000 (17:18 -0800)]
am
96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."
* commit '
96a228bd7904b83274575522a267d178b3da2341':
Remove mention of layoutopt/uix as they are gone.
Ying Wang [Fri, 13 Jan 2012 00:38:17 +0000 (16:38 -0800)]
Compute TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX.
Sometimes TARGET_TOOLS_PREFIX is passed in as command line makefile
variable or environmental variable without TARGET_TOOLCHAIN_ROOT.
This change computes TARGET_TOOLCHAIN_ROOT from TARGET_TOOLS_PREFIX in
that case.
Change-Id: I0a37dc1f4d1e3e1951faeffd5e9f926f0a6614dd
Jean-Baptiste Queru [Thu, 12 Jan 2012 22:07:20 +0000 (14:07 -0800)]
Merge "Remove mention of layoutopt/uix as they are gone."
The Android Automerger [Thu, 12 Jan 2012 22:04:09 +0000 (14:04 -0800)]
IMM12
The Android Automerger [Thu, 12 Jan 2012 22:00:23 +0000 (14:00 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Glenn Kasten [Thu, 12 Jan 2012 18:14:23 +0000 (10:14 -0800)]
Merge "Fix build warning"
The Android Open Source Project [Thu, 12 Jan 2012 16:58:04 +0000 (08:58 -0800)]
am
6019f7b0: Reconcile with ics-mr1-release
* commit '
6019f7b0954cdf2e9063087c94f825778a6feda0':
IMM11
The Android Open Source Project [Thu, 12 Jan 2012 16:56:04 +0000 (08:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8aa81509837cca423f8ac241d97e45d822086acf
Glenn Kasten [Thu, 12 Jan 2012 15:30:27 +0000 (07:30 -0800)]
Fix build warning
Change-Id: I1e3a76e4bdae5eec4f75c5d8eb9f533afab6d140
Xavier Ducrohet [Thu, 12 Jan 2012 02:07:31 +0000 (18:07 -0800)]
Remove mention of layoutopt/uix as they are gone.
The Android Automerger [Thu, 12 Jan 2012 00:31:51 +0000 (16:31 -0800)]
IMM11
The Android Automerger [Thu, 12 Jan 2012 00:27:43 +0000 (16:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Brian Muramatsu [Wed, 11 Jan 2012 19:32:17 +0000 (11:32 -0800)]
Merge "Avoid Rebuilding Core and VMTest Descriptions"
Jean-Baptiste Queru [Wed, 11 Jan 2012 17:04:25 +0000 (09:04 -0800)]
Merge "Revert "Reference new location of SDK toolchain""
Jean-Baptiste Queru [Wed, 11 Jan 2012 17:00:41 +0000 (09:00 -0800)]
Revert "Reference new location of SDK toolchain"
This reverts commit
1b834c6660c80d376151e977466e1622b67a2af0.
Conley Owens [Wed, 11 Jan 2012 16:36:23 +0000 (08:36 -0800)]
Merge "Add a module_path_check for vendor files"
Jean-Baptiste Queru [Wed, 11 Jan 2012 14:36:55 +0000 (06:36 -0800)]
Merge "Reference new location of SDK toolchain"
Jean-Baptiste Queru [Wed, 11 Jan 2012 12:23:06 +0000 (04:23 -0800)]
Revert "Point arm toolchain to the new gcc-4.6 one."
This reverts commit
1f87795eef3ab5f63675dc6e01f304d1a6e46d2a.
Scott Main [Wed, 11 Jan 2012 01:18:50 +0000 (17:18 -0800)]
am
5c267863: am
f962eb10: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
* commit '
5c26786314c934819d460fb565be200ee8894ed0':
docs: add css for Android Design links and add link to site header
Scott Main [Wed, 11 Jan 2012 01:16:53 +0000 (17:16 -0800)]
am
f962eb10: Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
* commit '
f962eb101b21814556f4edeb7128508d47cf5564':
docs: add css for Android Design links and add link to site header
Scott Main [Wed, 11 Jan 2012 01:14:34 +0000 (17:14 -0800)]
Merge "docs: add css for Android Design links and add link to site header" into ics-mr1
Vladimir Chtchetkine [Wed, 11 Jan 2012 00:44:44 +0000 (16:44 -0800)]
am
02169251: (-s ours) am
2cbcd24b: Cherry-picked from
e6b969f3b in Do not merge.
* commit '
021692515734748c2632ce7a59fceed40a5eb9b6':
Cherry-picked from
e6b969f3b in master. Do not merge.
Vladimir Chtchetkine [Wed, 11 Jan 2012 00:42:47 +0000 (16:42 -0800)]
am
2cbcd24b: Cherry-picked from
e6b969f3b in Do not merge.
* commit '
2cbcd24ba708be5e387b8bf54351f5c2df7abbec':
Cherry-picked from
e6b969f3b in master. Do not merge.
Vladimir Chtchetkine [Tue, 13 Dec 2011 19:31:54 +0000 (11:31 -0800)]
Cherry-picked from
e6b969f3b in Do not merge.
Add boot property enabling ADBD over QEMU
Emulator and system image now support ADBD communication over QEMUD pipe rather
than over a TCP port forwarding. However, emulator has to know ahead of time
(before system starts booting) whether or not the system image supports ADBD
over pipe to properly setup the communication. For that, we introduce a boot
property "ro.adb.qemu" that is readable by the emulator early enough for the
proper ADB communication setup.
Change-Id: I978489c5acf46177b520e775d745bcc78f469837
Conley Owens [Tue, 10 Jan 2012 23:10:21 +0000 (15:10 -0800)]
Add a module_path_check for vendor files
When this is enabled we ensure that files from the vendor directory
get installed to /system/vendor/* instead of elsewhere in /system/*.
This changes the PRODUCT_RESTRICT_VENDOR_FILES variable
to accept "owner", "path", "owner path", or "all".
"true" will still only enforce vendor file owner restrictions.
Change-Id: I4598130a590ad56976e011f4cb2a9f5f227d5732
Scott Main [Tue, 10 Jan 2012 17:59:22 +0000 (09:59 -0800)]
docs: add css for Android Design links and add link to site header
Change-Id: I0a9469519076b1c5b9d7c121df1f2c731a08d2cb
Jean-Baptiste Queru [Mon, 9 Jan 2012 23:07:59 +0000 (15:07 -0800)]
Reference new location of SDK toolchain
Change-Id: If470d742a92061006d94b72f21df5c642348e179
Jean-Baptiste Queru [Mon, 9 Jan 2012 21:02:03 +0000 (13:02 -0800)]
Reference x86 toolchain in its new location
Change-Id: I990b03107d1596a87a8d4cea6973735c60db4c64
Ying Wang [Mon, 9 Jan 2012 19:52:23 +0000 (11:52 -0800)]
Reference the new prebuilt ccache location.
Change-Id: I4450a8254fe82ed3a670ce653f49381d9c075c8e
Steve Block [Sun, 8 Jan 2012 10:18:46 +0000 (10:18 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug:
5449033
Change-Id: Ieea4e4511e1a95caeea42cd0a0c1147ebf9c2f48
Jing Yu [Sat, 7 Jan 2012 04:29:15 +0000 (20:29 -0800)]
Merge "Point arm toolchain to the new gcc-4.6 one."
The Android Open Source Project [Sat, 7 Jan 2012 02:16:25 +0000 (18:16 -0800)]
am
2921f03d: Reconcile with ics-mr1-release
* commit '
2921f03d716f2aeb52712a81faaf7dfb597d0826':
IMM06
The Android Open Source Project [Sat, 7 Jan 2012 02:14:56 +0000 (18:14 -0800)]
Reconcile with ics-mr1-release
Change-Id: I6903bc47ab690fd56612f4e0e6289bf7a9799dca
Jean-Baptiste Queru [Sat, 7 Jan 2012 01:41:07 +0000 (17:41 -0800)]
am
9caacbd7: am
5ea72eff: Use the new location of the emulator kernel
* commit '
9caacbd74328624dfc753cecfc42cb29bf14bfad':
Use the new location of the emulator kernel
Jean-Baptiste Queru [Sat, 7 Jan 2012 01:37:02 +0000 (17:37 -0800)]
am
5ea72eff: Use the new location of the emulator kernel
* commit '
5ea72effbd944891708d2d6fb61055830e617701':
Use the new location of the emulator kernel
Jean-Baptiste Queru [Sat, 7 Jan 2012 00:44:06 +0000 (16:44 -0800)]
Use the new location of the emulator kernel
The Android Automerger [Sat, 7 Jan 2012 00:34:51 +0000 (16:34 -0800)]
IMM06
The Android Automerger [Sat, 7 Jan 2012 00:31:06 +0000 (16:31 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Baptiste Queru [Fri, 6 Jan 2012 23:22:50 +0000 (15:22 -0800)]
am
da1c81ab: am
a230c4d0: Reference kernel notice in the new location
* commit '
da1c81abe48c76f59953fd2e14a2ae2283d7bf92':
Reference kernel notice in the new location
Jean-Baptiste Queru [Fri, 6 Jan 2012 23:18:21 +0000 (15:18 -0800)]
am
a230c4d0: Reference kernel notice in the new location
* commit '
a230c4d049258915f6614e7a3fadc2dcfec3e160':
Reference kernel notice in the new location
Jean-Baptiste Queru [Fri, 6 Jan 2012 23:05:53 +0000 (15:05 -0800)]
Reference kernel notice in the new location
Jing Yu [Fri, 6 Jan 2012 22:14:06 +0000 (14:14 -0800)]
Point arm toolchain to the new gcc-4.6 one.
Tested build mysid-eng, sojus-eng, trygon-eng, yakju-eng.
Change-Id: I742cf9fcf2407b9098c99136d67161ecf062ac01
Conflicts:
core/combo/TARGET_linux-arm.mk
OSDN Git Service
