git.osdn.net Git - android-x86/build.git/log

am 88eff0cb: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit '88eff0cb509bdd824c542b52880d9e93db4444a0':
  ICL47
  ICL46B
  ICL46
  ICL45B
  ICL45
  ICL44
  ITL41D
  ICL42C
  ICL42B
  ICL42
  ITL41C
  ITL41B
  ITL41
  ICL41

commit | commitdiff | tree

The Android Open Source Project [Wed, 16 Nov 2011 15:33:52 +0000 (07:33 -0800)]

Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: I76232373a2c25c0e18c27672ede2bb1b281e43f6

commit | commitdiff | tree

The Android Automerger [Wed, 16 Nov 2011 14:28:22 +0000 (06:28 -0800)]

ICL47

commit | commitdiff | tree

The Android Automerger [Wed, 16 Nov 2011 14:27:06 +0000 (06:27 -0800)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Wed, 16 Nov 2011 03:09:18 +0000 (19:09 -0800)]

ICL46B

commit | commitdiff | tree

The Android Automerger [Wed, 16 Nov 2011 03:07:30 +0000 (19:07 -0800)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Tue, 15 Nov 2011 14:28:19 +0000 (06:28 -0800)]

ICL46

commit | commitdiff | tree

The Android Automerger [Tue, 15 Nov 2011 14:27:08 +0000 (06:27 -0800)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Tue, 15 Nov 2011 01:14:35 +0000 (17:14 -0800)]

ICL45B

commit | commitdiff | tree

The Android Automerger [Tue, 15 Nov 2011 01:10:28 +0000 (17:10 -0800)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Mon, 14 Nov 2011 14:28:30 +0000 (06:28 -0800)]

ICL45

commit | commitdiff | tree

The Android Automerger [Mon, 14 Nov 2011 14:27:06 +0000 (06:27 -0800)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Sun, 13 Nov 2011 14:28:49 +0000 (06:28 -0800)]

ICL44

commit | commitdiff | tree

