Commit graph

6490 commits

Author SHA1 Message Date
Doug Zongker
a4bbf24afd am f9ede7e9: Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom
* commit 'f9ede7e925a668cc8c0b44cb69c0795cb6c8c896':
  sign non-PRESIGNED prebuilt apks
2011-10-05 09:58:05 -07:00
Doug Zongker
f9ede7e925 Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom 2011-10-05 09:55:58 -07:00
Doug Zongker
08d79c12de sign non-PRESIGNED prebuilt apks
Since dev keys can now vary per device, we can't assume they are
checked in with the correct signature.

Change-Id: I7577a3a6bd98d005c15936c99b2944acc4412798
2011-10-05 09:49:24 -07:00
Ying Wang
5f61c30230 am 0611aeed: Merge "Install path support for vendor modules." into ics-factoryrom
* commit '0611aeedeb58bf4df1f1143f602aa64c8dbddc35':
  Install path support for vendor modules.
2011-10-05 09:09:38 -07:00
Ying Wang
0611aeedeb Merge "Install path support for vendor modules." into ics-factoryrom 2011-10-05 09:07:53 -07:00
The Android Open Source Project
fad908eeb1 Reconcile with ics-factoryrom-release
Change-Id: I0889aad04af7434aa750ff2152a4ea7a0d0279e3
2011-10-05 06:13:05 -07:00
The Android Automerger
38f89a40d2 IFL04E 2011-10-04 21:35:24 -07:00
The Android Automerger
57b205b9d2 IFL04D 2011-10-04 16:30:32 -07:00
Doug Zongker
8b9a1b135e change OTA tools to handle variable dev keys
The signing and OTA-building tools now understand the
default_sys_dev_certificate value which may be present in the
META/misc_info.txt file of the target-files packages.

Change-Id: I64f09ec0b77a5184b6ddb74019255518776ee773
2011-10-04 16:30:31 -07:00
The Android Automerger
7d9799445d IFL04C 2011-10-04 16:17:19 -07:00
Ying Wang
fa2bf54a04 Support for product-specific dev keys.
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
2011-10-04 16:17:13 -07:00
Ed Heyl
213c1f985d am 81703a19: Merge "Support for product-specific dev keys." into ics-factoryrom
* commit '81703a19001ec219c35cb0ecf9bafb6e0dbc1e1d':
  Support for product-specific dev keys.
2011-10-04 16:15:25 -07:00
Doug Zongker
8fcea64be0 am 831840e5: change OTA tools to handle variable dev keys
* commit '831840e51b0403671f746ebc32090b7d6e548c08':
  change OTA tools to handle variable dev keys
2011-10-04 16:13:47 -07:00
Ed Heyl
81703a1900 Merge "Support for product-specific dev keys." into ics-factoryrom 2011-10-04 16:13:38 -07:00
Doug Zongker
831840e51b change OTA tools to handle variable dev keys
The signing and OTA-building tools now understand the
default_sys_dev_certificate value which may be present in the
META/misc_info.txt file of the target-files packages.

Change-Id: I64f09ec0b77a5184b6ddb74019255518776ee773
2011-10-04 16:02:01 -07:00
Xavier Ducrohet
54d34319d4 Merge "Put en_US as first product locale for SDK builds." 2011-10-04 14:26:08 -07:00
Xavier Ducrohet
7744f611ef Put en_US as first product locale for SDK builds.
Change-Id: I7b6dfa066aca75ba8d315bddf2492f81311a7761
2011-10-04 14:20:56 -07:00
The Android Automerger
138060bf6c IFL04B 2011-10-04 14:02:12 -07:00
The Android Automerger
88c3110640 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-04 13:59:05 -07:00
The Android Open Source Project
6b14da784a Reconcile with ics-factoryrom-release
Change-Id: I223d353a699f6f258e2a2e47f81d528879c4381b
2011-10-04 13:56:38 -07:00
Ying Wang
3c21fe5b12 Support for product-specific dev keys.
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
2011-10-04 10:50:08 -07:00
Ying Wang
12f60a5f34 Merge "Enforce no prebuilt apks in PRODUCT_COPY_FILES." 2011-10-04 10:14:43 -07:00
The Android Automerger
45a849049f IFL04 2011-10-04 06:30:21 -07:00
The Android Automerger
72dfd5cfc1 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-04 06:27:17 -07:00
Xavier Ducrohet
ad2a7a4175 Also package xhdpi res in the SDK image.
Change-Id: I39977f70b63353d1d61bbbef6207973ba2876ff9
2011-10-03 20:27:03 -07:00
The Android Automerger
9a5f0d04f4 IFL03C 2011-10-03 16:50:01 -07:00
The Android Automerger
dc40fafb49 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-03 16:49:41 -07:00
Scott Main
8e83353d47 docs: fix visual bug in the search tabs.
I assume this was introduced by a change in the CSE implementation

