Commit Graph

7535 Commits

Author SHA1 Message Date
Jean-Baptiste Queru 1623f79c75 Merge from ics-mr0
Change-Id: I5667c315fab589a2dc39e000a81397d317691895
2011-11-11 19:47:47 -08:00
Doug Zongker 4a84a13e7c am a5f534df: use frozensets to represent APK cert sets
* commit 'a5f534df07a598f3fc9d353a1a9a0ff6c09cfbc0':
  use frozensets to represent APK cert sets
2011-11-11 19:17:24 -08:00
The Android Automerger a5158b31d9 ITL41D 2011-11-11 19:08:23 -08:00
The Android Automerger 6826c2b159 ICL42C 2011-11-11 18:47:45 -08:00
The Android Automerger 11a0b04ae6 ICL42B 2011-11-11 18:33:07 -08:00
The Android Open Source Project e446160ae1 am 4115aeae: am 324c814c: Merge from AOSP
* commit '4115aeaef30cc2f13abc4a1e4165995909fa3098':
  Add a hash-bang as the first line of a shell script
2011-11-11 16:07:31 -08:00
The Android Open Source Project 4115aeaef3 am 324c814c: Merge from AOSP
* commit '324c814c6f479bb33eb8aa05d221c8a44b8f61b9':
  Add a hash-bang as the first line of a shell script
2011-11-11 16:06:02 -08:00
The Android Open Source Project 324c814c6f Merge from AOSP
Change-Id: Ie444a93a1fcba693332d302de828bdc62fd61647
2011-11-11 16:03:56 -08:00
The Android Automerger 07e699f9f2 ICL42 2011-11-11 14:47:46 -08:00
The Android Automerger 63dd3748e7 merge in ics-mr0-release history after reset to ics-mr0 2011-11-11 14:45:37 -08:00
Ying Wang 7deff5fc54 am bb5ada52: am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
* commit 'bb5ada524c3c15132c832e076104d44ca7dde5ad':
  Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
2011-11-11 14:38:14 -08:00
Jean-Baptiste Queru f9b556cd51 Add a hash-bang as the first line of a shell script
Change-Id: I5b663b036ecb25e952ecd2d998971cc326d4ebdf
2011-11-11 14:37:31 -08:00
Ying Wang bb5ada524c am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
* commit 'a032d3d07372423176e072dfcbcf60a53f8a7d57':
  Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
2011-11-11 14:36:39 -08:00
The Android Automerger 4af7c72030 IML41D 2011-11-11 11:51:55 -08:00
The Android Open Source Project 9ff0549621 am 19d01ee6: am 600298c0: Merge from ics-mr0
* commit '19d01ee6bff124e0d963d1eb3a63db3ab8008baa':
2011-11-11 11:50:55 -08:00
The Android Open Source Project 19d01ee6bf am 600298c0: Merge from ics-mr0
* commit '600298c0baf773030d726f3a18bc543af98e13d4':
2011-11-11 11:47:50 -08:00
Nick Kralevich 32a3e84f4d Merge "make gdbclient work on x86" 2011-11-11 11:43:11 -08:00
Ying Wang a032d3d073 Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
Bug: 5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
2011-11-11 10:52:12 -08:00
Doug Zongker a5f534df07 use frozensets to represent APK cert sets
Change-Id: Ic92c83be0c3f6a76bf1bd21f0216cd1b87586959
2011-11-11 09:51:37 -08:00
Nick Kralevich 0ab21d3ed3 make gdbclient work on x86
Change-Id: I2fd4fc2b89db13a8db1b177afdab593772cb12f8
2011-11-11 09:02:01 -08:00
The Android Automerger cf8caa89fd ITL41C 2011-11-10 23:41:40 -08:00
The Android Open Source Project 600298c0ba Merge from ics-mr0
Change-Id: I759452c031b9e2f02905dd488b61f100e3eaa87a
2011-11-10 18:26:45 -08:00
The Android Automerger 06a3868721 IML41C 2011-11-10 17:35:49 -08:00
The Android Automerger b4da2d16c7 ITL41B 2011-11-10 17:27:13 -08:00
The Android Automerger 81fd27b46e ITL41 2011-11-10 17:22:24 -08:00
The Android Automerger 376271ad4c IML41B 2011-11-10 16:33:24 -08:00
Ying Wang c05642d726 Merge "Build cache.img on demand" 2011-11-10 15:28:09 -08:00
Dianne Hackborn 6e4e1bbbc1 Dev branch for ICS MR2.
Change-Id: I53c18f2e84cd0a5c6529da1acc5f2c8d0ad0ef2e
2011-11-10 15:19:51 -08:00
The Android Open Source Project 3f73914dc6 Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I66915bb61987f551738fb204474d5bd6f0a437fa
2011-11-10 14:35:18 -08:00
Ying Wang 9f8e8db188 Build cache.img on demand
Bug: 5153694
To build cache.img, set BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE (required,
ext4 only for now), BOARD_CACHEIMAGE_PARTITION_SIZE (optional) in
BoardConfig.mk.

