OSDN Git Service
Wink Saville [Wed, 11 Jun 2014 15:46:04 +0000 (08:46 -0700)]
Merge kwd to master
Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
Wengang Wu [Wed, 11 Jun 2014 21:38:55 +0000 (21:38 +0000)]
am
20071e50: am
e3d37a7b: Enable support RGBX_8888 for omap3
* commit '
20071e5028adb6d7ced81843d33e4d0baa0768ed':
Enable support RGBX_8888 for omap3
Calin Juravle [Wed, 11 Jun 2014 21:37:57 +0000 (21:37 +0000)]
am
17e1d2ca: am
7281ca65: Merge "Pass --top-k-profile-threshold to dex2oat if available."
* commit '
17e1d2ca97a711ab539044912bb985a10ccbc9fd':
Pass --top-k-profile-threshold to dex2oat if available.
Wengang Wu [Wed, 11 Jun 2014 18:17:19 +0000 (18:17 +0000)]
am
e3d37a7b: Enable support RGBX_8888 for omap3
* commit '
e3d37a7b55f86f5d005dd67f828dcf51fe60c0f6':
Enable support RGBX_8888 for omap3
Wengang Wu [Fri, 6 Jun 2014 21:32:15 +0000 (16:32 -0500)]
Enable support RGBX_8888 for omap3
Bug:
14995811
Change-Id: Iaeb5a5ad0e3bcf215613f24f2570ae0d8267c016
Calin Juravle [Wed, 11 Jun 2014 08:53:49 +0000 (08:53 +0000)]
am
7281ca65: Merge "Pass --top-k-profile-threshold to dex2oat if available."
* commit '
7281ca65d00171b846497abca357a005a401e16b':
Pass --top-k-profile-threshold to dex2oat if available.
Andy McFadden [Wed, 11 Jun 2014 20:38:32 +0000 (20:38 +0000)]
Merge "Replace "lower power mode" experiment"
Andy McFadden [Tue, 10 Jun 2014 21:43:32 +0000 (14:43 -0700)]
Replace "lower power mode" experiment
This replaces the previous low-power mode experiment, which
discarded refresh events, with a new experiment that alters
the refresh period.
(see also I2849e5ea335c0d2509fea1c315392bce7f20451d )
The feature is enabled by specifying a nonzero value for the
"refresh skip count", which indicates the number of periods
to skip. For example, the command:
adb shell service call SurfaceFlinger 1016 i32 1
sets a skip count of '1', yielding a 30Hz refresh rate on a device
with a 60Hz display. Changing the last value to '2' would set the
refresh to 20Hz. '0' returns to the default behavior.
Bug
15523257
Change-Id: I00039c22a55750e74035644c63800e4bee1c774a
Andy McFadden [Wed, 11 Jun 2014 20:22:19 +0000 (20:22 +0000)]
Merge "Disable DispSync resync when not needed"
Ying Wang [Wed, 11 Jun 2014 17:58:44 +0000 (17:58 +0000)]
am
0cea0a22: am
d284c4cd: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."
* commit '
0cea0a22109ace7e3dfbb4913a1469f3f8480f6e':
Don't set LOCAL_MODULE_PATH for native tests.
Mark Salyzyn [Wed, 11 Jun 2014 17:44:52 +0000 (17:44 +0000)]
am
72676e7d: am
0e1313cd: Merge "libgui: 64-bit compile issues"
* commit '
72676e7d0db89d477495245aa15f1a128b5c35bc':
libgui: 64-bit compile issues
Calin Juravle [Wed, 11 Jun 2014 08:45:16 +0000 (08:45 +0000)]
Merge "Pass --top-k-profile-threshold to dex2oat if available."
Michael Wright [Tue, 10 Jun 2014 20:16:08 +0000 (20:16 +0000)]
Merge "Fixup more potential issues / warnings in string formats"
Andy McFadden [Thu, 22 May 2014 20:08:43 +0000 (13:08 -0700)]
Disable DispSync resync when not needed
If app and SF events aren't using phase offsets, we don't need
to maintain the DispSync model. We just turn hardware VSYNC on
whenever something wants to draw. This avoids some edge cases
where we were doing too much resync work.
Also, updated the systrace output. The "VsyncOn" line was a
combination of SF and app event threads, and would occasionally
be very weird. Removed VsyncOn, renamed VSYNC to VSYNC-app,
and added VSYNC-sf.
Also, added more details to the --dispsync dumpsys output.
Also, renamed global constants to not look like local variables.
Bug
15516453
Change-Id: I0da10b72f0d9a7b7eb5202d87cc18967f698adbd
Michael Wright [Tue, 10 Jun 2014 20:03:17 +0000 (13:03 -0700)]
Fixup more potential issues / warnings in string formats
Change-Id: I323e44f950b2e758dc9ff4510b2e13ca870eb849
Calin Juravle [Fri, 6 Jun 2014 15:58:43 +0000 (16:58 +0100)]
Pass --top-k-profile-threshold to dex2oat if available.
Also, don't pass --profile-file if the file is empty.
Bug:
12877748
Change-Id: I587d198e64da709930e2cea50a87fed1525281e5
Michael Wright [Tue, 10 Jun 2014 03:12:27 +0000 (03:12 +0000)]
Merge "Bump axis limit"
Michael Wright [Tue, 10 Jun 2014 03:12:19 +0000 (03:12 +0000)]
Merge "Fix warning in logging string interpolation"
Michael Wright [Tue, 10 Jun 2014 02:03:32 +0000 (19:03 -0700)]
Fix warning in logging string interpolation
Change-Id: I86623083f68664d31ea277958837a4c2985037b4
Michael Wright [Tue, 10 Jun 2014 01:56:43 +0000 (18:56 -0700)]
Bump axis limit
Change-Id: I53d18646be2b884c5022f10c7c4ea8f6cda176c8
Ying Wang [Mon, 9 Jun 2014 23:00:04 +0000 (23:00 +0000)]
am
d284c4cd: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."
* commit '
d284c4cd78e0d42a8ee7af6e8f61c5e66cae6318':
Don't set LOCAL_MODULE_PATH for native tests.
Ying Wang [Mon, 9 Jun 2014 22:52:48 +0000 (22:52 +0000)]
Merge "Don't set LOCAL_MODULE_PATH for native tests."
Mark Salyzyn [Mon, 9 Jun 2014 21:32:04 +0000 (14:32 -0700)]
libgui: 64 bit compile issues (part deux)
- nsecs_t printed with PRId64
- int64_t/uint64_t print issues
- some size_t printing issues.
- missing argument to BQ_LOGV
Change-Id: I493f2b578e801dc38c44f8c536faa45266720402
Ying Wang [Mon, 9 Jun 2014 22:23:46 +0000 (15:23 -0700)]
Don't set LOCAL_MODULE_PATH for native tests.
The build system will set it up automatically.
Change-Id: Id5ed9eff88dab2349c3b357ee09f7da9479d7d2d
Mark Salyzyn [Mon, 9 Jun 2014 21:46:25 +0000 (21:46 +0000)]
am
0e1313cd: Merge "libgui: 64-bit compile issues"
* commit '
0e1313cdb1d5d21e4d6123f77b4238f1c8c2d564':
libgui: 64-bit compile issues
Mark Salyzyn [Mon, 9 Jun 2014 21:38:00 +0000 (21:38 +0000)]
Merge "libgui: 64-bit compile issues"
Mark Salyzyn [Mon, 9 Jun 2014 21:27:45 +0000 (14:27 -0700)]
libgui: 64-bit compile issues
Change-Id: I29961c1567b8431518a7d032ea43385e23b7bb37
Adam Connors [Mon, 9 Jun 2014 17:44:52 +0000 (17:44 +0000)]
am
25e81681: API Review: Update managed profiles feature flag.
* commit '
25e816818c1aa76c60533af9710c7f9166253e51':
API Review: Update managed profiles feature flag.
Robin Lee [Mon, 9 Jun 2014 14:46:58 +0000 (14:46 +0000)]
am
04eb4227: am
c4193f1f: Merge "Migrate keychain directories to /data/misc/user/0"
* commit '
04eb4227b0ee880141d6ffbf170e79b78affea15':
Migrate keychain directories to /data/misc/user/0
Robin Lee [Mon, 9 Jun 2014 12:51:06 +0000 (12:51 +0000)]
am
c4193f1f: Merge "Migrate keychain directories to /data/misc/user/0"
* commit '
c4193f1fef52314b451f55cce48ce44f94b875b6':
Migrate keychain directories to /data/misc/user/0
Robin Lee [Mon, 9 Jun 2014 12:44:33 +0000 (12:44 +0000)]
Merge "Migrate keychain directories to /data/misc/user/0"
Calin Juravle [Mon, 9 Jun 2014 10:05:06 +0000 (10:05 +0000)]
am
fb617aa8: am
06642342: Merge "Don\'t always add profile-file option to dex2oat"
* commit '
fb617aa82ad2b6671aa1bc37afa115418cd9091c':
Don't always add profile-file option to dex2oat
Calin Juravle [Mon, 9 Jun 2014 09:56:31 +0000 (09:56 +0000)]
am
06642342: Merge "Don\'t always add profile-file option to dex2oat"
* commit '
066423423f04bf1c5972b1d611e01e2e17df3727':
Don't always add profile-file option to dex2oat
Adam Connors [Thu, 5 Jun 2014 11:24:27 +0000 (12:24 +0100)]
API Review: Update managed profiles feature flag.
Feature flag renamed to FEATURE_MANAGED_PROFILES
Bug:
15025371
Change-Id: I999fd9484398da3266c7655d83e4266c2b76cf3a
(cherry picked from commit
17e4e6b62b12cc7f11c07f737f9290e2ecfc6cc4)
Calin Juravle [Mon, 9 Jun 2014 09:15:09 +0000 (09:15 +0000)]
Merge "Don't always add profile-file option to dex2oat"
Jesse Hall [Sat, 7 Jun 2014 00:19:53 +0000 (00:19 +0000)]
am
17cbadf0: am
6fa169fa: Merge "Add aarch64 EGL/GLES trampolines"
* commit '
17cbadf0f598b0d02179262ad5b6b270850ccb94':
Add aarch64 EGL/GLES trampolines
Jesse Hall [Sat, 7 Jun 2014 00:16:33 +0000 (00:16 +0000)]
am
6fa169fa: Merge "Add aarch64 EGL/GLES trampolines"
* commit '
6fa169faa955ecc47872557a5d4fd89a95190d5e':
Add aarch64 EGL/GLES trampolines
Jesse Hall [Fri, 6 Jun 2014 23:49:40 +0000 (23:49 +0000)]
Merge "Add aarch64 EGL/GLES trampolines"
Jesse Hall [Sat, 31 May 2014 06:32:12 +0000 (23:32 -0700)]
Add aarch64 EGL/GLES trampolines
Change-Id: Ia90e18d26ff3bdb7e643aff8d77cbaddd2ac2a03
Calin Juravle [Fri, 6 Jun 2014 13:42:16 +0000 (14:42 +0100)]
Don't always add profile-file option to dex2oat
Add profile-file option to dex2oat only if the profiler is active and
the file exists.
Bug:
12877748
Bug:
15275634
Change-Id: Icef76514c912c88311ed108f2be7a6329131f741
Narayan Kamath [Fri, 6 Jun 2014 10:36:08 +0000 (10:36 +0000)]
am
0c96c35f: am
e86420e3: (-s ours) Merge "Fix flattening/unflattening of android::Sensor."
* commit '
0c96c35fe47cd84f7423f925917b5dde97155e34':
Fix flattening/unflattening of android::Sensor.
Narayan Kamath [Fri, 6 Jun 2014 10:33:18 +0000 (10:33 +0000)]
am
e86420e3: (-s ours) Merge "Fix flattening/unflattening of android::Sensor."
* commit '
e86420e399993e0f49e5d7733b5fc87eb9fe179b':
Fix flattening/unflattening of android::Sensor.
Narayan Kamath [Fri, 6 Jun 2014 10:05:08 +0000 (10:05 +0000)]
Merge "Fix flattening/unflattening of android::Sensor."
Lajos Molnar [Fri, 6 Jun 2014 06:58:39 +0000 (06:58 +0000)]
am
64f5ec51: fix compiler warning in OMX_VideoExt.h
* commit '
64f5ec51ad3a9aea5a849d51139e605815b42d75':
fix compiler warning in OMX_VideoExt.h
Lajos Molnar [Fri, 6 Jun 2014 05:33:17 +0000 (22:33 -0700)]
fix compiler warning in OMX_VideoExt.h
Bug:
11969958
Change-Id: I6dbc1c5a56c5f8db0af931c9391299aaaf1b536a
Aravind Akella [Fri, 6 Jun 2014 02:01:09 +0000 (02:01 +0000)]
am
e75b7b49: Remove getRequiredPermission from NDK.
* commit '
e75b7b491e9e345801c8f3cb72bca08b0f153abf':
Remove getRequiredPermission from NDK.
Aravind Akella [Thu, 22 May 2014 20:19:49 +0000 (13:19 -0700)]
Remove getRequiredPermission from NDK.
Bug:
15089664
Change-Id: Ic967adde89f30261c75fca67c09d14d35bd1cdb3
(cherry picked from commit
1236710bccd8f5870c0281e24a899c3d58f708e6)
wsmlby [Thu, 5 Jun 2014 21:16:47 +0000 (21:16 +0000)]
Merge "Add dual mode to flatland"
wsmlby [Thu, 5 Jun 2014 21:12:41 +0000 (14:12 -0700)]
Add dual mode to flatland
Change-Id: I3544e12c9c911cfdd73fa20d038068c9eccb4161
Robin Lee [Thu, 5 Jun 2014 17:56:59 +0000 (17:56 +0000)]
am
53b49268: am
8adb5a82: Merge "Add installd command to create /data/misc user dir"
* commit '
53b4926828fae0e78b467d49a6084b324bcbdcb7':
Add installd command to create /data/misc user dir
Robin Lee [Thu, 5 Jun 2014 17:53:31 +0000 (17:53 +0000)]
am
8adb5a82: Merge "Add installd command to create /data/misc user dir"
* commit '
8adb5a822d44ed43aa0ec9a8948a7820fdfcd375':
Add installd command to create /data/misc user dir
Robin Lee [Tue, 29 Apr 2014 18:42:01 +0000 (19:42 +0100)]
Migrate keychain directories to /data/misc/user/0
With new CA certificates being stored in /data/misc/user/<userid>/
existing ones need to be moved into the same place.
After this update only the owner user will have custom trusted CAs; all
other users will revert to the default set.
Change-Id: I14a4cd6048685902ad5dd3b53494b03fadc41c04
Robin Lee [Thu, 5 Jun 2014 17:18:23 +0000 (17:18 +0000)]
Merge "Add installd command to create /data/misc user dir"
Robin Lee [Fri, 25 Apr 2014 14:05:19 +0000 (15:05 +0100)]
Add installd command to create /data/misc user dir
New command 'mkuser <id>' sets up a user directory in /data/misc/user/,
readable by all apps within that user and writeable by the local system
process.
Change-Id: I5ddde8c4a80f606e723bb41aa64581a0720842d5
Adam Connors [Thu, 5 Jun 2014 13:07:31 +0000 (13:07 +0000)]
Merge "API Review: Update managed profiles feature flag."
Adam Connors [Thu, 5 Jun 2014 11:24:27 +0000 (12:24 +0100)]
API Review: Update managed profiles feature flag.
Feature flag renamed to FEATURE_MANAGED_PROFILES
Bug:
15025371
Change-Id: I999fd9484398da3266c7655d83e4266c2b76cf3a
Eric Laurent [Thu, 5 Jun 2014 01:34:46 +0000 (01:34 +0000)]
Merge "add sound trigger native service"
Narayan Kamath [Wed, 4 Jun 2014 17:32:14 +0000 (17:32 +0000)]
am
c2ac5897: am
065e9c86: Merge "Fix mips build for libbinder."
* commit '
c2ac5897eccc681c8642095d4f8af13115de3ffb':
Fix mips build for libbinder.
Narayan Kamath [Wed, 4 Jun 2014 17:28:38 +0000 (17:28 +0000)]
am
065e9c86: Merge "Fix mips build for libbinder."
* commit '
065e9c86e249beac08783c7e9334d5709e2c9080':
Fix mips build for libbinder.
Narayan Kamath [Wed, 4 Jun 2014 14:53:08 +0000 (14:53 +0000)]
Merge "Fix mips build for libbinder."
Narayan Kamath [Wed, 4 Jun 2014 14:04:29 +0000 (15:04 +0100)]
Fix mips build for libbinder.
Mips specific code was using an uninitialized variable.
(cherry picked from commit
2c68d380c9ef765a7d46e5a4735f39e6c27849f2)
Change-Id: I6b562b3f6d2084b72e747736cbf43684c2049f8e
Narayan Kamath [Wed, 4 Jun 2014 14:32:59 +0000 (14:32 +0000)]
Merge "Fix mips build for libbinder."
Narayan Kamath [Wed, 4 Jun 2014 14:04:29 +0000 (15:04 +0100)]
Fix mips build for libbinder.
Mips specific code was using an uninitialized variable.
Change-Id: I445043c76ebfa420b26376ade60f8068b4ea0b11
Mark Salyzyn [Tue, 3 Jun 2014 20:54:48 +0000 (20:54 +0000)]
am
f0a24759: am
a28750ee: Merge "binder: Turn on -Werror"
* commit '
f0a2475905786d5457e7af838ac714acbfdafa4f':
binder: Turn on -Werror
Mark Salyzyn [Tue, 3 Jun 2014 20:48:35 +0000 (20:48 +0000)]
am
a28750ee: Merge "binder: Turn on -Werror"
* commit '
a28750eec38c848230adfeef28725b29cc36a9da':
binder: Turn on -Werror
Mark Salyzyn [Tue, 3 Jun 2014 19:40:00 +0000 (19:40 +0000)]
Merge "binder: Turn on -Werror"
Mark Salyzyn [Fri, 30 May 2014 23:35:57 +0000 (16:35 -0700)]
binder: Turn on -Werror
Change-Id: I0ee785927a7ae5f731b02176b0b781b87c22a24e
Eric Laurent [Sat, 19 Apr 2014 00:52:57 +0000 (17:52 -0700)]
add sound trigger native service
Change-Id: I5d6fe1ecacca3a941317f841009322bafdf6adcd
Narayan Kamath [Tue, 3 Jun 2014 13:58:40 +0000 (13:58 +0000)]
am
26063a91: am
f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
* commit '
26063a9155ddd18d858cea7fac7c1ddf71e1bcb7':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
Narayan Kamath [Tue, 3 Jun 2014 13:29:00 +0000 (13:29 +0000)]
am
f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
* commit '
f1dd859baa114995bcbcfb7119e939d0b4f45ed5':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
Narayan Kamath [Tue, 3 Jun 2014 10:06:55 +0000 (10:06 +0000)]
Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
Mark Salyzyn [Thu, 29 May 2014 19:43:36 +0000 (12:43 -0700)]
binder: rm utils/Debug.h as unutilized
Change-Id: I52eb8b64b71cec7ffd4560e902daf358fda98b4a
Narayan Kamath [Fri, 30 May 2014 13:40:13 +0000 (14:40 +0100)]
Fix flattening/unflattening of android::Sensor.
Write string lengths as uint32_t so that their width is
the same on 32 and 64 bit processes.
Note that this fixes another bug as a side effect; getFlattenedSize
was assuming that sizeof(uint32_t) == sizeof(size_t).
Change-Id: I7b6e3993e1f1ac45c14832ce59c59e0772855a2f
Fengwei Yin [Fri, 23 May 2014 21:32:09 +0000 (05:32 +0800)]
x86_64: Align uint64_t/int64_t structure member to 8 bytes
To make sure the stature which pass between 32/64bit process have
same memory layout for 32/64bit.
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.)
Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
Mark Salyzyn [Thu, 29 May 2014 21:09:57 +0000 (21:09 +0000)]
am
ea3f1da9: am
1ce5ecbe: am
63645c69: Merge "binder: rm utils/Debug.h"
* commit '
ea3f1da9013b33ecf3f3f8771393c1754a9aec59':
binder: rm utils/Debug.h
Brian Carlstrom [Thu, 29 May 2014 21:09:39 +0000 (21:09 +0000)]
am
823bcce3: am
4ae6a267: am
f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '
823bcce3abf536ee130a50551130d10589547cf4':
Remove dependencies on runtime_libdvm and libdvm.so in general
Mark Salyzyn [Thu, 29 May 2014 21:06:36 +0000 (21:06 +0000)]
am
1ce5ecbe: am
63645c69: Merge "binder: rm utils/Debug.h"
* commit '
1ce5ecbe3286380f5ff7ace289369ed006e9b40a':
binder: rm utils/Debug.h
Mark Salyzyn [Thu, 29 May 2014 20:29:32 +0000 (20:29 +0000)]
am
63645c69: Merge "binder: rm utils/Debug.h"
* commit '
63645c69e03cf3862c52cfde6cbd5f5143ccd38a':
binder: rm utils/Debug.h
Mark Salyzyn [Thu, 29 May 2014 20:26:48 +0000 (20:26 +0000)]
Merge "binder: rm utils/Debug.h"
Mark Salyzyn [Thu, 29 May 2014 20:09:22 +0000 (13:09 -0700)]
binder: rm utils/Debug.h
Change-Id: I16931919a26c16a0d701771c93fa7fe1c6f60ef8
Brian Carlstrom [Thu, 29 May 2014 19:43:02 +0000 (19:43 +0000)]
am
4ae6a267: am
f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '
4ae6a26719feb21b7fa1cc5f307b591858a30f26':
Remove dependencies on runtime_libdvm and libdvm.so in general
Brian Carlstrom [Thu, 29 May 2014 19:39:48 +0000 (19:39 +0000)]
am
f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
* commit '
f3e4fda09106cb93bddea35a2cc7dbd4b2c281e9':
Remove dependencies on runtime_libdvm and libdvm.so in general
Brian Carlstrom [Thu, 29 May 2014 19:36:41 +0000 (19:36 +0000)]
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
Simon Wilson [Thu, 29 May 2014 17:58:30 +0000 (17:58 +0000)]
am
ad8d25e8: am
90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too"
* commit '
ad8d25e812d8842298de92657158a0325c42cdbd':
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
Simon Wilson [Thu, 29 May 2014 17:54:34 +0000 (17:54 +0000)]
am
90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too"
* commit '
90654afb3aeac78916f2a53fe689a087c0e283c9':
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
Brian Carlstrom [Thu, 29 May 2014 04:27:47 +0000 (21:27 -0700)]
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug:
14298175
(cherry picked from commit
aefe55f0fb9e69be205497ef4fc3432d2f7a2d8b)
Change-Id: I05b1a7dd1ef30b3366b52b46bfc7b39cfb3be198
Brian Carlstrom [Thu, 29 May 2014 16:37:18 +0000 (16:37 +0000)]
am
aefe55f0: Remove dependencies on runtime_libdvm and libdvm.so in general
* commit '
aefe55f0fb9e69be205497ef4fc3432d2f7a2d8b':
Remove dependencies on runtime_libdvm and libdvm.so in general
Simon Wilson [Thu, 29 May 2014 15:49:51 +0000 (08:49 -0700)]
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
Since the new TI SGX DDK 1.12 has fixed support for RGBA8888,
the workaround can be reverted. This may help with CTS issues.
Bug:
14995811
This reverts commit
6e79cb81d02984c9f7ac0586078f947c94c56c2a.
Change-Id: Id8160ebe577d7009d2dd5eb4501ec40356a4274d
Brian Carlstrom [Thu, 29 May 2014 04:27:47 +0000 (21:27 -0700)]
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug:
14298175
Change-Id: I74b4a3dabf89c6b53bfe688c45d6e1167880fd95
Elliott Hughes [Thu, 29 May 2014 01:08:06 +0000 (01:08 +0000)]
am
e77cb931: am
259c2508: am
03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '
e77cb9317de54ea0041eeef7966b818257158f64':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Elliott Hughes [Thu, 29 May 2014 01:04:28 +0000 (01:04 +0000)]
am
259c2508: am
03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '
259c25080d8b7f3b66e27e4d8ac3a268738ebe3f':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Elliott Hughes [Thu, 29 May 2014 01:02:16 +0000 (01:02 +0000)]
am
03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '
03e2f8fa13a791d744758ec9ffe27f52cab730d0':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Elliott Hughes [Thu, 29 May 2014 00:59:01 +0000 (00:59 +0000)]
Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
Brian Carlstrom [Wed, 28 May 2014 23:18:49 +0000 (23:18 +0000)]
am
28ec0303: am
e67810fd: am
97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
28ec03035d61828047f6bbc57be3b71f4c57b7fb':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 23:13:27 +0000 (23:13 +0000)]
am
e67810fd: am
97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
e67810fd7a00ffa92337c6f3aa6114136ce12613':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:31:43 +0000 (22:31 +0000)]
am
97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
97a51ad44ae3dcf4976076382923ddcae16233ee':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:41 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
c4ac3124ffb51f13bb4206e9f8452a3712eb09cb)
Change-Id: I97cc3ff7a269e671b315afa8673dae43d1f86bf1
Brian Carlstrom [Wed, 28 May 2014 21:44:58 +0000 (21:44 +0000)]
am
c4ac3124: Move to dalvik.vm.lib.2 to force default to libart
* commit '
c4ac3124ffb51f13bb4206e9f8452a3712eb09cb':
Move to dalvik.vm.lib.2 to force default to libart
Brigid Smith [Wed, 28 May 2014 21:23:24 +0000 (14:23 -0700)]
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Bug:
15116468
Change-Id: I621532fb53b8317f5a513edfbeb0c50c265342fc