Change-Id: I776e385fd6c0d738a4bbf8372911b205c1f98123
2011-10-03 15:34:32 -07:00
The Android Automerger
7175656fff IFL03B 2011-10-03 14:55:41 -07:00
The Android Automerger
1b5f569537 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-03 14:51:54 -07:00
Scott Main
bc54702626 docs: add 'reference' class for use with 'special' to refine the headings
used within the 'special' div when in the reference.

Change-Id: Iebf84484e2eda104b2247aefc5a539f2a62c5102
2011-10-03 13:01:43 -07:00
The Android Open Source Project
4b7294d0b5 Reconcile with ics-factoryrom-release
Change-Id: I51b4b8d176ec0513747cded7d63a45ab0c527abd
2011-10-03 07:41:03 -07:00
The Android Automerger
c85d7b1b75 IFL03 2011-10-03 06:30:22 -07:00
The Android Automerger
ac23e866a7 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-03 06:27:14 -07:00
The Android Open Source Project
7f30494551 Reconcile with ics-factoryrom-release
Change-Id: I07c391b65a870c4d557a51cc4ed00a5f9474cfed
2011-09-30 14:31:56 -07:00
The Android Automerger
2fdcea91f0 IFK92C 2011-09-30 14:08:49 -07:00
The Android Automerger
0146fd9387 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-30 14:08:26 -07:00
The Android Open Source Project
8f57945bf3 Reconcile with ics-factoryrom-release
Change-Id: I859743c56d3721278fed7e22b7d41d0592b00118
2011-09-30 13:24:17 -07:00
The Android Automerger
9a48076dc3 IFK92B 2011-09-30 13:14:43 -07:00
The Android Automerger
f2e11f50d6 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-30 13:11:02 -07:00
The Android Open Source Project
c800d69ce0 Reconcile with ics-factoryrom-release
Change-Id: Iec2a62de9ec37e871999a0580a83947080274bc7
2011-09-30 07:09:52 -07:00
The Android Automerger
f170fddab6 IFK92 2011-09-30 06:34:29 -07:00
The Android Automerger
d06c2f9fbe merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-30 06:31:24 -07:00
David Turner
66b0e2bddf am ff33471b: (-s ours) am 4c02d76b: (-s ours) am 719051f9: Merge "core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE" into gingerbread
* commit 'ff33471b8bb548643bb9624ee4866ad6e4713bf8':
  core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE
2011-09-29 21:10:43 -07:00
David Turner
ff33471b8b am 4c02d76b: (-s ours) am 719051f9: Merge "core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE" into gingerbread
* commit '4c02d76b8fd47d66896c9d133e8e7dbeb6dbb266':
  core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE
2011-09-29 21:04:41 -07:00
David Turner
4c02d76b8f am 719051f9: Merge "core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE" into gingerbread
* commit '719051f9878f85b57470d9047e8156320f31c98a':
  core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE
2011-09-29 21:00:32 -07:00
David Turner
719051f987 Merge "core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE" into gingerbread 2011-09-29 20:17:38 -07:00
The Android Automerger
35c82d134e IFK91C 2011-09-29 18:48:16 -07:00
The Android Automerger
b67c44a47a merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-29 18:45:07 -07:00
The Android Automerger
c454e2b907 IFK91B 2011-09-29 15:23:39 -07:00