Doug Zongker
|
b47cbd0dd5
|
Merge "add multiple key support to signapk"
|
2012-10-16 11:02:13 -07:00 |
|
Doug Zongker
|
b5f1d8bdc3
|
add multiple key support to signapk
Support signing .apks (but not OTA packages) with multiple keys.
Bug: 7350459
Change-Id: I794e1da0555e2bb9247a59c756656d4ca7ee04cf
|
2012-10-16 09:44:09 -07:00 |
|
Ying Wang
|
e215ed52c6
|
Add BOARD_DONT_BUILD_USERDATA_IMG
So board config can choose to not build userdata.img.
Change-Id: I1e6024abb7806492468801e49075fa24c05d2dd1
|
2012-10-15 15:16:34 -07:00 |
|
The Android Open Source Project
|
23717baba1
|
am 165c67aa : (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '165c67aacd8c6e8e6ffe57e673602952e4b56219':
JOP15
JOP14
JOP13
JOP12D
JVP12C
JOP12C
JOP12B
JVP12
JOP12
JOP11B
JVP11
|
2012-10-15 07:40:17 -07:00 |
|
The Android Open Source Project
|
165c67aacd
|
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I03093891a09e5cee2fee0838930b0578d31bb5fa
|
2012-10-15 07:37:49 -07:00 |
|
The Android Automerger
|
8a0808b3cd
|
JOP15
|
2012-10-15 07:00:37 -07:00 |
|
The Android Automerger
|
d785ffed2e
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-15 06:59:06 -07:00 |
|
The Android Automerger
|
4bfb52d947
|
JOP14
|
2012-10-14 06:59:49 -07:00 |
|
The Android Automerger
|
8c96ced2f3
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-14 06:59:03 -07:00 |
|
The Android Automerger
|
e9d3dd60ba
|
JOP13
|
2012-10-13 15:37:39 -07:00 |
|
The Android Automerger
|
267dc94e2b
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-13 15:36:55 -07:00 |
|
The Android Automerger
|
7708059b14
|
JOP12D
|
2012-10-13 03:50:53 -07:00 |
|
The Android Automerger
|
9e818d816f
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-13 03:49:55 -07:00 |
|
Guang Zhu
|
0067cc7ac7
|
am ea718cdb : (-s ours) am 0f23979f : am 18daa175 : Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
* commit 'ea718cdb7834444512c376942020bba88a9e9ed0':
DO NOT MERGE: better late than never: fix build id for JB MR1
|
2012-10-12 17:10:04 -07:00 |
|
Guang Zhu
|
ea718cdb78
|
am 0f23979f : am 18daa175 : Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
* commit '0f23979f29db6b46978b78da4db90df862ffb925':
DO NOT MERGE: better late than never: fix build id for JB MR1
|
2012-10-12 17:08:39 -07:00 |
|
Guang Zhu
|
0f23979f29
|
am 18daa175 : Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
* commit '18daa1750ba31b510d07d0f65e8e8007ed90b902':
DO NOT MERGE: better late than never: fix build id for JB MR1
|
2012-10-12 17:06:21 -07:00 |
|
Guang Zhu
|
18daa1750b
|
Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
|
2012-10-12 17:04:58 -07:00 |
|
The Android Automerger
|
3ccd6ed310
|
JVP12C
|
2012-10-12 16:35:29 -07:00 |
|
The Android Automerger
|
d444111588
|
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
|
2012-10-12 16:34:26 -07:00 |
|
The Android Automerger
|
0f72aa6578
|
JOP12C
|
2012-10-12 16:33:40 -07:00 |
|
The Android Automerger
|
86135e25d0
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-12 16:32:31 -07:00 |
|
The Android Automerger
|
7c9f90440d
|
JOP12B
|
2012-10-12 11:50:51 -07:00 |
|
The Android Automerger
|
c1b3082c8e
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-12 11:49:45 -07:00 |
|
Ying Wang
|
9f31a2bc1b
|
am 57dfd515 : am 6a44471c : am abc9d6f2 : Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
* commit '57dfd515c33bbab26c820c812ebb4bc69c36a38f':
Delete the unused LOCAL_POST_PROCESS_COMMAND.
|
2012-10-12 11:10:16 -07:00 |
|
Joe Onorato
|
cbb1d289ff
|
am bd31f173 : am f9f6084a : Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
* commit 'bd31f1733370e7b260078b67c5e3a88ec7c50b11':
Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
|
2012-10-12 11:10:15 -07:00 |
|
Ying Wang
|
57dfd515c3
|
am 6a44471c : am abc9d6f2 : Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
* commit '6a44471c3b295190125a8ba33a02ec8db3a6aba9':
Delete the unused LOCAL_POST_PROCESS_COMMAND.
|
2012-10-12 11:03:07 -07:00 |
|
Joe Onorato
|
bd31f17333
|
am f9f6084a : Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
* commit 'f9f6084aab34daf4ea7ddb697d84a8b147523763':
Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
|
2012-10-12 11:02:53 -07:00 |
|
Stephen Hines
|
daf2ca50dd
|
am d2637573 : resolved conflicts for merge of ed38fe6f to jb-mr1-dev-plus-aosp
* commit 'd26375733992298edc036652d25170e1cd7cbd49':
Add support for building Filterscript files.
|
2012-10-12 11:02:14 -07:00 |
|
The Android Automerger
|
7027936923
|
JVP12
|
2012-10-12 10:28:44 -07:00 |
|
The Android Automerger
|
5d8786bc37
|
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
|
2012-10-12 10:26:19 -07:00 |
|
The Android Automerger
|
c54eaf4fc2
|
JOP12
|
2012-10-12 07:00:22 -07:00 |
|
The Android Automerger
|
b2fe24f927
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-12 06:59:06 -07:00 |
|
Stephen Hines
|
d263757339
|
resolved conflicts for merge of ed38fe6f to jb-mr1-dev-plus-aosp
Change-Id: If699b3ccf1f3befd4df881e3eef6b90dd7c505bf
|
2012-10-11 22:08:57 -07:00 |
|
Ying Wang
|
6a44471c3b
|
am abc9d6f2 : Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
* commit 'abc9d6f2beca88dbd0ec021d343c68f4b617216d':
Delete the unused LOCAL_POST_PROCESS_COMMAND.
|
2012-10-11 18:03:22 -07:00 |
|
Ying Wang
|
abc9d6f2be
|
Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
|
2012-10-11 18:01:17 -07:00 |
|
Dirk Dougherty
|
2103600410
|
am 9f81546a : am fc8cec68 : am afc782da : am 77b10b6a : am e37b7a52 : am 8f20607c : Doc change: add new items to qv and adjust height.
* commit '9f81546a25b9228a0ccd55d16478d9a0beed5a85':
Doc change: add new items to qv and adjust height.
|
2012-10-11 17:54:25 -07:00 |
|
Ying Wang
|
85051a636a
|
am fa67cfe9 : am ad12a050 : am 11b15b15 : Resovle symlink in findmakefiles in envsetup.sh
* commit 'fa67cfe98c2271d8fa5d21af1c90ce6968a45983':
Resovle symlink in findmakefiles in envsetup.sh
|
2012-10-11 17:54:24 -07:00 |
|
Ying Wang
|
cef217d0f1
|
am 97b56bb1 : am 95d861ed : am 72405497 : Convert to relative path for CleanSpec.mk
* commit '97b56bb181910be250eceec966364fed245f5c6c':
Convert to relative path for CleanSpec.mk
|
2012-10-11 17:54:23 -07:00 |
|
Joe Onorato
|
f9f6084aab
|
Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
(makes generating code easier)
Change-Id: I1e2e882f7805dbfe4b726955eddc5ff8bc3e0005
|
2012-10-11 17:32:44 -07:00 |
|
Joe Onorato
|
71c0d6849f
|
Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
(makes generating code easier)
Change-Id: I1e2e882f7805dbfe4b726955eddc5ff8bc3e0005
|
2012-10-11 17:29:59 -07:00 |
|
Stephen Hines
|
ed38fe6fb8
|
am 0a0cfe95 : Merge "Add support for building Filterscript files." into jb-mr1-dev
* commit '0a0cfe95ac50457fe5539f913b372880ef841880':
Add support for building Filterscript files.
|
2012-10-11 17:27:30 -07:00 |
|
Ying Wang
|
c58b194e78
|
Delete the unused LOCAL_POST_PROCESS_COMMAND.
Change-Id: I77785dff6c7b2236880232522d6ed5bc01d5f0ce
|
2012-10-11 17:26:07 -07:00 |
|
Stephen Hines
|
0a0cfe95ac
|
Merge "Add support for building Filterscript files." into jb-mr1-dev
|
2012-10-11 17:25:21 -07:00 |
|
Dirk Dougherty
|
9f81546a25
|
am fc8cec68 : am afc782da : am 77b10b6a : am e37b7a52 : am 8f20607c : Doc change: add new items to qv and adjust height.
* commit 'fc8cec68facce8190d3a170d2accf9b16ce05aaa':
Doc change: add new items to qv and adjust height.
|
2012-10-11 17:14:19 -07:00 |
|
Ying Wang
|
fa67cfe98c
|
am ad12a050 : am 11b15b15 : Resovle symlink in findmakefiles in envsetup.sh
* commit 'ad12a050db35689da69a365d01b266c677b08a2c':
Resovle symlink in findmakefiles in envsetup.sh
|
2012-10-11 17:13:22 -07:00 |
|
Ying Wang
|
97b56bb181
|
am 95d861ed : am 72405497 : Convert to relative path for CleanSpec.mk
* commit '95d861ed9beff9e55c3283c1fa47c84ac61fa546':
Convert to relative path for CleanSpec.mk
|
2012-10-11 17:12:05 -07:00 |
|
Dirk Dougherty
|
fc8cec68fa
|
am afc782da : am 77b10b6a : am e37b7a52 : am 8f20607c : Doc change: add new items to qv and adjust height.
* commit 'afc782da46760e7f70df8fefc395b13e29933c5b':
Doc change: add new items to qv and adjust height.
|
2012-10-11 16:59:11 -07:00 |
|
Dirk Dougherty
|
afc782da46
|
am 77b10b6a : am e37b7a52 : am 8f20607c : Doc change: add new items to qv and adjust height.
* commit '77b10b6a78f8ef77e2d5bbb3cb650f953c642527':
Doc change: add new items to qv and adjust height.
|
2012-10-11 16:57:43 -07:00 |
|
The Android Automerger
|
b78e720015
|
JOP11B
|
2012-10-11 16:27:47 -07:00 |
|
The Android Automerger
|
59a1df50ca
|
merge in jb-mr1-release history after reset to jb-mr1-dev
|
2012-10-11 16:26:14 -07:00 |
|