Change-Id: I1d8b91646aa1dba88285e008ad3335768bcbddd2
2011-11-10 14:30:34 -08:00
Jim Huang ba2c734f71 am e39ee4d5: am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
* commit 'e39ee4d5e043872b3ef8053678a9c6020d82d4b6':
  HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
2011-11-10 21:35:56 +00:00
Jim Huang e39ee4d5e0 am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
* commit 'cb48497ff2f84e8f7def981246ddc028ea126879':
  HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
2011-11-10 21:34:23 +00:00
Jim Huang cb48497ff2 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
2011-11-10 13:28:13 -08:00
Conley Owens dd1926847e am e04c2c21: am e915ab45: Place linker arguments after objects for gcc
* commit 'e04c2c21ee40f7e54924c586d5e7c148e0955ee1':
  Place linker arguments after objects for gcc
2011-11-10 19:40:04 +00:00
Conley Owens e04c2c21ee am e915ab45: Place linker arguments after objects for gcc
* commit 'e915ab45a11f88c4fa5f2561c1aaca4b7d3d7593':
  Place linker arguments after objects for gcc
2011-11-10 19:01:36 +00:00
Conley Owens e915ab45a1 Place linker arguments after objects for gcc
gcc 4.6.1 does not properly link if libraries are specified before
objects.

Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
2011-11-10 10:55:13 -08:00
Conley Owens 7f59a7bc18 Merge "Place linker arguments after objects for gcc" 2011-11-10 10:54:36 -08:00
Conley Owens d9e7d25741 Place linker arguments after objects for gcc
gcc 4.6.1 does not properly link if libraries are specified before
objects.

Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
2011-11-10 09:57:40 -08:00
Doug Zongker 4906f456a4 am 53bef54c: am 4b87f575: am 278c9781: to be upgraded, APKs must have exactly the same set of certs
* commit '53bef54cfff0cb9c6a67494b3e385a9617f75d03':
  to be upgraded, APKs must have exactly the same set of certs
2011-11-10 16:14:42 +00:00
The Android Automerger 5a389be866 IML41 2011-11-10 06:48:52 -08:00
The Android Automerger 4bfc7d8a90 merge in ics-mr1-release history after reset to ics-mr1 2011-11-10 06:45:38 -08:00
The Android Automerger 702676b494 ICL41 2011-11-10 06:29:30 -08:00
The Android Automerger d1a30ea402 merge in ics-mr0-release history after reset to ics-mr0 2011-11-10 06:27:22 -08:00
The Android Open Source Project 4e684cd747 am c693f232: am 2cc72714: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit 'c693f232557f47fa89f2e15581fd5295ab646c89':
  ICL40
  ITL39B
  ITL39
2011-11-10 05:42:41 +00:00
The Android Open Source Project 89c066046c am e02350e3: am 5f213f55: Reconcile with ics-mr0-release
* commit 'e02350e36475cbbb7a855e1268efb315df79e84f':
  ICL39
2011-11-09 21:50:47 +00:00
Doug Zongker 53bef54cff 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
2011-11-09 19:03:52 +00:00
Doug Zongker 4b87f575d4 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
2011-11-09 19:02:26 +00:00
Doug Zongker 278c9781ec to be upgraded, APKs must have exactly the same set of certs
Change-Id: I0d528d3d55e5ee553e57e63ed1f998172c6306f8
2011-11-09 10:32:23 -08:00
The Android Automerger 8059e433e6 IML40B 2011-11-09 10:07:31 -08:00
The Android Automerger 9179004f66 merge in ics-mr1-release history after reset to ics-mr1 2011-11-09 10:05:38 -08:00