OSDN Git Service
Mathew Inwood [Wed, 21 Aug 2013 17:13:33 +0000 (10:13 -0700)]
am
0735c5f0: Remove ApplicationsProvider.
* commit '
0735c5f08cd6dd617965c57ca5607b2c26c7ca6e':
Remove ApplicationsProvider.
Mathew Inwood [Wed, 21 Aug 2013 10:13:18 +0000 (11:13 +0100)]
Remove ApplicationsProvider.
ApplicationsProvider is going away since it's no longer needed. Remove it
from the build config.
Also add cleansteps to remove the APK & intermediates.
Bug:
10407790
Change-Id: I0b273d22e309822fde6d753b541f7ac648607b4e
Jeff Brown [Wed, 21 Aug 2013 00:32:45 +0000 (17:32 -0700)]
am
91efe6bb: Merge "Enhance \'stacks\' script to handle native processes." into klp-dev
* commit '
91efe6bbb7bd05038b7ec4e713b70582b7dd53a2':
Enhance 'stacks' script to handle native processes.
Scott Main [Wed, 21 Aug 2013 00:32:44 +0000 (17:32 -0700)]
am
0dcef01e: am
feb45280: am
8088dd2f: am
ad08f07c: new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we\'ll later update to handle the Google reference nav as well
* commit '
0dcef01e1e08ca61754cbfd8ebe8d13696beb31e':
new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we'll later update to handle the Google reference nav as well
Jeff Brown [Wed, 21 Aug 2013 00:29:46 +0000 (00:29 +0000)]
Merge "Enhance 'stacks' script to handle native processes." into klp-dev
Scott Main [Wed, 21 Aug 2013 00:28:14 +0000 (17:28 -0700)]
am
feb45280: am
8088dd2f: am
ad08f07c: new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we\'ll later update to handle the Google reference nav as well
* commit '
feb45280aa67e4fd7280d15caae3673b82895624':
new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we'll later update to handle the Google reference nav as well
Scott Main [Wed, 21 Aug 2013 00:24:01 +0000 (17:24 -0700)]
am
8088dd2f: am
ad08f07c: new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we\'ll later update to handle the Google reference nav as well
* commit '
8088dd2f83ae17a1343de87750d39f8264d7b7bc':
new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we'll later update to handle the Google reference nav as well
Scott Main [Wed, 21 Aug 2013 00:21:31 +0000 (17:21 -0700)]
am
ad08f07c: new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we\'ll later update to handle the Google reference nav as well
* commit '
ad08f07cf2ece7a3711eafa382cf741134c69083':
new version of script to build sidenav lists dynamically. This is currently used only by the samples nav, but we'll later update to handle the Google reference nav as well
Scott Main [Tue, 20 Aug 2013 23:49:57 +0000 (16:49 -0700)]
new version of script to build sidenav lists dynamically.
This is currently used only by the samples nav, but we'll
later update to handle the Google reference nav as well
Change-Id: I907ea8cb096148ba50808623ed872c8defc9a135
Jason Monk [Tue, 20 Aug 2013 23:41:51 +0000 (16:41 -0700)]
am
d33c33f7: Merge "Remove old PAC dependency and add new one." into klp-dev
* commit '
d33c33f71cc57cbaf99fefa11360c0f6d127e2ea':
Remove old PAC dependency and add new one.
Jason Monk [Tue, 20 Aug 2013 23:36:44 +0000 (23:36 +0000)]
Merge "Remove old PAC dependency and add new one." into klp-dev
Jeff Brown [Mon, 19 Aug 2013 22:14:16 +0000 (15:14 -0700)]
Enhance 'stacks' script to handle native processes.
Automatically detects whether the process is native or managed
and dumps the stacks accordingly.
Change-Id: Ifba65279f1d1b9714b66aa6990bab05575871d28
Ying Wang [Mon, 19 Aug 2013 23:21:53 +0000 (16:21 -0700)]
am
20c768d2: am
c5cc2f6d: Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
* commit '
20c768d2128364a6a9373dd8ef432bf55512bf37':
[MIPS] Add support for MXU instructions for Ingenic builds.
Ying Wang [Mon, 19 Aug 2013 23:19:39 +0000 (16:19 -0700)]
am
c5cc2f6d: Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
* commit '
c5cc2f6dafaa1826322415f91048b97cfab80556':
[MIPS] Add support for MXU instructions for Ingenic builds.
Ying Wang [Mon, 19 Aug 2013 23:16:27 +0000 (23:16 +0000)]
Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
Dirk Dougherty [Mon, 19 Aug 2013 22:06:09 +0000 (15:06 -0700)]
am
b9fe2d2c: am
337ebc19: am
62c755a5: am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
b9fe2d2c93ae9734d174f07427ebb3d17b7b346c':
Clean up core css changes brought in with samples css.
Dirk Dougherty [Mon, 19 Aug 2013 22:02:50 +0000 (15:02 -0700)]
am
337ebc19: am
62c755a5: am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
337ebc195ff7ebb4f12b9012ccfc9f89a8a66570':
Clean up core css changes brought in with samples css.
Dirk Dougherty [Mon, 19 Aug 2013 22:00:39 +0000 (15:00 -0700)]
am
62c755a5: am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
62c755a52a74dc2f887d51d48105eebff17a6346':
Clean up core css changes brought in with samples css.
Dirk Dougherty [Mon, 19 Aug 2013 21:57:19 +0000 (14:57 -0700)]
am
f5ffd4a4: Clean up core css changes brought in with samples css.
* commit '
f5ffd4a40c7a2165ff6ebe24a2aa189dea6b1806':
Clean up core css changes brought in with samples css.
Ying Wang [Mon, 19 Aug 2013 21:29:32 +0000 (14:29 -0700)]
am
fa67740a: am
25977365: Merge "mkbootimg: Support custom mkbootimg implementation"
* commit '
fa67740ae41fc068d9a9b5fbf5a7a06c36dbbdb1':
mkbootimg: Support custom mkbootimg implementation
Ying Wang [Mon, 19 Aug 2013 21:26:35 +0000 (14:26 -0700)]
am
25977365: Merge "mkbootimg: Support custom mkbootimg implementation"
* commit '
259773656ac0c0c4ef588c949aaf21216c44b339':
mkbootimg: Support custom mkbootimg implementation
Ying Wang [Mon, 19 Aug 2013 21:24:07 +0000 (21:24 +0000)]
Merge "mkbootimg: Support custom mkbootimg implementation"
Jason Monk [Mon, 19 Aug 2013 19:42:32 +0000 (15:42 -0400)]
Remove old PAC dependency and add new one.
PAC support has been changed from a standalone executable to an apk
that needs to be part of the build. This removes the old depency
and adds the new one.
Bug:
10182711
Change-Id: I1291f54d81e6ec0c775e045a3446bd0cffb40019
Dirk Dougherty [Mon, 19 Aug 2013 19:26:07 +0000 (12:26 -0700)]
Clean up core css changes brought in with samples css.
Change-Id: I0920695be4f6ed7085508a4451c13bc7d9e65d9a
Dirk Dougherty [Mon, 19 Aug 2013 19:19:15 +0000 (12:19 -0700)]
am
2d028379: am
6d244fb2: am
d5ac8330: am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
2d0283792d1fd2fcb4f1dcdc4b34e40515f7393c':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Mon, 19 Aug 2013 19:14:19 +0000 (12:14 -0700)]
am
6d244fb2: am
d5ac8330: am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
6d244fb2ed0abdf843c33fca3a2ba2557ac921aa':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Mon, 19 Aug 2013 19:12:07 +0000 (12:12 -0700)]
am
d5ac8330: am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
d5ac833061b2233b71a60155656ca97cd5494746':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Mon, 19 Aug 2013 19:09:46 +0000 (12:09 -0700)]
am
4f7e5159: doc change: Samples browsing: basic support in templates and js/css.
* commit '
4f7e5159409e71ecfeba86858f5ec044d043aff8':
doc change: Samples browsing: basic support in templates and js/css.
Dirk Dougherty [Thu, 16 Sep 2010 17:43:40 +0000 (10:43 -0700)]
doc change: Samples browsing: basic support in templates and js/css.
Change-Id: Ie2323f5323c624420c90c8c782b840f183238f7c
Ying Wang [Sat, 17 Aug 2013 00:21:59 +0000 (17:21 -0700)]
am
a7deb085: Add phony goal GET-INSTALL-PATH
* commit '
a7deb0857c4fc0799cd1ebb82ff79dcbe2745ec0':
Add phony goal GET-INSTALL-PATH
Ying Wang [Fri, 16 Aug 2013 20:24:47 +0000 (13:24 -0700)]
Add phony goal GET-INSTALL-PATH
It can be used as a goal of mm/mmm.
It prints out modules' install paths, which can be used by the runtest
utility.
Change-Id: If113e4c990b672acbacf723104583c0157d43c3b
Pete Delaney [Fri, 16 Aug 2013 01:26:14 +0000 (18:26 -0700)]
[MIPS] Add support for MXU instructions for Ingenic builds.
This enables an Ingenic build to use MXU asm instructions.
MXU support was just recently added:
ASM: https://android-review.googlesource.com/63701
GCC: https://android-review.googlesource.com/63702
BIN: https://android-review.googlesource.com/#/c/63704/
Change-Id: I2b60567a689efa70ec064dfbb0f241a6bc61aed1
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
Scott Main [Thu, 15 Aug 2013 21:57:11 +0000 (14:57 -0700)]
am
6f03bd60: am
ce478d54: am
7e453280: am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions an
* commit '
6f03bd6092cba47d073e8bdc131d1cba89fa6c7c':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Scott Main [Thu, 15 Aug 2013 21:51:37 +0000 (14:51 -0700)]
am
ce478d54: am
7e453280: am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the referen
* commit '
ce478d54ad619c11b796b6286357c3203544d90d':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Scott Main [Thu, 15 Aug 2013 21:45:35 +0000 (14:45 -0700)]
am
7e453280: am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar w
* commit '
7e453280539406882215a0602ae6f63d7585fb9f':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Scott Main [Thu, 15 Aug 2013 21:43:45 +0000 (14:43 -0700)]
am
52dd2067: fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appe
* commit '
52dd206715e9d8e80a22c7106ec783324d51e747':
fix two bugs in site script. 1. Fix URL path check for reference docs to initalize api level and sidenav. Previously, this condition was never true, so the sidenav would not be initialized under default conditions and the reference drag bar would not appear. 2. Fix the recent change to the 'scroll into view' script so that it works properly in a multi-pane sidenav (reference docs) by again making the offset measurement relative to the parent container (but much better than was done before).
Ying Wang [Thu, 15 Aug 2013 21:42:57 +0000 (14:42 -0700)]
am
3208b615: am
fc8b6338: resolved conflicts for merge of
d65a7da3 to jb-mr2-dev-plus-aosp
* commit '
3208b615c5cde2b682c3bbbcd2bb064b14b57489':
No need to filter out AndroidConfig.h for unbundled build
Ying Wang [Thu, 15 Aug 2013 21:34:09 +0000 (14:34 -0700)]
am
fc8b6338: resolved conflicts for merge of
d65a7da3 to jb-mr2-dev-plus-aosp
* commit '
fc8b6338510690f1f87c57b9d9c470e25fc48bcd':
No need to filter out AndroidConfig.h for unbundled build
Scott Main [Thu, 15 Aug 2013 19:22:28 +0000 (12:22 -0700)]
fix two bugs in site script.
1. Fix URL path check for reference docs to initalize api level and sidenav.
Previously, this condition was never true, so the sidenav would not be initialized
under default conditions and the reference drag bar would not appear.
2. Fix the recent change to the 'scroll into view' script so that it works
properly in a multi-pane sidenav (reference docs) by again making the offset
measurement relative to the parent container (but much better than was done before).
Change-Id: I2a31ed59d772346651c2432f0ed26530983c49ff
Ying Wang [Thu, 15 Aug 2013 19:02:30 +0000 (12:02 -0700)]
resolved conflicts for merge of
d65a7da3 to jb-mr2-dev-plus-aosp
Change-Id: I14c4ddf5f02c8dec86f45bedf679bcebff1448dc
Ying Wang [Thu, 15 Aug 2013 18:55:46 +0000 (11:55 -0700)]
am
f4723fa4: No need to filter out AndroidConfig.h for unbundled build
* commit '
f4723fa49b6e61f727b6321a4006ee8ba3f393b9':
No need to filter out AndroidConfig.h for unbundled build
Ying Wang [Thu, 15 Aug 2013 18:01:10 +0000 (11:01 -0700)]
No need to filter out AndroidConfig.h for unbundled build
for now we have all AndroidConfig.hs in the build project.
Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
The Android Open Source Project [Wed, 14 Aug 2013 21:44:03 +0000 (14:44 -0700)]
Reconcile with klp-release - do not merge
Change-Id: Ic55943955deea3d844a22c766f3a389e6793925a
Vineeta Srivastava [Wed, 14 Aug 2013 20:45:43 +0000 (13:45 -0700)]
am
477b12b4: Fix missing camera from aosp builds.
* commit '
477b12b45ad0c8e73aafe12e3056c051080c0de9':
Fix missing camera from aosp builds.
Vineeta Srivastava [Wed, 14 Aug 2013 20:28:06 +0000 (13:28 -0700)]
Fix missing camera from aosp builds.
Camera is no longer part of Gallery2 application. Added Camera2 for aosp builds.
Bug:
10324351
Change-Id: I6c468344af04106704876ac945ccaffd9be1674b
The Android Automerger [Wed, 14 Aug 2013 19:37:11 +0000 (12:37 -0700)]
"KRS45B"
The Android Open Source Project [Wed, 14 Aug 2013 19:19:43 +0000 (12:19 -0700)]
am
f8fab173: am
fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
f8fab17322ebc221fb493331c3a93b2d852704ae':
"JWR66Y"
The Android Open Source Project [Wed, 14 Aug 2013 19:16:12 +0000 (12:16 -0700)]
am
fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
fb2188d1390841285181256a0ec37c5558c971da':
"JWR66Y"
The Android Open Source Project [Wed, 14 Aug 2013 19:06:41 +0000 (12:06 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I61c47285d236337a033e001c3b84a9631895bc5b
Ying Wang [Wed, 14 Aug 2013 16:33:58 +0000 (09:33 -0700)]
am
66956dc0: am
396fd67d: am
b9eee184: am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
66956dc063351f30434da9b6bb62183b50996583':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 16:28:18 +0000 (09:28 -0700)]
am
396fd67d: am
b9eee184: am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
396fd67d7a691a1226783f1b15442af86137eb3d':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 16:26:06 +0000 (09:26 -0700)]
am
b9eee184: am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
b9eee184f2ab291f5af6520c41f90a8857c4bd73':
Remove -allowaccessmodification from the basic Proguard flags
Ying Wang [Wed, 14 Aug 2013 16:22:01 +0000 (09:22 -0700)]
am
e391e7a8: Remove -allowaccessmodification from the basic Proguard flags
* commit '
e391e7a86e806bd3d2549b6d12736166fafb746f':
Remove -allowaccessmodification from the basic Proguard flags
The Android Automerger [Wed, 14 Aug 2013 13:08:19 +0000 (06:08 -0700)]
"KRS45"
The Android Automerger [Wed, 14 Aug 2013 13:04:55 +0000 (06:04 -0700)]
merge in klp-release history after reset to klp-dev
Ying Wang [Wed, 14 Aug 2013 01:29:30 +0000 (18:29 -0700)]
am
405dac7f: am
8f01a3c0: Merge "Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT."
* commit '
405dac7f000af3a02b374533f76a7f2eaedbc954':
Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT.
Ying Wang [Wed, 14 Aug 2013 01:27:19 +0000 (18:27 -0700)]
am
8f01a3c0: Merge "Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT."
* commit '
8f01a3c0cadec174d0b54b06848037ecf20694d9':
Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT.
Ying Wang [Wed, 14 Aug 2013 01:25:05 +0000 (01:25 +0000)]
Merge "Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT."
The Android Automerger [Wed, 14 Aug 2013 00:47:04 +0000 (17:47 -0700)]
"KRS44C"
Ying Wang [Wed, 14 Aug 2013 00:40:24 +0000 (17:40 -0700)]
Remove -allowaccessmodification from the basic Proguard flags
It seems with that flag Proguard modifies the class files in a way that
Dalvik does not like.
Bug:
10307364
Change-Id: If0cc7552da00ae8a3a3a39a9f2f029819ca3164a
Elliott Hughes [Wed, 14 Aug 2013 00:05:34 +0000 (17:05 -0700)]
Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT.
Change-Id: Id7c0e77110653e618d783026cd4b4aeadb3c45ec
Santos Cordon [Tue, 13 Aug 2013 22:32:14 +0000 (15:32 -0700)]
am
883b1c4e: Merge "The big switch. Enabling InCallUi/Phone split by default." into klp-dev
* commit '
883b1c4ee2ea71e542c8ab54aecc094806529304':
The big switch. Enabling InCallUi/Phone split by default.
The Android Automerger [Tue, 13 Aug 2013 22:20:55 +0000 (15:20 -0700)]
"JWR66Y"
Santos Cordon [Tue, 13 Aug 2013 22:11:25 +0000 (22:11 +0000)]
Merge "The big switch. Enabling InCallUi/Phone split by default." into klp-dev
Ying Wang [Tue, 13 Aug 2013 22:03:24 +0000 (15:03 -0700)]
am
a4ad06ac: am
750e0c08: Merge "Prepare upcoming GCC 4.8 release."
* commit '
a4ad06ac1db1dfc041fe386b76b22233fdc54341':
Prepare upcoming GCC 4.8 release.
Ying Wang [Tue, 13 Aug 2013 22:00:55 +0000 (15:00 -0700)]
am
750e0c08: Merge "Prepare upcoming GCC 4.8 release."
* commit '
750e0c088271315b21741429aa124d7ba616fcc7':
Prepare upcoming GCC 4.8 release.
Ying Wang [Tue, 13 Aug 2013 21:59:26 +0000 (21:59 +0000)]
Merge "Prepare upcoming GCC 4.8 release."
Ben Cheng [Tue, 13 Aug 2013 21:38:15 +0000 (14:38 -0700)]
Prepare upcoming GCC 4.8 release.
o Add -Wno-unused-parameter -Wno-unused-but-set-parameter to suppress
new warnings.
o Define GCC_COLORS to enable colorful diagnostic messages.
Change-Id: Icbd62300b0e6f39d4e514edec2431a06b4d72421
(cherry picked from internal commit
ccd8e6082b5b1e519a75068fa6c887a1a85b53c4)
Ying Wang [Tue, 13 Aug 2013 21:41:55 +0000 (14:41 -0700)]
am
285045bd: Support for LOCAL_HAL_STATIC_LIBRARIES
* commit '
285045bd83548196aa3695423c6cd500ebe6d6c1':
Support for LOCAL_HAL_STATIC_LIBRARIES
Ying Wang [Tue, 13 Aug 2013 19:35:10 +0000 (12:35 -0700)]
Support for LOCAL_HAL_STATIC_LIBRARIES
Now you can have a board config variable BOARD_HAL_STATIC_LIBRARIES,
which is a list of board-specific HAL static library names with pattern
"lib<library_name>.<board_specific_suffix>". LOCAL_HAL_STATIC_LIBRARIES
is a list of "lib<library_name>" and any matched
BOARD_HAL_STATIC_LIBRARIES will be added to the LOCAL_STATIC_LIBRARIES;
if no match is found, lib<library_name>.default will be used.
Bug:
10262105
Change-Id: Ic89d8d417d1dd65a227e4187a157fd3b77c4af34
The Android Automerger [Tue, 13 Aug 2013 20:25:24 +0000 (13:25 -0700)]
"KRS44B"
Ying Wang [Tue, 13 Aug 2013 17:48:41 +0000 (10:48 -0700)]
am
4c3a82fa: am
2863fa7a: Merge "FDO: support linux-x86 target"
* commit '
4c3a82fa62f8bfd4b0553cbd21b439ff2502d639':
FDO: support linux-x86 target
Ying Wang [Tue, 13 Aug 2013 17:45:05 +0000 (10:45 -0700)]
am
2863fa7a: Merge "FDO: support linux-x86 target"
* commit '
2863fa7a9650fa6df38da61329e2f49d5233c3df':
FDO: support linux-x86 target
Ying Wang [Tue, 13 Aug 2013 17:38:36 +0000 (17:38 +0000)]
Merge "FDO: support linux-x86 target"
The Android Open Source Project [Tue, 13 Aug 2013 17:14:02 +0000 (10:14 -0700)]
am
5e1e791f: am
5aac97cb: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '
5e1e791f3aaf6661ff4a21fe5b00f264057e862d':
"JLS36B"
JWR66X
JSS15P
The Android Open Source Project [Tue, 13 Aug 2013 17:11:58 +0000 (10:11 -0700)]
am
5aac97cb: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
* commit '
5aac97cbfcb3f638805311ffe733e5bf6dc29747':
"JLS36B"
JWR66X
JSS15P
The Android Open Source Project [Tue, 13 Aug 2013 17:09:56 +0000 (10:09 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2-zeroday-deb-release - do not merge
Change-Id: I80fa0805a168773ba273726fb4827b6cc24bfb08
The Android Automerger [Tue, 13 Aug 2013 13:07:27 +0000 (06:07 -0700)]
"KRS44"
The Android Automerger [Tue, 13 Aug 2013 13:00:55 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Santos Cordon [Tue, 13 Aug 2013 04:42:24 +0000 (21:42 -0700)]
The big switch. Enabling InCallUi/Phone split by default.
.:::. .:::.
:::::::.:::::::
:::::::::::::::
':::::::::::::'
':::::::::'
':::::'
':'
with love, from California
Change-Id: Iba25accb46f81f0c36a9e3f1df0f990e27f51b9f
The Android Automerger [Mon, 12 Aug 2013 19:31:31 +0000 (12:31 -0700)]
"KRS43B"
The Android Automerger [Mon, 12 Aug 2013 13:06:00 +0000 (06:06 -0700)]
"KRS43"
The Android Automerger [Mon, 12 Aug 2013 13:00:44 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
The Android Automerger [Sat, 10 Aug 2013 19:08:48 +0000 (12:08 -0700)]
"KRS39E"
Bjorn Andersson [Mon, 26 Nov 2012 00:53:44 +0000 (16:53 -0800)]
mkbootimg: Support custom mkbootimg implementation
Support using custom mkbootimg to allow boards to specify custom
boot image formats. Also export this as the environment variable
MKBOOTIMG to the *_from_target_files releasetools scripts.
Change-Id: I2084273b1175de097fb7da5c4f2264ea8014d74f
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
synergydev [Thu, 8 Aug 2013 20:08:26 +0000 (13:08 -0700)]
FDO: support linux-x86 target
Change-Id: I4a3a1d298176da109df316cf9128f19e77490bc9
Ying Wang [Fri, 9 Aug 2013 22:22:04 +0000 (15:22 -0700)]
am
ad7fd29b: Don\'t bother going through the source tree
* commit '
ad7fd29b312bf588b2be3f799715f34ff8a6d46b':
Don't bother going through the source tree
Ying Wang [Fri, 9 Aug 2013 20:38:43 +0000 (13:38 -0700)]
am
01c17f03: am
e58868ab: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"
* commit '
01c17f031286691abeb157cd26ac1785757f07f0':
Link PRIVATE_TARGET_FDO_LIB before shared libraries
Ying Wang [Fri, 9 Aug 2013 20:36:25 +0000 (13:36 -0700)]
am
e58868ab: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"
* commit '
e58868ab47fc044e9e7985c8357d83fee4df732a':
Link PRIVATE_TARGET_FDO_LIB before shared libraries
Ying Wang [Fri, 9 Aug 2013 20:33:10 +0000 (20:33 +0000)]
Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"
Ying Wang [Fri, 9 Aug 2013 19:47:17 +0000 (12:47 -0700)]
am
0a7e26e2: am
a3f69c93: Merge "Modify release tools to replace certs in MMAC files."
* commit '
0a7e26e29dfb5efbb008ced7509931e5e5eb4d71':
Modify release tools to replace certs in MMAC files.
Ying Wang [Fri, 9 Aug 2013 19:47:16 +0000 (12:47 -0700)]
am
2e45116d: am
515e0465: Merge "FDO: do not support host modules"
* commit '
2e45116d3a9c1ab055dd7a6a93bb4ab79414c081':
FDO: do not support host modules
Ying Wang [Fri, 9 Aug 2013 19:45:01 +0000 (12:45 -0700)]
am
a3f69c93: Merge "Modify release tools to replace certs in MMAC files."
* commit '
a3f69c933430e5117b5e37e786487abd3a3488ce':
Modify release tools to replace certs in MMAC files.
Ying Wang [Fri, 9 Aug 2013 19:45:00 +0000 (12:45 -0700)]
am
515e0465: Merge "FDO: do not support host modules"
* commit '
515e0465d169905e7e454207f3cbb2a57a033ae1':
FDO: do not support host modules
Ying Wang [Fri, 9 Aug 2013 19:42:09 +0000 (19:42 +0000)]
Merge "Modify release tools to replace certs in MMAC files."
Ying Wang [Thu, 8 Aug 2013 23:34:29 +0000 (16:34 -0700)]
Don't bother going through the source tree
Don't bother going through the source tree in more circumstances:
all cleaning goals, helping goals, no-deps goals.
Bug:
10244578
Change-Id: Id53a249085c62838e4193962a85e0ac34f46954f
The Android Automerger [Fri, 9 Aug 2013 16:57:42 +0000 (09:57 -0700)]
"KRS39D"
Robert Craig [Fri, 19 Apr 2013 14:59:22 +0000 (10:59 -0400)]
Modify release tools to replace certs in MMAC files.
Added support to perform a string replace of specified
dev keys with release keys when using the release tool
scripts.
Change-Id: Id0e945b0d62720c41f5ca9764a00de4bcdecaab4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
The Android Automerger [Fri, 9 Aug 2013 00:57:14 +0000 (17:57 -0700)]
KRS39C
The Android Automerger [Thu, 8 Aug 2013 23:53:41 +0000 (16:53 -0700)]
"JLS36B"