keunyoung
7a697dd3f5
Merge "add camera.goldfish.jpeg to emulator targets and mini targets" into jb-mr2-dev
2013-03-14 22:59:28 +00:00
keunyoung
d9b0e80c1d
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
2013-03-14 15:35:33 -07:00
Ben Cheng
ea871a0649
Link libgcc.a before shared libraries (especially libc.so).
...
BUG: 8247455
Change-Id: Ia8816536ca95a7084e80c7f425f81658afea9609
2013-03-14 13:39:29 -07:00
Raphael Moll
cdfb5bac3a
resolved conflicts for merge of a3aea5b6
to jb-mr2-dev
...
Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
2013-03-14 12:42:04 -07:00
Raphael Moll
a3aea5b6eb
am 0ec2f3df: Merge "Build SDK using prebuilts/devtools."
...
* commit '0ec2f3df4b40da9ae6d0ea0258fdcefca99992a3':
Build SDK using prebuilts/devtools.
2013-03-14 11:44:07 -07:00
Raphael Moll
0ec2f3df4b
Merge "Build SDK using prebuilts/devtools."
2013-03-14 18:31:36 +00:00
Raphael Moll
8a2b7707dd
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
2013-03-13 15:30:35 -07:00
Stephen Hines
6e2d53a5cd
Merge "We need to use the ARM EABI to pass vector registers properly (i.e. float2)." into jb-mr2-dev
2013-03-13 01:20:15 +00:00
Stephen Hines
408733b15c
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
2013-03-12 17:10:19 -07:00
Dianne Hackborn
870d5f16a5
Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev
2013-03-12 19:31:11 +00:00
Dianne Hackborn
a1fece009f
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
2013-03-12 10:50:28 -07:00
keunyoung
51e11eea6d
Merge "reflect the migration of emulator hal to device/generic/goldfish" into jb-mr2-dev
2013-03-11 21:48:55 +00:00
Scott Main
6959bce3de
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
2013-03-11 13:55:05 -07:00
Scott Main
e9d67dccb0
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
2013-03-11 13:51:18 -07:00
Scott Main
5666261023
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
2013-03-11 13:49:53 -07:00
Scott Main
5fef291f3e
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
2013-03-11 13:48:34 -07:00
Scott Main
3aca7544a5
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
2013-03-11 13:47:13 -07:00
keunyoung
fe30957867
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
2013-03-11 09:41:17 -07:00
Torne (Richard Coles)
a8d89e15f0
Merge "Don't try to group static libraries on mac." into jb-mr2-dev
2013-03-11 16:31:09 +00:00
Ying Wang
bacedf66d2
am 4f499fba: am c36f41fd: Merge "Support gdb wrappers"
...
* commit '4f499fba73dd7bc04248f310df9b8b90f93d5de8':
Support gdb wrappers
2013-03-11 09:26:06 -07:00
Ying Wang
4f499fba73
am c36f41fd: Merge "Support gdb wrappers"
...
* commit 'c36f41fd38c0dfc09ef486e6c3b2eda26c3a5b24':
Support gdb wrappers
2013-03-11 09:24:06 -07:00
Scott Main
2d967c6df6
tweak jspane width property to ensure bg color for highlighted item is full width
...
Change-Id: I92e66493229476c29cf71c74091f36063638def4
2013-03-11 09:21:07 -07:00
Ying Wang
c36f41fd38
Merge "Support gdb wrappers"
2013-03-11 16:08:23 +00:00
Torne (Richard Coles)
71f8b245ce
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
2013-03-11 14:59:42 +00:00
Michael Wright
eb73384e02
Fixed whitespace and env pollution issues in pez
...
Change-Id: I40574d6cdab31e920535c09d24fe8463aee57586
2013-03-08 17:34:02 -08:00
Alex Ray
f0d08ebd2f
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
2013-03-08 15:23:15 -08:00
John Michelau
502002526f
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
2013-03-08 14:12:32 -06:00
Kenny Root
24753394b9
am ae9dc40d: am eda13282: Merge changes I1998a9d6,I2513f0de
...
* commit 'ae9dc40d9e3a4dfe949b82b95d0e92012c4308e6':
Function to grep AndroidManifest.xml files.
Utility to dump stacks from arbitrary processes.
2013-03-08 11:45:55 -08:00
Kenny Root
ae9dc40d9e
am eda13282: Merge changes I1998a9d6,I2513f0de
...
* commit 'eda132820bede79a109c16aa0c91bd6cb15380d8':
Function to grep AndroidManifest.xml files.
Utility to dump stacks from arbitrary processes.
2013-03-08 11:44:03 -08:00
Kenny Root
eda132820b
Merge changes I1998a9d6,I2513f0de
...
* changes:
Function to grep AndroidManifest.xml files.
Utility to dump stacks from arbitrary processes.
2013-03-08 19:23:00 +00:00
Stephen Hines
6b15101344
Merge "Mips needs to be marked little-endian explicitly." into jb-mr2-dev
2013-03-08 18:59:53 +00:00
Jeff Sharkey
301bbadb12
Function to grep AndroidManifest.xml files.
...
(cherry picked from commit 50b61e9e66
)
Change-Id: I1998a9d6a05176fc7fc8643c5d1c40e2dd699d4e
2013-03-08 10:56:45 -08:00
Jeff Sharkey
cfe0969ab9
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 f582437162
)
Change-Id: I2513f0de0d90cccd56c4949ca7d218e430439c00
2013-03-08 10:55:37 -08:00
Jeff Sharkey
d4da19d752
Merge "Function to grep AndroidManifest.xml files." into jb-mr2-dev
2013-03-08 18:53:04 +00:00
Jeff Sharkey
50b61e9e66
Function to grep AndroidManifest.xml files.
...
Change-Id: I1998a9d6a05176fc7fc8643c5d1c40e2dd699d4e
2013-03-08 10:50:29 -08:00
Stephen Hines
9f66959e3b
Mips needs to be marked little-endian explicitly.
...
Change-Id: Id4a08124b6c809c29a5e338d7aa0741db3ac57a3
2013-03-08 09:02:52 -08:00
Ying Wang
90701299aa
am 11872e25: am c47bea9d: Merge "Remove nonexisting module names."
...
* commit '11872e259252ffa45874c8e3ebe38a3c41bbd579':
Remove nonexisting module names.
2013-03-07 18:57:52 -08:00
Christopher Ferris
33f92e545a
am b95a4ed6: am 161e0ef9: Merge "Adding TARGET_CPU_VARIANT to config file."
...
* commit 'b95a4ed64aff542d04b667ff5f239d152735808a':
Adding TARGET_CPU_VARIANT to config file.
2013-03-07 18:57:51 -08:00
Ying Wang
11872e2592
am c47bea9d: Merge "Remove nonexisting module names."
...
* commit 'c47bea9dd9288bf429afe1434829afd5e8c208a0':
Remove nonexisting module names.
2013-03-07 18:55:30 -08:00
Christopher Ferris
b95a4ed64a
am 161e0ef9: Merge "Adding TARGET_CPU_VARIANT to config file."
...
* commit '161e0ef974d0cddf74b82bbe9c0843ca6f2f320e':
Adding TARGET_CPU_VARIANT to config file.
2013-03-07 18:55:29 -08:00
Ying Wang
c47bea9dd9
Merge "Remove nonexisting module names."
2013-03-08 02:30:48 +00:00
Ying Wang
512b9628b0
Remove nonexisting module names.
...
Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
2013-03-07 18:29:56 -08:00
Christopher Ferris
161e0ef974
Merge "Adding TARGET_CPU_VARIANT to config file."
2013-03-08 02:18:08 +00:00
Christopher Ferris
6103fd7ac3
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
2013-03-07 18:12:50 -08:00
Ying Wang
4781e30a96
resolved conflicts for merge of de949b11
to jb-mr2-dev
...
Change-Id: I5a4c8cefeaf9e2f27be4b7ed8e4b30cb5a83a2f5
2013-03-07 18:00:03 -08:00
Ying Wang
de949b11af
am 671d90ea: Merge "Add module names to emulator PRODUCT_PACKAGES."
...
* commit '671d90ea1d20312df60b700748d49dac17054099':
Add module names to emulator PRODUCT_PACKAGES.
2013-03-07 17:49:44 -08:00
Ying Wang
671d90ea1d
Merge "Add module names to emulator PRODUCT_PACKAGES."
2013-03-08 01:15:00 +00:00
Tim Murray
c08eceee8e
Merge "Add support for multiple architectures with RS compat lib." into jb-mr2-dev
2013-03-07 23:34:11 +00:00
Doug Zongker
07e9fbb241
Merge "recovery: choose between available fonts based on device density" into jb-mr2-dev
2013-03-07 22:34:00 +00:00
Justin Ho
49ffc52074
Merge "Add fr_CA to l10n builds Bug: 7579865" into jb-mr2-dev
2013-03-07 20:34:22 +00:00