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
7d9799445d
IFL04C
2011-10-04 16:17:19 -07:00
fa2bf54a04
Support for product-specific dev keys.
...
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
2011-10-04 16:17:13 -07:00
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
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
81703a1900
Merge "Support for product-specific dev keys." into ics-factoryrom
2011-10-04 16:13:38 -07:00
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
54d34319d4
Merge "Put en_US as first product locale for SDK builds."
2011-10-04 14:26:08 -07:00
7744f611ef
Put en_US as first product locale for SDK builds.
...
Change-Id: I7b6dfa066aca75ba8d315bddf2492f81311a7761
2011-10-04 14:20:56 -07:00
138060bf6c
IFL04B
2011-10-04 14:02:12 -07:00
88c3110640
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-10-04 13:59:05 -07:00
6b14da784a
Reconcile with ics-factoryrom-release
...
Change-Id: I223d353a699f6f258e2a2e47f81d528879c4381b
2011-10-04 13:56:38 -07:00
3c21fe5b12
Support for product-specific dev keys.
...
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
2011-10-04 10:50:08 -07:00
12f60a5f34
Merge "Enforce no prebuilt apks in PRODUCT_COPY_FILES."
2011-10-04 10:14:43 -07:00
45a849049f
IFL04
2011-10-04 06:30:21 -07:00
72dfd5cfc1
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-10-04 06:27:17 -07:00
ad2a7a4175
Also package xhdpi res in the SDK image.
...
Change-Id: I39977f70b63353d1d61bbbef6207973ba2876ff9
2011-10-03 20:27:03 -07:00
9a5f0d04f4
IFL03C
2011-10-03 16:50:01 -07:00
dc40fafb49
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-10-03 16:49:41 -07:00
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
7175656fff
IFL03B
2011-10-03 14:55:41 -07:00
1b5f569537
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-10-03 14:51:54 -07:00
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
4b7294d0b5
Reconcile with ics-factoryrom-release
...
Change-Id: I51b4b8d176ec0513747cded7d63a45ab0c527abd
2011-10-03 07:41:03 -07:00
c85d7b1b75
IFL03
2011-10-03 06:30:22 -07:00
ac23e866a7
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-10-03 06:27:14 -07:00
7f30494551
Reconcile with ics-factoryrom-release
...
Change-Id: I07c391b65a870c4d557a51cc4ed00a5f9474cfed
2011-09-30 14:31:56 -07:00
2fdcea91f0
IFK92C
2011-09-30 14:08:49 -07:00
0146fd9387
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-30 14:08:26 -07:00
8f57945bf3
Reconcile with ics-factoryrom-release
...
Change-Id: I859743c56d3721278fed7e22b7d41d0592b00118
2011-09-30 13:24:17 -07:00
9a48076dc3
IFK92B
2011-09-30 13:14:43 -07:00
f2e11f50d6
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-30 13:11:02 -07:00
c800d69ce0
Reconcile with ics-factoryrom-release
...
Change-Id: Iec2a62de9ec37e871999a0580a83947080274bc7
2011-09-30 07:09:52 -07:00
f170fddab6
IFK92
2011-09-30 06:34:29 -07:00
d06c2f9fbe
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-30 06:31:24 -07:00
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
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
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
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
35c82d134e
IFK91C
2011-09-29 18:48:16 -07:00
b67c44a47a
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-29 18:45:07 -07:00
c454e2b907
IFK91B
2011-09-29 15:23:39 -07:00
73061d15f7
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-29 15:20:05 -07:00
b419b42d9f
Reconcile with ics-factoryrom-release
...
Change-Id: I255db04bfa6c81e1317f578cb0c05be25f3500d8
2011-09-29 14:24:43 -07:00
c825d3e352
am 6e69feed: Merge "allow APKs to be signed with multiple certs" into ics-factoryrom
...
* commit '6e69feed1a3d57d3206f7dabe32e06e8b07189e2':
allow APKs to be signed with multiple certs
2011-09-29 14:09:38 -07:00
6e69feed1a
Merge "allow APKs to be signed with multiple certs" into ics-factoryrom
2011-09-29 14:08:06 -07:00
6886410210
Enforce no prebuilt apks in PRODUCT_COPY_FILES.
...
Bug: 5391935
Change-Id: I106ffc3277914e57cc1a6fb4cd782286d61b8013
2011-09-29 13:23:25 -07:00
b40a58e4b3
allow APKs to be signed with multiple certs
...
The Package Manager handles this now. To share a UID, all packages
must be signed with exactly the same set of certs.
Change-Id: I2fd08923f55f02ae2f1d503266ab124be2472921
2011-09-29 13:22:57 -07:00
ebd1e25272
core/binary.mk: Add missing Objective-C objects to the build. DO NOT MERGE
...
NOTE: This is a back-port from AOSP into the internal gingerbread branch.
For some reason, all_objects was not listing objects generated from
objective-C sources. We need these for the emulator (which builds its
own version of SDL which uses Quartz on OS X).
+ Fix a typo in transform-host-m-to-o definition.
This also explains why https://review.source.android.com/#change,21074
had to be reverted, since it gets rid of the prebuilt SDL libraries when
building the emulator.
Change-Id: I03e179f3216ed95908bf8e8011d34109accff1b9
Orig-Change-Id: I173811cf11cdb5b045073aade59364236145bc77
2011-09-29 22:18:18 +02:00
0538111647
am d2ecb762: am fcf0ede1: Ignore 013607f9 from gingerbread (already here)
...
* commit 'd2ecb7628facb3413ed8dea97c0c388926f225df':
emulator: enable opengl emulation modules
2011-09-29 12:37:18 -07:00
Doug Zongker