The Android Automerger [Sun, 13 Nov 2011 14:27:17 +0000 (06:27 -0800)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

Erik Gilling [Sat, 12 Nov 2011 04:35:06 +0000 (20:35 -0800)]

Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/build into ics-mr1-plus-aosp

commit | commitdiff | tree

Doug Zongker [Sat, 12 Nov 2011 04:34:47 +0000 (20:34 -0800)]

am 4a84a13e: am a5f534df: use frozensets to represent APK cert sets

* commit '4a84a13e7ce65f24bcadb8d331023b6415d7867e':
use frozensets to represent APK cert sets

commit | commitdiff | tree

Jean-Baptiste Queru [Sat, 12 Nov 2011 04:34:37 +0000 (20:34 -0800)]

am 1623f79c: Merge from ics-mr0

* commit '1623f79c7561b19f57c10ac303f6246deee7c634':
use frozensets to represent APK cert sets

commit | commitdiff | tree

Jean-Baptiste Queru [Sat, 12 Nov 2011 03:47:34 +0000 (19:47 -0800)]

Merge from ics-mr0

Change-Id: I5667c315fab589a2dc39e000a81397d317691895

commit | commitdiff | tree

Doug Zongker [Sat, 12 Nov 2011 03:17:24 +0000 (19:17 -0800)]

am a5f534df: use frozensets to represent APK cert sets

* commit 'a5f534df07a598f3fc9d353a1a9a0ff6c09cfbc0':
use frozensets to represent APK cert sets

commit | commitdiff | tree

The Android Automerger [Sat, 12 Nov 2011 03:08:23 +0000 (19:08 -0800)]

ITL41D

commit | commitdiff | tree

The Android Automerger [Sat, 12 Nov 2011 02:47:45 +0000 (18:47 -0800)]

ICL42C

commit | commitdiff | tree

The Android Automerger [Sat, 12 Nov 2011 02:33:07 +0000 (18:33 -0800)]

ICL42B

commit | commitdiff | tree

The Android Open Source Project [Sat, 12 Nov 2011 00:06:02 +0000 (16:06 -0800)]

am 324c814c: Merge from AOSP

* commit '324c814c6f479bb33eb8aa05d221c8a44b8f61b9':
Add a hash-bang as the first line of a shell script

commit | commitdiff | tree

The Android Open Source Project [Sat, 12 Nov 2011 00:03:39 +0000 (16:03 -0800)]

Merge from AOSP

Change-Id: Ie444a93a1fcba693332d302de828bdc62fd61647

commit | commitdiff | tree

The Android Automerger [Fri, 11 Nov 2011 22:47:46 +0000 (14:47 -0800)]

ICL42

commit | commitdiff | tree

The Android Automerger [Fri, 11 Nov 2011 22:45:37 +0000 (14:45 -0800)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

Jean-Baptiste Queru [Fri, 11 Nov 2011 22:31:18 +0000 (14:31 -0800)]

Add a hash-bang as the first line of a shell script

Change-Id: I5b663b036ecb25e952ecd2d998971cc326d4ebdf

commit | commitdiff | tree

Ying Wang [Fri, 11 Nov 2011 22:36:39 +0000 (14:36 -0800)]

am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES

* commit 'a032d3d07372423176e072dfcbcf60a53f8a7d57':
Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES

commit | commitdiff | tree

The Android Open Source Project [Fri, 11 Nov 2011 19:47:50 +0000 (11:47 -0800)]

am 600298c0: Merge from ics-mr0

* commit '600298c0baf773030d726f3a18bc543af98e13d4':

commit | commitdiff | tree

Ying Wang [Fri, 11 Nov 2011 18:52:12 +0000 (10:52 -0800)]

Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES

Bug: 5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1

commit | commitdiff | tree

Doug Zongker [Fri, 11 Nov 2011 17:51:37 +0000 (09:51 -0800)]

use frozensets to represent APK cert sets

Change-Id: Ic92c83be0c3f6a76bf1bd21f0216cd1b87586959

commit | commitdiff | tree

The Android Automerger [Fri, 11 Nov 2011 07:41:40 +0000 (23:41 -0800)]

ITL41C

commit | commitdiff | tree

The Android Open Source Project [Fri, 11 Nov 2011 02:26:35 +0000 (18:26 -0800)]

Merge from ics-mr0

Change-Id: I759452c031b9e2f02905dd488b61f100e3eaa87a

commit | commitdiff | tree

The Android Automerger [Fri, 11 Nov 2011 01:27:13 +0000 (17:27 -0800)]

ITL41B

commit | commitdiff | tree

The Android Automerger [Fri, 11 Nov 2011 01:22:24 +0000 (17:22 -0800)]

ITL41

commit | commitdiff | tree

Jim Huang [Thu, 10 Nov 2011 21:34:23 +0000 (21:34 +0000)]

am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE

* commit 'cb48497ff2f84e8f7def981246ddc028ea126879':
HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE

commit | commitdiff | tree

Jim Huang [Tue, 6 Sep 2011 17:25:28 +0000 (01:25 +0800)]

HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE

While building Android with latest host gcc, it causes the following
build error:

Install: out/host/linux-x86/bin/mkbootimg
host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
<built-in>:0:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors

In order to make build system happy, this patch does unset macro
_FORTIFY_SOURCE and then define it in host cflags.

Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2

commit | commitdiff | tree

Conley Owens [Thu, 10 Nov 2011 19:01:36 +0000 (19:01 +0000)]

am e915ab45: Place linker arguments after objects for gcc

* commit 'e915ab45a11f88c4fa5f2561c1aaca4b7d3d7593':
Place linker arguments after objects for gcc

commit | commitdiff | tree

Conley Owens [Thu, 10 Nov 2011 17:57:40 +0000 (09:57 -0800)]

Place linker arguments after objects for gcc

gcc 4.6.1 does not properly link if libraries are specified before
objects.

Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46

commit | commitdiff | tree

The Android Automerger [Thu, 10 Nov 2011 14:29:30 +0000 (06:29 -0800)]

ICL41

commit | commitdiff | tree

The Android Automerger [Thu, 10 Nov 2011 14:27:22 +0000 (06:27 -0800)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

Doug Zongker [Wed, 9 Nov 2011 19:03:52 +0000 (19:03 +0000)]

am 4b87f575: am 278c9781: to be upgraded, APKs must have exactly the same set of certs

* commit '4b87f575d45320260e35f224cd18f36eec5e3eb2':
to be upgraded, APKs must have exactly the same set of certs

commit | commitdiff | tree

Doug Zongker [Wed, 9 Nov 2011 19:02:26 +0000 (19:02 +0000)]

am 278c9781: to be upgraded, APKs must have exactly the same set of certs

* commit '278c9781ec5d2ef289fee635dfcfd8befcfe531b':
to be upgraded, APKs must have exactly the same set of certs

commit | commitdiff | tree

Doug Zongker [Wed, 9 Nov 2011 18:32:23 +0000 (10:32 -0800)]

to be upgraded, APKs must have exactly the same set of certs

Change-Id: I0d528d3d55e5ee553e57e63ed1f998172c6306f8

commit | commitdiff | tree

The Android Open Source Project [Wed, 9 Nov 2011 17:02:14 +0000 (17:02 +0000)]

am 2cc72714: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit '2cc727144133b71534d3654bfd00f62a4ac353b1':
  ICL40
  ITL39B
  ITL39

commit | commitdiff | tree

The Android Open Source Project [Wed, 9 Nov 2011 17:00:36 +0000 (09:00 -0800)]

Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: I85230491012b7871cedf93197c74d4b898d79bdf

commit | commitdiff | tree

The Android Open Source Project [Wed, 9 Nov 2011 14:35:46 +0000 (14:35 +0000)]

am 5f213f55: Reconcile with ics-mr0-release

* commit '5f213f5533d7c8871713fe25680d9ab37853792d':
ICL39

commit | commitdiff | tree

The Android Automerger [Wed, 9 Nov 2011 14:29:32 +0000 (06:29 -0800)]

ICL40

commit | commitdiff | tree

The Android Automerger [Wed, 9 Nov 2011 14:27:19 +0000 (06:27 -0800)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Wed, 9 Nov 2011 01:27:00 +0000 (17:27 -0800)]

ITL39B

commit | commitdiff | tree

The Android Automerger [Tue, 8 Nov 2011 19:41:56 +0000 (11:41 -0800)]

ITL39

commit | commitdiff | tree

The Android Open Source Project [Tue, 8 Nov 2011 19:07:58 +0000 (11:07 -0800)]

Reconcile with ics-mr0-release

Change-Id: Ie500b6cd75e6020240031cd70aadb1b921ed3318

commit | commitdiff | tree

The Android Automerger [Tue, 8 Nov 2011 14:41:55 +0000 (06:41 -0800)]

ICL39

commit | commitdiff | tree

The Android Automerger [Tue, 8 Nov 2011 14:39:48 +0000 (06:39 -0800)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Open Source Project [Mon, 7 Nov 2011 16:24:53 +0000 (16:24 +0000)]

am 55f675e9: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit '55f675e98ee93e6cb122796322846c6b12e066f3':
  ICL38
  ICL37
  ICL36
  ITL35B
  ICL35
  ITL35
  Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES

commit | commitdiff | tree

The Android Open Source Project [Mon, 7 Nov 2011 16:22:45 +0000 (08:22 -0800)]

Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: Ia7bf3982d1a8fe4e1a5c458849250c38f65a6d50

commit | commitdiff | tree

The Android Automerger [Mon, 7 Nov 2011 14:28:08 +0000 (06:28 -0800)]

ICL38

commit | commitdiff | tree

The Android Automerger [Mon, 7 Nov 2011 14:27:05 +0000 (06:27 -0800)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Sun, 6 Nov 2011 14:28:42 +0000 (06:28 -0800)]

ICL37

commit | commitdiff | tree

The Android Automerger [Sun, 6 Nov 2011 14:27:06 +0000 (06:27 -0800)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Sat, 5 Nov 2011 07:33:42 +0000 (00:33 -0700)]

ICL36

commit | commitdiff | tree

The Android Automerger [Sat, 5 Nov 2011 07:32:23 +0000 (00:32 -0700)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Sat, 5 Nov 2011 05:19:16 +0000 (22:19 -0700)]

ITL35B

commit | commitdiff | tree

The Android Automerger [Fri, 4 Nov 2011 22:42:21 +0000 (15:42 -0700)]

ICL35

commit | commitdiff | tree

The Android Automerger [Fri, 4 Nov 2011 22:38:52 +0000 (15:38 -0700)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Fri, 4 Nov 2011 22:18:00 +0000 (15:18 -0700)]

ITL35

commit | commitdiff | tree

James Dong [Fri, 4 Nov 2011 20:55:01 +0000 (13:55 -0700)]

Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES

Change-Id: I93bcf983f5f4da2d37c0f2186a04e7c197ef56a4

related-to-bug: 5566262

commit | commitdiff | tree

James Dong [Fri, 4 Nov 2011 21:40:31 +0000 (21:40 +0000)]

am ee3c1619: am ddc943da: Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES

* commit 'ee3c16196b2f2b67ff891b94d260f0c301f941c0':
Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES

commit | commitdiff | tree

James Dong [Fri, 4 Nov 2011 21:39:10 +0000 (21:39 +0000)]

am ddc943da: Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES

* commit 'ddc943da7e27d745517c50738c249b567970350e':
Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES

commit | commitdiff | tree

James Dong [Fri, 4 Nov 2011 20:55:01 +0000 (13:55 -0700)]

Fix missing SW h264 decoder and remove the non-existing SW avc decoder in product PRODUCT_PACKAGES

Change-Id: I93bcf983f5f4da2d37c0f2186a04e7c197ef56a4

related-to-bug: 5566262

commit | commitdiff | tree

The Android Open Source Project [Fri, 4 Nov 2011 14:58:25 +0000 (14:58 +0000)]

am 76d6da3e: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit '76d6da3edd25918d334d598845dc83ed7cc225e2':
  ITL34B
  ITL34
  ICL34
  ITL33D
  ITL33C

commit | commitdiff | tree

The Android Open Source Project [Fri, 4 Nov 2011 14:56:37 +0000 (07:56 -0700)]

Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: Ib37c1f38b47fe5c92f34b5587acd5e67a083f9a3

commit | commitdiff | tree

The Android Automerger [Fri, 4 Nov 2011 04:03:44 +0000 (21:03 -0700)]

ITL34B

commit | commitdiff | tree

Brian Muramatsu [Thu, 3 Nov 2011 19:57:48 +0000 (19:57 +0000)]

am e43794ac: am 277be2fe: Stop Packaging Old CTS Test Runner Files

* commit 'e43794ace2a32cff6b1896981ba8bd3a7fa9f562':
Stop Packaging Old CTS Test Runner Files

commit | commitdiff | tree

Brian Muramatsu [Thu, 3 Nov 2011 19:56:00 +0000 (19:56 +0000)]

am 277be2fe: Stop Packaging Old CTS Test Runner Files

* commit '277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb':
Stop Packaging Old CTS Test Runner Files

commit | commitdiff | tree

The Android Automerger [Thu, 3 Nov 2011 19:35:16 +0000 (12:35 -0700)]

ITL34

commit | commitdiff | tree

Brian Muramatsu [Thu, 3 Nov 2011 18:34:06 +0000 (11:34 -0700)]

Stop Packaging Old CTS Test Runner Files

Bug 5563917

This stops packaging the startcts script and the cts.jar into
the android-cts.zip. Since we are only testing using Tradefed,
we should prevent confusion by removing the old test runner.

Change-Id: I79f991617dd9e6a51a314207b4727cce3136d60f

commit | commitdiff | tree

The Android Automerger [Thu, 3 Nov 2011 13:35:26 +0000 (06:35 -0700)]

ICL34

commit | commitdiff | tree

The Android Automerger [Thu, 3 Nov 2011 13:32:09 +0000 (06:32 -0700)]

merge in ics-mr0-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Thu, 3 Nov 2011 04:22:44 +0000 (21:22 -0700)]

ITL33D

commit | commitdiff | tree

The Android Automerger [Thu, 3 Nov 2011 03:54:15 +0000 (20:54 -0700)]

ITL33C

commit | commitdiff | tree

The Android Automerger [Thu, 3 Nov 2011 03:52:48 +0000 (20:52 -0700)]

merge in ics-factoryrom-2-release history after reset to ics-mr0

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Nov 2011 18:40:46 +0000 (18:40 +0000)]

am 1b601a44: Merge "MR1 is version 4.1, API 15." into ics-mr1

* commit '1b601a447247bcc373d417d7be4c89c1e6216b89':
MR1 is version 4.1, API 15.

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Nov 2011 18:38:37 +0000 (11:38 -0700)]

Merge "MR1 is version 4.1, API 15." into ics-mr1

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Nov 2011 01:15:57 +0000 (18:15 -0700)]

MR1 is version 4.1, API 15.

Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a

commit | commitdiff | tree

The Android Open Source Project [Wed, 2 Nov 2011 17:54:21 +0000 (17:54 +0000)]

am 3bd8e467: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit '3bd8e467d7cd40c20f95fbf50de8f926ba301cb3':
  ITL33B
  ICL33B
  ICL33
  ITL33
  ITL33

commit | commitdiff | tree

The Android Open Source Project [Wed, 2 Nov 2011 17:52:42 +0000 (10:52 -0700)]

Reconcile with ics-mr0-release ics-factoryrom-2-release

Change-Id: Ifc368f50826b4d4bc955457e0cc370fc9e10e459

commit | commitdiff | tree

The Android Automerger [Wed, 2 Nov 2011 16:49:00 +0000 (09:49 -0700)]

ITL33B

commit | commitdiff | tree

The Android Automerger [Wed, 2 Nov 2011 16:48:54 +0000 (09:48 -0700)]

merge in ics-factoryrom-2-release history after reset to ics-mr0

commit | commitdiff | tree

The Android Automerger [Wed, 2 Nov 2011 14:39:30 +0000 (07:39 -0700)]

ICL33B