OSDN Git Service
Griff Hazen [Sat, 21 Jun 2014 20:19:17 +0000 (20:19 +0000)]
am
e47f4c65: (-s ours) am
90e99716: Merge "Move sdk staging dir to a product-specific dir. DO NOT MERGE." into klp-modular-dev
* commit '
e47f4c65dc70322f65584c4b4f747373a578a3e3':
Move sdk staging dir to a product-specific dir. DO NOT MERGE.
Griff Hazen [Sat, 21 Jun 2014 20:14:40 +0000 (20:14 +0000)]
am
90e99716: Merge "Move sdk staging dir to a product-specific dir. DO NOT MERGE." into klp-modular-dev
* commit '
90e99716c8e8ebf9b3cfd56387a02f843af67351':
Move sdk staging dir to a product-specific dir. DO NOT MERGE.
Tsu Chiang Chuang [Fri, 20 Jun 2014 23:27:21 +0000 (23:27 +0000)]
am
39175e17: (-s ours) Merge "Make default 64-bit primary, 32-bit secondary" into lmp-preview-dev
* commit '
39175e172c06181f727ace24a324e82e59aa312b':
Make default 64-bit primary, 32-bit secondary
Narayan Kamath [Fri, 20 Jun 2014 23:21:39 +0000 (23:21 +0000)]
am
0b638c08: Fix issue in symlinking 64 bit executables.
* commit '
0b638c087d21e2414290c4e02abb682bc53d48f3':
Fix issue in symlinking 64 bit executables.
Narayan Kamath [Fri, 20 Jun 2014 23:21:38 +0000 (23:21 +0000)]
am
31033fe0: SDK targets should inherit from core_64_bit.mk
* commit '
31033fe08d10990c0f820a603f221cf51b7c739e':
SDK targets should inherit from core_64_bit.mk
Brian Carlstrom [Fri, 20 Jun 2014 23:14:35 +0000 (23:14 +0000)]
am
515907a9: am
696f9d3e: am
e0be9135: Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"
* commit '
515907a98c3ddff2be42479364fd685103d06fe2':
Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
Bill Yi [Fri, 20 Jun 2014 23:14:34 +0000 (23:14 +0000)]
am
5ad302b0: (-s ours) am
9c623577: (-s ours) am
85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE"
* commit '
5ad302b0905f06454021fd636de4f2864eea6e82':
Restore AOSP-style version numbers - DO NOT MERGE
Brian Carlstrom [Fri, 20 Jun 2014 22:40:34 +0000 (22:40 +0000)]
am
696f9d3e: am
e0be9135: Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"
* commit '
696f9d3e9cedc221cf907a5cc49f4e6533033372':
Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
Bill Yi [Fri, 20 Jun 2014 22:40:15 +0000 (22:40 +0000)]
am
9c623577: (-s ours) am
85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE"
* commit '
9c6235777e89b54fd933c187ffa1d9184086a787':
Restore AOSP-style version numbers - DO NOT MERGE
smain@google.com [Fri, 20 Jun 2014 22:30:39 +0000 (22:30 +0000)]
am
1ac633c4: Merge "fix vertical spacing following collection" into klp-modular-dev
* commit '
1ac633c4c835b814545532ea71e230a5fd93cc1d':
fix vertical spacing following collection
smain@google.com [Fri, 20 Jun 2014 22:30:21 +0000 (22:30 +0000)]
am
eb01827b: reverse the blue button hover state color
* commit '
eb01827bef34ebbe8d867ec32a42b31e3c3f8abc':
reverse the blue button hover state color
smain@google.com [Fri, 20 Jun 2014 22:30:20 +0000 (22:30 +0000)]
am
baf5b60b: make primary landing button dark red
* commit '
baf5b60b1242710867878b350595cb98a9511b61':
make primary landing button dark red
smain@google.com [Fri, 20 Jun 2014 22:29:58 +0000 (22:29 +0000)]
am
cda1a9a7: add "static" class to allow hand-written version of collection card for the homepage and add "no-section" override to resource widget to enable title+description only card layout and make the landing-secondary button blue
* commit '
cda1a9a756cbe694fda94687eccf64fdabb8c775':
add "static" class to allow hand-written version of collection card for the homepage and add "no-section" override to resource widget to enable title+description only card layout and make the landing-secondary button blue
Brian Carlstrom [Fri, 20 Jun 2014 20:58:52 +0000 (20:58 +0000)]
am
e0be9135: Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"
* commit '
e0be9135a249ee5d60c6b897e7d538b1afb94b29':
Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
Tsu Chiang Chuang [Fri, 20 Jun 2014 23:19:33 +0000 (23:19 +0000)]
Merge "Make default 64-bit primary, 32-bit secondary" into lmp-preview-dev
Bill Yi [Fri, 20 Jun 2014 18:29:59 +0000 (18:29 +0000)]
am
85fe1439: (-s ours) Merge "Restore AOSP-style version numbers - DO NOT MERGE"
* commit '
85fe14395b8bbc5b44383c1705f60bfdc12c61cf':
Restore AOSP-style version numbers - DO NOT MERGE
Narayan Kamath [Tue, 17 Jun 2014 15:36:08 +0000 (16:36 +0100)]
Fix issue in symlinking 64 bit executables.
We were not inspecting the value of TARGET_SUPPORTS_{32,64}_BIT_APPS
so we'd sometimes create the wrong symlink if TARGET_IS_64_BIT was
true.
bug:
15661143
(cherry picked from commit
79bc52af37dd796f0588a03dc317d46b461b8e5d)
Change-Id: I736a7fa3986d6594293851a5f946c37e67d5a5a4
Narayan Kamath [Tue, 17 Jun 2014 16:43:14 +0000 (17:43 +0100)]
SDK targets should inherit from core_64_bit.mk
bug:
15661143
(cherry picked from commit
e78ba32d23dd3a1f3df1b861b1b17fced45801b0)
Change-Id: Icf9d0a7d429f848ca6163a8658c6e5f208fdd039
Brian Carlstrom [Mon, 16 Jun 2014 23:51:42 +0000 (16:51 -0700)]
Make default 64-bit primary, 32-bit secondary
This is required to get aarch64 & x86_64 emulators booting
on lmp-preview-dev. Without this change, the system_server
is a 32 bit process but java only apps that use the
"android.uid.system" shared UID are dex2oated to 64 bit and
won't work correctly.
The correct fix needs build system changes, so this is the
easiest fix for now.
Note that this happens to work on volantis because the package
manager adjusts their ABI correctly during boot. That can't
happen on emulators because of dex-preopt; dex2oat can't oatify
a dex file from inside an existing oat file.
(cherry picked from commit
d79504631926bbdd1bdc721e8824fcb8a9952f54)
Change-Id: Id94bcc382e90b279e726f2d1d0350fc60a5020df
smain@google.com [Fri, 20 Jun 2014 05:54:07 +0000 (22:54 -0700)]
reverse the blue button hover state color
Change-Id: Ib3b8abcd9683eda3b9a69f0c0ba1d53228191540
smain@google.com [Fri, 20 Jun 2014 05:24:44 +0000 (22:24 -0700)]
make primary landing button dark red
Change-Id: I2d515991ccdca79a28ee1ebe7706e8fbc3afc57e
Brian Carlstrom [Fri, 20 Jun 2014 20:55:58 +0000 (20:55 +0000)]
Merge "Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64"
Brian Carlstrom [Fri, 20 Jun 2014 20:09:25 +0000 (13:09 -0700)]
Bump BOARD_SYSTEMIMAGE_PARTITION_SIZE for generic_x86_64
Change-Id: Ia856159017f6228dbfd5a7100e3731b82e6e8fe4
Bill Yi [Fri, 20 Jun 2014 17:54:09 +0000 (17:54 +0000)]
Merge "Restore AOSP-style version numbers - DO NOT MERGE"
Griff Hazen [Fri, 20 Jun 2014 19:02:18 +0000 (19:02 +0000)]
Merge "Move sdk staging dir to a product-specific dir. DO NOT MERGE." into klp-modular-dev
Ying Wang [Mon, 2 Jun 2014 23:16:53 +0000 (16:16 -0700)]
Move sdk staging dir to a product-specific dir. DO NOT MERGE.
So we can do incremental build across different SDK products.
(cherry picked from commit
d7af17619983c4cf679abb034469098235e63ad5)
Change-Id: I7fc1489c00511b6689d738ee12f0347618c03aa3
smain@google.com [Fri, 20 Jun 2014 00:07:46 +0000 (17:07 -0700)]
add "static" class to allow hand-written version of collection card for the homepage
and add "no-section" override to resource widget to enable title+description only card layout
and make the landing-secondary button blue
Change-Id: I4432c2ff267c20cb64f9c87524560b2d779c9e91
Tsu Chiang Chuang [Fri, 20 Jun 2014 22:42:12 +0000 (22:42 +0000)]
Merge "add jdwp tests to CTS. Bug:
8538755"
smain@google.com [Fri, 20 Jun 2014 22:33:35 +0000 (22:33 +0000)]
am
a076aed1: am
1ac633c4: Merge "fix vertical spacing following collection" into klp-modular-dev
* commit '
a076aed1791cb86dee663c854315de5751462b90':
fix vertical spacing following collection
smain@google.com [Fri, 20 Jun 2014 22:33:34 +0000 (22:33 +0000)]
am
19194e2a: am
eb01827b: reverse the blue button hover state color
* commit '
19194e2a23d5d2e6c58a0126532d6c5a5f5c1ffc':
reverse the blue button hover state color
smain@google.com [Fri, 20 Jun 2014 22:33:33 +0000 (22:33 +0000)]
am
d357cc2f: am
baf5b60b: make primary landing button dark red
* commit '
d357cc2f011e9c9e361ec59482db9bce21198e43':
make primary landing button dark red
smain@google.com [Fri, 20 Jun 2014 22:33:32 +0000 (22:33 +0000)]
am
b07a681e: am
cda1a9a7: add "static" class to allow hand-written version of collection card for the homepage and add "no-section" override to resource widget to enable title+description only card layout and make the landing-secondary button blue
* commit '
b07a681e9ed1c5bc6f06880eee8e39304fea6b56':
add "static" class to allow hand-written version of collection card for the homepage and add "no-section" override to resource widget to enable title+description only card layout and make the landing-secondary button blue
Tsu Chiang Chuang [Wed, 18 Jun 2014 16:59:49 +0000 (09:59 -0700)]
add jdwp tests to CTS.
Bug:
8538755
Change-Id: Ie55c0f35ff956726a4f08734c2ad4dc03862dac7
smain@google.com [Fri, 20 Jun 2014 17:24:18 +0000 (17:24 +0000)]
Merge "fix vertical spacing following collection" into klp-modular-dev
smain@google.com [Fri, 20 Jun 2014 17:22:38 +0000 (10:22 -0700)]
fix vertical spacing following collection
Change-Id: I50ec016d646a8fd92cf1f85a844cb6f3bf96cf79
Ying Wang [Thu, 19 Jun 2014 23:07:30 +0000 (16:07 -0700)]
Reinforce the dependency on package-export.apk.
This fixes the bug that if an app has no resource at all, we should
still set up the dependency on package-export.apk, because the
AndroidManifest.xml may still reference symbols in package-export.apk.
Change-Id: Idb3f12abf55c04824da5b666fe7c49694e227e2c
smain@google.com [Thu, 19 Jun 2014 17:49:18 +0000 (17:49 +0000)]
am
b8281c70: add new preview watermark for docs
* commit '
b8281c70915cc296d7083f46811850e6888ffdf3':
add new preview watermark for docs
smain@google.com [Thu, 19 Jun 2014 16:51:30 +0000 (09:51 -0700)]
add new preview watermark for docs
Change-Id: Idd63395b6b53674d0db87fbbcf37eb4864accacd
Ying Wang [Thu, 19 Jun 2014 17:16:39 +0000 (17:16 +0000)]
am
318c8e76: am
17c6426e: Merge "Document the worker_threads option."
* commit '
318c8e76ee8f47fb9f077e419713cf4dbb454788':
Document the worker_threads option.
Ying Wang [Thu, 19 Jun 2014 17:11:59 +0000 (17:11 +0000)]
am
17c6426e: Merge "Document the worker_threads option."
* commit '
17c6426e75ef46238f5866f9a9295db4a95f21b5':
Document the worker_threads option.
Neil Fuller [Thu, 19 Jun 2014 10:39:23 +0000 (10:39 +0000)]
am
40f33005: am
fa63e306: Merge "Fix the CTS build now that core is gone"
* commit '
40f3300577d4b55926728744f1d25c08aa4e4a8b':
Fix the CTS build now that core is gone
Neil Fuller [Thu, 19 Jun 2014 10:34:02 +0000 (10:34 +0000)]
am
fa63e306: Merge "Fix the CTS build now that core is gone"
* commit '
fa63e30605ff723cfef493540553dabdf0440339':
Fix the CTS build now that core is gone
Bill Yi [Thu, 19 Jun 2014 07:22:38 +0000 (00:22 -0700)]
Restore AOSP-style version numbers - DO NOT MERGE
Brian Carlstrom [Thu, 19 Jun 2014 02:17:54 +0000 (02:17 +0000)]
am
32d25fda: am
dab766a7: Merge "Switch from core to core-libart"
* commit '
32d25fdabfaadc95292b43a29b695d8229333bcf':
Switch from core to core-libart
Brian Carlstrom [Thu, 19 Jun 2014 02:14:26 +0000 (02:14 +0000)]
am
dab766a7: Merge "Switch from core to core-libart"
* commit '
dab766a7312b1313c89930b5307f33f0baec1549':
Switch from core to core-libart
Ying Wang [Wed, 18 Jun 2014 22:58:30 +0000 (22:58 +0000)]
am
cc2e90e6: am
0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
* commit '
cc2e90e653c55724f20410347d709b70b1eaf105':
Rewrite the clean steps for TARGET_2ND_ARCH.
Brian Carlstrom [Thu, 19 Jun 2014 02:10:14 +0000 (02:10 +0000)]
Merge "Switch from core to core-libart"
Brian Carlstrom [Wed, 18 Jun 2014 22:11:01 +0000 (15:11 -0700)]
Switch from core to core-libart
Bug:
14298175
Change-Id: I1db40e7c67322d80a108b2b88e6d2e6d275d7898
Ying Wang [Wed, 18 Jun 2014 22:42:18 +0000 (22:42 +0000)]
am
0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
* commit '
0f1ca830ce14277f2fe71c066b4e83ee53727f77':
Rewrite the clean steps for TARGET_2ND_ARCH.
Ying Wang [Thu, 19 Jun 2014 17:07:19 +0000 (17:07 +0000)]
Merge "Document the worker_threads option."
Brian Carlstrom [Wed, 18 Jun 2014 20:51:14 +0000 (20:51 +0000)]
am
9a954de3: am
8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
* commit '
9a954de366bad8ba2cce2cb6c917a1bec7c61c77':
Remove some uses of the deprecated WITH_HOST_DALVIK.
Brian Carlstrom [Wed, 18 Jun 2014 20:46:53 +0000 (20:46 +0000)]
am
8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
* commit '
8fb55d06c7bd153e673c1372b3af75bcb849ed9d':
Remove some uses of the deprecated WITH_HOST_DALVIK.
Colin Cross [Wed, 18 Jun 2014 20:24:56 +0000 (20:24 +0000)]
am
b110da5f: am
9d8854e3: Merge "build: delete 64-bit blacklist"
* commit '
b110da5f2bf9cf105dd675648075d13c942d1892':
build: delete 64-bit blacklist
Colin Cross [Wed, 18 Jun 2014 20:20:58 +0000 (20:20 +0000)]
am
9d8854e3: Merge "build: delete 64-bit blacklist"
* commit '
9d8854e30c93ae9c635ae37c4825ff2c3bfb0f44':
build: delete 64-bit blacklist
Ying Wang [Wed, 18 Jun 2014 21:17:45 +0000 (21:17 +0000)]
Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
Ying Wang [Wed, 18 Jun 2014 19:07:48 +0000 (12:07 -0700)]
Rewrite the clean steps for TARGET_2ND_ARCH.
Convert clean rules from TARGET_ARCH to TARGET_2ND_ARCH and vice versa.
Change-Id: I5711b38cd834272d26d78e5cf847e97f27139c5b
Brian Carlstrom [Wed, 18 Jun 2014 20:44:10 +0000 (20:44 +0000)]
Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
Ian Rogers [Wed, 11 Jun 2014 23:30:04 +0000 (16:30 -0700)]
Remove some uses of the deprecated WITH_HOST_DALVIK.
Bug:
13751317.
Change-Id: I4beb81089b4ad7dac4d87571509389d1dae22bf3
Ying Wang [Wed, 18 Jun 2014 18:41:01 +0000 (18:41 +0000)]
am
5d88b3d7: am
c4262982: Merge "Use the correct MKBOOTIMG."
* commit '
5d88b3d7d615995c6b1909992347fe0b5692492e':
Use the correct MKBOOTIMG.
Ying Wang [Wed, 18 Jun 2014 18:36:56 +0000 (18:36 +0000)]
am
c4262982: Merge "Use the correct MKBOOTIMG."
* commit '
c426298280cea52af693ce76fe8643012ebe54b2':
Use the correct MKBOOTIMG.
smain@google.com [Wed, 18 Jun 2014 16:34:40 +0000 (16:34 +0000)]
am
38404199: Merge "revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right" into klp-modular-dev
* commit '
384041992c734be6ec8d2469d071c3358fd15a77':
revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right
Elliott Hughes [Wed, 18 Jun 2014 00:55:33 +0000 (00:55 +0000)]
am
09a4cac1: am
7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '
09a4cac12e3b040fb6d18490ff444b2fdd6cb451':
Removed /system/bin prefix from gdbclient.
Elliott Hughes [Wed, 18 Jun 2014 00:50:43 +0000 (00:50 +0000)]
am
7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '
7cc3174d9ca26c3170e201dd73f8d83bcfe27cf3':
Removed /system/bin prefix from gdbclient.
Deepanshu Gupta [Wed, 18 Jun 2014 00:25:30 +0000 (00:25 +0000)]
am
aaa502bc: am
e662adf7: am
2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit '
aaa502bc9ee796c4121cc275834f083b85b4e71e':
Integrate build_font.py [DO NOT MERGE]
Xavier Ducrohet [Wed, 18 Jun 2014 00:25:18 +0000 (17:25 -0700)]
Revert "Add missing support lib to list."
This reverts commit
b3ae5354c36a6ab850a1fca34470a93481a5831c.
Deepanshu Gupta [Wed, 18 Jun 2014 00:15:39 +0000 (00:15 +0000)]
am
e662adf7: am
2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit '
e662adf748be5d8df6056f4cf5da2c821bc27c59':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Wed, 18 Jun 2014 00:10:39 +0000 (00:10 +0000)]
am
2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit '
2a7f1c59300ee462b63e3065f65f24291ca78043':
Integrate build_font.py [DO NOT MERGE]
Brian Carlstrom [Tue, 17 Jun 2014 23:34:52 +0000 (23:34 +0000)]
am
edbc4595: am
d51730a6: Merge "Help catch common 32/64-bit errors."
* commit '
edbc4595b817aef5f620e78dc283d8cc8fccff2a':
Help catch common 32/64-bit errors.
Brian Carlstrom [Tue, 17 Jun 2014 23:31:00 +0000 (23:31 +0000)]
am
d51730a6: Merge "Help catch common 32/64-bit errors."
* commit '
d51730a64fac296f42f28ac84feca02a9ee6ef15':
Help catch common 32/64-bit errors.
Neil Fuller [Thu, 19 Jun 2014 10:29:38 +0000 (10:29 +0000)]
Merge "Fix the CTS build now that core is gone"
Neil Fuller [Thu, 19 Jun 2014 10:21:08 +0000 (11:21 +0100)]
Fix the CTS build now that core is gone
Change-Id: Id36844d17ed7551095fbca4a01e0aaf5224b7ea8
Ying Wang [Thu, 19 Jun 2014 20:21:11 +0000 (20:21 +0000)]
Merge "Create symlink /system/vendor if necessary."
smain@google.com [Thu, 19 Jun 2014 17:54:46 +0000 (17:54 +0000)]
am
f8211819: am
b8281c70: add new preview watermark for docs
* commit '
f82118195ec77a415d48220eaf87abad754e31bc':
add new preview watermark for docs
Ying Wang [Thu, 19 Jun 2014 17:32:35 +0000 (10:32 -0700)]
resolved conflicts for merge of
240e136e to master
Change-Id: Ic6e2cbe593914ddb613454581964c5d3d443b9d5
Neil Fuller [Thu, 19 Jun 2014 10:43:40 +0000 (10:43 +0000)]
am
cc317c40: am
40f33005: am
fa63e306: Merge "Fix the CTS build now that core is gone"
* commit '
cc317c40d3c087725e4ab9926ad83903495cd7c5':
Fix the CTS build now that core is gone
Ying Wang [Thu, 19 Jun 2014 03:26:24 +0000 (20:26 -0700)]
Create symlink /system/vendor if necessary.
Bug:
15728378
Change-Id: I0fe621096bb264882dc1b6face7440298fb56af0
Daniel Rosenberg [Tue, 17 Jun 2014 23:29:15 +0000 (16:29 -0700)]
Added filesystem management tools to core_minimal.mk and core_tiny.mk
Required for supporting resizing asecs
Change-Id: If7de23aa4baf97f3d0ccec423e52534f379f0881
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Ying Wang [Wed, 18 Jun 2014 23:03:26 +0000 (23:03 +0000)]
am
451dbd7c: am
cc2e90e6: am
0f1ca830: Merge "Rewrite the clean steps for TARGET_2ND_ARCH."
* commit '
451dbd7c006177edb56fc5036ae8c3c110c5f2fd':
Rewrite the clean steps for TARGET_2ND_ARCH.
Brian Carlstrom [Wed, 18 Jun 2014 21:40:31 +0000 (21:40 +0000)]
am
0d073451: am
9a954de3: am
8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."
* commit '
0d073451e7a453ccfb952505b27ec1effdc3a674':
Remove some uses of the deprecated WITH_HOST_DALVIK.
Colin Cross [Wed, 18 Jun 2014 21:40:27 +0000 (21:40 +0000)]
am
a1ac4736: am
b110da5f: am
9d8854e3: Merge "build: delete 64-bit blacklist"
* commit '
a1ac47367636c0473156679f8f30af626df7da85':
build: delete 64-bit blacklist
Ying Wang [Wed, 18 Jun 2014 21:09:30 +0000 (21:09 +0000)]
am
88440c53: am
5d88b3d7: am
c4262982: Merge "Use the correct MKBOOTIMG."
* commit '
88440c536ba0cfdd42e88378c952eb56f918f4a8':
Use the correct MKBOOTIMG.
smain@google.com [Wed, 18 Jun 2014 16:39:17 +0000 (16:39 +0000)]
am
873234bd: am
38404199: Merge "revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right" into klp-modular-dev
* commit '
873234bd7a188b46ec34c726a3962e70e4ff2f3a':
revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right
Elliott Hughes [Wed, 18 Jun 2014 01:54:56 +0000 (01:54 +0000)]
am
1a03ddb8: am
09a4cac1: am
7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '
1a03ddb805f2efc45345aa545d1d724e75972ae7':
Removed /system/bin prefix from gdbclient.
Deepanshu Gupta [Wed, 18 Jun 2014 01:47:16 +0000 (01:47 +0000)]
am
849cf474: (-s ours) am
aaa502bc: am
e662adf7: am
2a7f1c59: Merge "Integrate build_font.py [DO NOT MERGE]" into klp-dev
* commit '
849cf47483e6ba01b65a90b532800f4fc32fe809':
Integrate build_font.py [DO NOT MERGE]
Narayan Kamath [Thu, 19 Jun 2014 09:59:47 +0000 (09:59 +0000)]
Merge changes Ib9d1863c,I2a6eb327
* changes:
SDK targets should inherit from core_64_bit.mk
Fix issue in symlinking 64 bit executables.
Colin Cross [Thu, 19 Jun 2014 05:41:58 +0000 (22:41 -0700)]
pdk: add core-libart_intermediates
Add out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates
to platform.zip for platform-java builds to allow telephony-common
to build.
Change-Id: I0acbceee976e784573266372071dc1463ea6d53e
Brian Carlstrom [Thu, 19 Jun 2014 02:25:30 +0000 (19:25 -0700)]
resolved conflicts for merge of
8fd9944e to master
Change-Id: I1ceda92267675d4ca460b6f990c0acea4b4812a8
Colin Cross [Wed, 18 Jun 2014 20:17:06 +0000 (20:17 +0000)]
Merge "build: delete 64-bit blacklist"
Colin Cross [Wed, 18 Jun 2014 04:35:44 +0000 (21:35 -0700)]
build: delete 64-bit blacklist
The last projects in the blacklist have been fixed, delete the code.
Change-Id: I0fe7809bd18e32516374c9cb2a6f71df1d3c62ee
Ying Wang [Wed, 18 Jun 2014 18:32:29 +0000 (18:32 +0000)]
Merge "Use the correct MKBOOTIMG."
Ying Wang [Wed, 18 Jun 2014 18:31:21 +0000 (11:31 -0700)]
Use the correct MKBOOTIMG.
Change-Id: I7450a85770cc8de2ea313570999a7d7076e950d2
Brian Carlstrom [Tue, 17 Jun 2014 23:26:28 +0000 (23:26 +0000)]
Merge "Help catch common 32/64-bit errors."
Brian Carlstrom [Tue, 17 Jun 2014 21:36:05 +0000 (14:36 -0700)]
Help catch common 32/64-bit errors.
(cherry picked from commit
cf5ea762e015bc044d251814d9062ef1df4dd49f)
Change-Id: I43eb93d41967c63acb0723083c0178019f1364d0
JP Abgrall [Wed, 18 Jun 2014 00:48:05 +0000 (00:48 +0000)]
Merge "core+tools: support specifying F2FS as the fstype for userdata"
Xavier Ducrohet [Wed, 18 Jun 2014 00:38:06 +0000 (00:38 +0000)]
am
e87fcf5e: Revert "Add missing support lib to list."
* commit '
e87fcf5e16f906353f6a62f002a1bd1f8cda5e67':
Revert "Add missing support lib to list."
Brian Carlstrom [Tue, 17 Jun 2014 23:38:48 +0000 (23:38 +0000)]
am
a44f9a35: am
edbc4595: am
d51730a6: Merge "Help catch common 32/64-bit errors."
* commit '
a44f9a35a284c600616a7f2213a861ecdefd5615':
Help catch common 32/64-bit errors.
Elliott Hughes [Wed, 18 Jun 2014 00:46:13 +0000 (00:46 +0000)]
Merge "Removed /system/bin prefix from gdbclient."
Brigid Smith [Wed, 28 May 2014 21:36:43 +0000 (14:36 -0700)]
Removed /system/bin prefix from gdbclient.
Now a program run through gdbclient will not automatically have
/system/bin added to its path, so programs not in /system/bin will no
longer need to be prefixed with ../../.
The following now works as an example:
adb shell gdbserver :5039 /system/xbin/crasher
bg
gdbclient /system/xbin/crasher :5039 /system/xbin/crasher
And the following now no longer works:
adb shell gdbserver :5039 /system/xbin/crasher
bg
gdbclient ../../system/xbin/crasher :5039 /system/xbin/crasher
Change-Id: I299b66d03915aeb1dc300e43a81c9a51f0bd7dec
smain@google.com [Wed, 18 Jun 2014 16:30:50 +0000 (16:30 +0000)]
Merge "revisions to the next/prev page link layout. make "next" link in footer align left, remove previous link in footer, add doc title to next link in footer, move g+ to the right" into klp-modular-dev
smain@google.com [Wed, 18 Jun 2014 03:02:53 +0000 (20:02 -0700)]
revisions to the next/prev page link layout.
make "next" link in footer align left, remove previous link in footer,
add doc title to next link in footer, move g+ to the right
Change-Id: Id7c18a1a1a42344e96d0fa17c35908eb87d62612