OSDN Git Service
Ying Wang [Tue, 26 Mar 2013 19:42:32 +0000 (12:42 -0700)]
Allow to run Proguard on static Java library
1. Let aapt output the proguard_options file
2. If proguard is enabled, switch the dependency from
$(full_classes_jar) to $(full_classes_proguard_jar).
Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5
The Android Open Source Project [Tue, 26 Mar 2013 17:54:40 +0000 (10:54 -0700)]
am
545c8eed: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
545c8eed678101a836972c5f68941078f7fb0863':
JDQ39E
JDQ39D
JDQ39C
The Android Open Source Project [Tue, 26 Mar 2013 17:53:09 +0000 (10:53 -0700)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ia0536d6a75f255879a24145def55c44c93050aaa
Scott Main [Tue, 26 Mar 2013 01:19:46 +0000 (18:19 -0700)]
am
964c6321: am
709fcf04: am
2325250e: am
9ae6d37a: am
de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '
964c6321ae015522c9f7e26d47189890b636a592':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
Scott Main [Mon, 25 Mar 2013 23:17:42 +0000 (16:17 -0700)]
am
709fcf04: am
2325250e: am
9ae6d37a: am
de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '
709fcf04a0294544658166a10021978870d756ef':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
Scott Main [Mon, 25 Mar 2013 23:15:12 +0000 (16:15 -0700)]
am
2325250e: am
9ae6d37a: am
de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '
2325250e639f3c443a8ccd006f0d591eb8f1c5d3':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
Scott Main [Mon, 25 Mar 2013 23:13:29 +0000 (16:13 -0700)]
am
9ae6d37a: am
de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '
9ae6d37ad09cad5eb3e0caa2f0b4c0a507a243f2':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
Scott Main [Mon, 25 Mar 2013 23:11:44 +0000 (16:11 -0700)]
am
de295276: add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
* commit '
de2952768478e6390bcec424bb102911e7f4cbff':
add javascript action events to search suggestions and search results. Allows us to track and compare the success of suggested results and results from Google
Scott Main [Mon, 25 Mar 2013 22:48:35 +0000 (15:48 -0700)]
add javascript action events to search suggestions and search results.
Allows us to track and compare the success of suggested results and results from Google
Change-Id: I64750e3b96ea585de415969cad8ab46c3bbbcaf4
Ying Wang [Mon, 25 Mar 2013 20:48:53 +0000 (20:48 +0000)]
Merge "Support to build vendor.img" into jb-mr2-dev
Dima Zavin [Mon, 25 Mar 2013 19:42:45 +0000 (19:42 +0000)]
Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev
Ying Wang [Wed, 20 Mar 2013 18:02:05 +0000 (11:02 -0700)]
Support to build vendor.img
Bug:
8341435
Change-Id: I2db7970936984d38aed35054e3f695d298f4e512
Dima Zavin [Sat, 23 Mar 2013 09:08:38 +0000 (02:08 -0700)]
core: combo: arm: use appropriate mcpu flags for cortex-a7
Change-Id: If00577d36257e4d03f63f36b159bb2e015958d6a
Signed-off-by: Dima Zavin <dima@android.com>
Ying Wang [Sat, 23 Mar 2013 02:50:09 +0000 (19:50 -0700)]
am
ca983c08: am
97c280ec: Merge "We have to use := instead of +="
* commit '
ca983c08fbc49b36eb0d71476842a86afbdcb8ed':
We have to use := instead of +=
Ying Wang [Sat, 23 Mar 2013 02:47:43 +0000 (19:47 -0700)]
am
97c280ec: Merge "We have to use := instead of +="
* commit '
97c280eced879fb79d32bd527412ab34840dba5c':
We have to use := instead of +=
Ying Wang [Sat, 23 Mar 2013 01:56:36 +0000 (01:56 +0000)]
Merge "We have to use := instead of +="
Ying Wang [Sat, 23 Mar 2013 01:52:57 +0000 (18:52 -0700)]
We have to use := instead of +=
If we use +=, the right side may be deferred to evaluate,
if that target-specific variable is not defined yet.
That's a mistke.
Change-Id: I1635ee4791473f407866e010d612948c02cdebf6
Ying Wang [Fri, 22 Mar 2013 19:32:50 +0000 (12:32 -0700)]
Delete icu4j from pathmap.mk
frameworks/base/icu4j is gone in jb-mr2-dev.
Change-Id: I078c8ac3db85598a9b30f8220f251eb7631151e0
Scott Main [Fri, 22 Mar 2013 01:35:43 +0000 (18:35 -0700)]
am
159de1de: am
1b8b0cfe: am
79088780: am
8d92d9ef: am
01a2545b: docs: update templates to remove global content for devsite builds
* commit '
159de1de00027ebb9280cf6768d59369416c7a13':
docs: update templates to remove global content for devsite builds
Scott Main [Fri, 22 Mar 2013 01:33:53 +0000 (18:33 -0700)]
am
1b8b0cfe: am
79088780: am
8d92d9ef: am
01a2545b: docs: update templates to remove global content for devsite builds
* commit '
1b8b0cfee98c8d2779dc740707b547846734053f':
docs: update templates to remove global content for devsite builds
Scott Main [Fri, 22 Mar 2013 01:31:59 +0000 (18:31 -0700)]
am
79088780: am
8d92d9ef: am
01a2545b: docs: update templates to remove global content for devsite builds
* commit '
7908878061144b25b1e0baf36619db7b32d07c98':
docs: update templates to remove global content for devsite builds
Scott Main [Fri, 22 Mar 2013 01:29:44 +0000 (18:29 -0700)]
am
8d92d9ef: am
01a2545b: docs: update templates to remove global content for devsite builds
* commit '
8d92d9ef824f265979e68da927f01aba4bb6b314':
docs: update templates to remove global content for devsite builds
Scott Main [Fri, 22 Mar 2013 01:27:16 +0000 (18:27 -0700)]
am
01a2545b: docs: update templates to remove global content for devsite builds
* commit '
01a2545bbab916e45eedbd3708f526ed8bd62935':
docs: update templates to remove global content for devsite builds
Scott Main [Wed, 13 Feb 2013 01:32:27 +0000 (17:32 -0800)]
docs: update templates to remove global content for devsite builds
Change-Id: I8c8d052248cebe6408d8c18b44baadd03f3bc96c
Scott Main [Wed, 20 Mar 2013 22:27:05 +0000 (15:27 -0700)]
am
04f27973: am
8c052d39: am
82fb80eb: am
ec48ff2b: am
ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '
04f279730970df0ea5cd8ef6e8f7a5bee6233dc6':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
Scott Main [Wed, 20 Mar 2013 22:25:10 +0000 (15:25 -0700)]
am
8c052d39: am
82fb80eb: am
ec48ff2b: am
ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '
8c052d395db4643303e03efbc35eca0259cee19e':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
Scott Main [Wed, 20 Mar 2013 22:23:08 +0000 (15:23 -0700)]
am
82fb80eb: am
ec48ff2b: am
ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '
82fb80eb11188592f34056e8c787a74a28be6543':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
Scott Main [Wed, 20 Mar 2013 22:20:42 +0000 (15:20 -0700)]
am
ec48ff2b: am
ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '
ec48ff2bed11b0cbdc2686eed28a6edc75425fca':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
Scott Main [Wed, 20 Mar 2013 22:18:08 +0000 (15:18 -0700)]
am
ec93c111: Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
* commit '
ec93c11194f55fb2bd9ae23fa502d701bfb09664':
add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency.
Scott Main [Wed, 20 Mar 2013 22:16:27 +0000 (22:16 +0000)]
Merge "add 64-bit variety NDK packages to download table. Use same naming convention as SDK packages for consistency." into jb-mr1.1-docs
Scott Main [Mon, 18 Mar 2013 18:31:15 +0000 (11:31 -0700)]
add 64-bit variety NDK packages to download table.
Use same naming convention as SDK packages for consistency.
Change-Id: Iee2673d6c9a4b313988e1a73966d2a0fbee27c2c
The Android Automerger [Wed, 20 Mar 2013 19:24:22 +0000 (12:24 -0700)]
JDQ39E
Scott Main [Tue, 19 Mar 2013 21:48:42 +0000 (14:48 -0700)]
am
22b048e1: am
86372f1c: am
7524d02e: am
4264799b: am
24790db1: fix indentation style for nested lists
* commit '
22b048e1069c5f5dffd5f13ee4ef35f4ba06fa2b':
fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:48:02 +0000 (14:48 -0700)]
am
86372f1c: am
7524d02e: am
4264799b: am
24790db1: fix indentation style for nested lists
* commit '
86372f1c0156b096288274ab85128ffbe9f6f8b4':
fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:46:48 +0000 (14:46 -0700)]
am
7524d02e: am
4264799b: am
24790db1: fix indentation style for nested lists
* commit '
7524d02ef25fed9241e507ebda53d73a643134e5':
fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:44:53 +0000 (14:44 -0700)]
am
4264799b: am
24790db1: fix indentation style for nested lists
* commit '
4264799b51dd24fdc154a1ae1b70bc4e0bf7e4a9':
fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:43:04 +0000 (14:43 -0700)]
am
24790db1: fix indentation style for nested lists
* commit '
24790db1cd7b84c6c36350b232538e519790f799':
fix indentation style for nested lists
Scott Main [Tue, 19 Mar 2013 21:38:59 +0000 (14:38 -0700)]
fix indentation style for nested lists
Change-Id: Id4e1aa6f4dacf0984cfc891081799be887543453
Andrew Hsieh [Tue, 19 Mar 2013 18:17:07 +0000 (11:17 -0700)]
am
e874f3ab: am
55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit '
e874f3ab7c3f70582f877e762c13c1943ed0e398':
Duplicate libgcc.a in front of *so
Andrew Hsieh [Tue, 19 Mar 2013 18:15:49 +0000 (11:15 -0700)]
am
55c06f75: Merge "Duplicate libgcc.a in front of *so"
* commit '
55c06f75951c0d31560f90822cd4e5073055855c':
Duplicate libgcc.a in front of *so
Andrew Hsieh [Tue, 19 Mar 2013 17:59:50 +0000 (17:59 +0000)]
Merge "Duplicate libgcc.a in front of *so"
Ben Cheng [Tue, 19 Mar 2013 16:30:43 +0000 (09:30 -0700)]
am
870af852: am
e0314245: Merge "Link libgcc.a before shared libraries (especially libc.so)."
* commit '
870af852348e700fd7a6d47a4388b249c27a3d8d':
Link libgcc.a before shared libraries (especially libc.so).
Andrew Hsieh [Thu, 7 Mar 2013 12:52:17 +0000 (20:52 +0800)]
Duplicate libgcc.a in front of *so
Also see
6c7bc550adb917157a9f53ebf8898110e37294b2
Change-Id: Iade6cd6b40cd4840a148098e1d8fc7a0c97e2f66
Ben Cheng [Mon, 18 Mar 2013 22:21:07 +0000 (15:21 -0700)]
am
e0314245: Merge "Link libgcc.a before shared libraries (especially libc.so)."
* commit '
e03142454b52d9960a93b04f75c1a9487720a73a':
Link libgcc.a before shared libraries (especially libc.so).
Ben Cheng [Mon, 18 Mar 2013 21:05:22 +0000 (21:05 +0000)]
Merge "Link libgcc.a before shared libraries (especially libc.so)."
Ben Cheng [Wed, 13 Mar 2013 01:15:18 +0000 (18:15 -0700)]
Link libgcc.a before shared libraries (especially libc.so).
[cherry-picked from internal master]
Change-Id: I53d19754d0d40e9ca2f3d043001cc77e39e5d795
Lorenzo Colitti [Sat, 16 Mar 2013 00:41:49 +0000 (09:41 +0900)]
Include clatd in device builds.
Bug:
8276725
Change-Id: I6a4e9c9829ef676c6a3080c03a709be3ec863de5
Ying Wang [Fri, 15 Mar 2013 17:32:29 +0000 (10:32 -0700)]
Skip userdata.img only if partition size is not give for extfs.
We still build yaffs2 images which don't need partition size.
Change-Id: I9c7f45069f25868666a257cee044faecf1a8781a
Ying Wang [Fri, 15 Mar 2013 16:03:39 +0000 (09:03 -0700)]
Don't build userdata.img if no partition size
And retire BOARD_DONT_BUILD_USERDATA_IMG.
This unifies the logic in build/core/Makefile and
build/tools/releasetools/img_from_target_files.
Change-Id: Ib6b4e8e0d8279ed7deaf047e9dc30eb65aba013f
keunyoung [Thu, 14 Mar 2013 22:59:27 +0000 (22:59 +0000)]
Merge "add camera.goldfish.jpeg to emulator targets and mini targets" into jb-mr2-dev
keunyoung [Tue, 12 Mar 2013 23:28:37 +0000 (16:28 -0700)]
add camera.goldfish.jpeg to emulator targets and mini targets
- For mini targets, it is for making camera work in mini-emulator targets
Change-Id: I0bebb3ae9135c78af8ba4209ba2ba60e074325b3
Ben Cheng [Wed, 13 Mar 2013 01:15:18 +0000 (18:15 -0700)]
Link libgcc.a before shared libraries (especially libc.so).
BUG:
8247455
Change-Id: Ia8816536ca95a7084e80c7f425f81658afea9609
Raphael Moll [Thu, 14 Mar 2013 19:41:16 +0000 (12:41 -0700)]
resolved conflicts for merge of
a3aea5b6 to jb-mr2-dev
Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
Raphael Moll [Thu, 14 Mar 2013 18:44:07 +0000 (11:44 -0700)]
am
0ec2f3df: Merge "Build SDK using prebuilts/devtools."
* commit '
0ec2f3df4b40da9ae6d0ea0258fdcefca99992a3':
Build SDK using prebuilts/devtools.
Raphael Moll [Thu, 14 Mar 2013 18:31:36 +0000 (18:31 +0000)]
Merge "Build SDK using prebuilts/devtools."
The Android Automerger [Thu, 14 Mar 2013 16:09:42 +0000 (09:09 -0700)]
JDQ39D
Raphael Moll [Wed, 13 Mar 2013 22:30:35 +0000 (15:30 -0700)]
Build SDK using prebuilts/devtools.
Cleans up some unused/renamed files:
- sdk_only_whitelist is better named windows_sdk_whitelist.
- a few product.mk dependencies should not be listed here
any more but in the sdk/product.mk instead (which they were.)
Change-Id: Ifad3049321c8ec4edd8b94b83e570eebba442e7d
Stephen Hines [Wed, 13 Mar 2013 01:20:15 +0000 (01:20 +0000)]
Merge "We need to use the ARM EABI to pass vector registers properly (i.e. float2)." into jb-mr2-dev
Stephen Hines [Wed, 13 Mar 2013 00:10:19 +0000 (17:10 -0700)]
We need to use the ARM EABI to pass vector registers properly (i.e. float2).
Given the following function signature:
void rsDebug(const char *s, float2 f2);
Under the regular ARM ABI, the arguments would be passed as follows:
r0 <- s
r1 <- f2.x
r2 <- f2.y
Under the ARM EABI, the arguments would be passed as follows:
r0 <- s
r1 <- UNUSED due to alignment padding for vector operation
r2 <- f2.x
r3 <- f2.y
Change-Id: I2332c8555c00003ae900f299fa3aee1b3ccac439
Dianne Hackborn [Tue, 12 Mar 2013 19:31:11 +0000 (19:31 +0000)]
Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev
The Android Automerger [Tue, 12 Mar 2013 18:24:51 +0000 (11:24 -0700)]
JDQ39C
Dianne Hackborn [Tue, 12 Mar 2013 01:04:55 +0000 (18:04 -0700)]
Add LOCAL_APK_LIBRARIES argument.
This allows you to build apks that link against other
apks using the framework's new shared library apk feature.
Also if you are using LOCAL_APK_LIBRARIES, then LOCAL_DEX_PREOPT
will not be allowed. This is because using preopt means the
apk is stripped of its dex file, so the pre-installed apk can't
be redexed if its associated library changes. (Even if the build
system didn't strip the dex, Dalvik still has issues because it
assumes a pre-odex file is always valid.)
Change-Id: I952c0d24f8975f75aff67f78b5faeec91144c3e7
keunyoung [Mon, 11 Mar 2013 21:48:54 +0000 (21:48 +0000)]
Merge "reflect the migration of emulator hal to device/generic/goldfish" into jb-mr2-dev
Scott Main [Mon, 11 Mar 2013 20:55:05 +0000 (13:55 -0700)]
am
e9d67dcc: am
56662610: am
5fef291f: am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
e9d67dccb01cf91d04b71f590b8e91737be70e64':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:51:18 +0000 (13:51 -0700)]
am
56662610: am
5fef291f: am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
5666261023e8b5362f848ccfd307d52c6b1f2150':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:49:53 +0000 (13:49 -0700)]
am
5fef291f: am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
5fef291f3e9fa5139d0876a960e0173ef77842da':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:48:34 +0000 (13:48 -0700)]
am
3aca7544: am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
3aca7544a51296777a91fa6e3ef203cebf14d04c':
tweak jspane width property to ensure bg color for highlighted item is full width
Scott Main [Mon, 11 Mar 2013 20:47:13 +0000 (13:47 -0700)]
am
2d967c6d: tweak jspane width property to ensure bg color for highlighted item is full width
* commit '
2d967c6df63c625659dbca486a4ba0a20c1f3561':
tweak jspane width property to ensure bg color for highlighted item is full width
keunyoung [Fri, 8 Mar 2013 20:54:36 +0000 (12:54 -0800)]
reflect the migration of emulator hal to device/generic/goldfish
- no longer need to check the presence as device/generic/goldfish is in PDK
Change-Id: I551dd283fb6511d8ebd45a8519f797f8ba2f1a05
Torne (Richard Coles) [Mon, 11 Mar 2013 16:31:08 +0000 (16:31 +0000)]
Merge "Don't try to group static libraries on mac." into jb-mr2-dev
Ying Wang [Mon, 11 Mar 2013 16:26:06 +0000 (09:26 -0700)]
am
4f499fba: am
c36f41fd: Merge "Support gdb wrappers"
* commit '
4f499fba73dd7bc04248f310df9b8b90f93d5de8':
Support gdb wrappers
Ying Wang [Mon, 11 Mar 2013 16:24:06 +0000 (09:24 -0700)]
am
c36f41fd: Merge "Support gdb wrappers"
* commit '
c36f41fd38c0dfc09ef486e6c3b2eda26c3a5b24':
Support gdb wrappers
Scott Main [Mon, 11 Mar 2013 16:21:07 +0000 (09:21 -0700)]
tweak jspane width property to ensure bg color for highlighted item is full width
Change-Id: I92e66493229476c29cf71c74091f36063638def4
Ying Wang [Mon, 11 Mar 2013 16:08:23 +0000 (16:08 +0000)]
Merge "Support gdb wrappers"
Torne (Richard Coles) [Mon, 11 Mar 2013 14:59:42 +0000 (14:59 +0000)]
Don't try to group static libraries on mac.
Mac's linker doesn't support --start-group and --end-group; it scans
libraries repeatedly even without these options, so it's not necessary.
Change-Id: If22527e75470f7fa9452dc33efe4d40a60d0919a
Michael Wright [Sat, 9 Mar 2013 01:34:02 +0000 (17:34 -0800)]
Fixed whitespace and env pollution issues in pez
Change-Id: I40574d6cdab31e920535c09d24fe8463aee57586
Alex Ray [Fri, 8 Mar 2013 23:15:06 +0000 (15:15 -0800)]
pez: colored SUCCESS/FAILURE indicator
pez is a new bash function that can be prepended to existing functions
or commands to clearly show a colored exit status.
Example:
$ pez mmm frameworks/base/etc
will print all the usual output, and at the end either a green "SUCCESS"
line or a red "FAILURE" line.
Change-Id: I7e369b0280d6ece16fb0be1895278c26922491fe
John Michelau [Fri, 9 Nov 2012 17:48:04 +0000 (11:48 -0600)]
Support gdb wrappers
Use gdbwrapper() for launching gdb. This can be redefined to launch
one of the many gdb wrappers instead.
Example:
function gdbwrapper()
{
ddd --debugger $ANDROID_TOOLCHAIN/$GDB -x "$@"
}
Change-Id: I3cce8a2ca1bae6d531e2388a93cb52075b21a42c
Kenny Root [Fri, 8 Mar 2013 19:45:55 +0000 (11:45 -0800)]
am
ae9dc40d: am
eda13282: Merge changes I1998a9d6,I2513f0de
* commit '
ae9dc40d9e3a4dfe949b82b95d0e92012c4308e6':
Function to grep AndroidManifest.xml files.
Utility to dump stacks from arbitrary processes.
Kenny Root [Fri, 8 Mar 2013 19:44:03 +0000 (11:44 -0800)]
am
eda13282: Merge changes I1998a9d6,I2513f0de
* commit '
eda132820bede79a109c16aa0c91bd6cb15380d8':
Function to grep AndroidManifest.xml files.
Utility to dump stacks from arbitrary processes.
Kenny Root [Fri, 8 Mar 2013 19:23:00 +0000 (19:23 +0000)]
Merge changes I1998a9d6,I2513f0de
* changes:
Function to grep AndroidManifest.xml files.
Utility to dump stacks from arbitrary processes.
Stephen Hines [Fri, 8 Mar 2013 18:59:53 +0000 (18:59 +0000)]
Merge "Mips needs to be marked little-endian explicitly." into jb-mr2-dev
Jeff Sharkey [Fri, 8 Mar 2013 18:20:47 +0000 (10:20 -0800)]
Function to grep AndroidManifest.xml files.
(cherry picked from commit
50b61e9e66bad2f8addc425271b41e74babf3a34)
Change-Id: I1998a9d6a05176fc7fc8643c5d1c40e2dd699d4e
Jeff Sharkey [Wed, 20 Feb 2013 01:00:46 +0000 (17:00 -0800)]
Utility to dump stacks from arbitrary processes.
Saves any existing traces, dumps stacks from the target process,
then restores the original traces.
(cherry picked from commit
f582437162ff483b342ad9d02cb0af948a734c5a)
Change-Id: I2513f0de0d90cccd56c4949ca7d218e430439c00
Jeff Sharkey [Fri, 8 Mar 2013 18:53:04 +0000 (18:53 +0000)]
Merge "Function to grep AndroidManifest.xml files." into jb-mr2-dev
Jeff Sharkey [Fri, 8 Mar 2013 18:20:47 +0000 (10:20 -0800)]
Function to grep AndroidManifest.xml files.
Change-Id: I1998a9d6a05176fc7fc8643c5d1c40e2dd699d4e
Stephen Hines [Fri, 8 Mar 2013 17:02:52 +0000 (09:02 -0800)]
Mips needs to be marked little-endian explicitly.
Change-Id: Id4a08124b6c809c29a5e338d7aa0741db3ac57a3
Ying Wang [Fri, 8 Mar 2013 02:57:52 +0000 (18:57 -0800)]
am
11872e25: am
c47bea9d: Merge "Remove nonexisting module names."
* commit '
11872e259252ffa45874c8e3ebe38a3c41bbd579':
Remove nonexisting module names.
Christopher Ferris [Fri, 8 Mar 2013 02:57:51 +0000 (18:57 -0800)]
am
b95a4ed6: am
161e0ef9: Merge "Adding TARGET_CPU_VARIANT to config file."
* commit '
b95a4ed64aff542d04b667ff5f239d152735808a':
Adding TARGET_CPU_VARIANT to config file.
Ying Wang [Fri, 8 Mar 2013 02:55:30 +0000 (18:55 -0800)]
am
c47bea9d: Merge "Remove nonexisting module names."
* commit '
c47bea9dd9288bf429afe1434829afd5e8c208a0':
Remove nonexisting module names.
Christopher Ferris [Fri, 8 Mar 2013 02:55:29 +0000 (18:55 -0800)]
am
161e0ef9: Merge "Adding TARGET_CPU_VARIANT to config file."
* commit '
161e0ef974d0cddf74b82bbe9c0843ca6f2f320e':
Adding TARGET_CPU_VARIANT to config file.
Ying Wang [Fri, 8 Mar 2013 02:30:48 +0000 (02:30 +0000)]
Merge "Remove nonexisting module names."
Ying Wang [Fri, 8 Mar 2013 02:28:53 +0000 (18:28 -0800)]
Remove nonexisting module names.
Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
Christopher Ferris [Fri, 8 Mar 2013 02:18:08 +0000 (02:18 +0000)]
Merge "Adding TARGET_CPU_VARIANT to config file."
Christopher Ferris [Sat, 23 Feb 2013 01:24:25 +0000 (17:24 -0800)]
Adding TARGET_CPU_VARIANT to config file.
Adding this since all arm builds will require TARGET_CPU_VARIANT
to be set to a valid value in the near future.
Merge from internal master.
Change-Id: I2b73f9dbdd04cd8ac47035875c714bd0e75920e7
Ying Wang [Fri, 8 Mar 2013 01:58:32 +0000 (17:58 -0800)]
resolved conflicts for merge of
de949b11 to jb-mr2-dev
Change-Id: I5a4c8cefeaf9e2f27be4b7ed8e4b30cb5a83a2f5
Ying Wang [Fri, 8 Mar 2013 01:49:44 +0000 (17:49 -0800)]
am
671d90ea: Merge "Add module names to emulator PRODUCT_PACKAGES."
* commit '
671d90ea1d20312df60b700748d49dac17054099':
Add module names to emulator PRODUCT_PACKAGES.
Ying Wang [Fri, 8 Mar 2013 01:15:00 +0000 (01:15 +0000)]
Merge "Add module names to emulator PRODUCT_PACKAGES."
Tim Murray [Thu, 7 Mar 2013 23:34:11 +0000 (23:34 +0000)]
Merge "Add support for multiple architectures with RS compat lib." into jb-mr2-dev
Doug Zongker [Thu, 7 Mar 2013 22:34:00 +0000 (22:34 +0000)]
Merge "recovery: choose between available fonts based on device density" into jb-mr2-dev