Narayan Kamath
28da32889b
am cde4b13a
: Merge "Allow more than one dex2oat extra option"
...
* commit 'cde4b13a12a0bc8a7bd031f5d5c1b2b2bdd13335':
Allow more than one dex2oat extra option
2014-10-01 11:15:12 +00:00
Yevgeny Rouban
b0d8d00b29
Allow more than one dex2oat extra option
...
All extra options are provided as one argument to dex2oat.
The patch splits all options to individual ones.
Change-Id: Ied65bb9cf38b114611e88a8d5d86305021700d0b
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Signed-off-by: Yevgeny Rouban <yevgeny.y.rouban@intel.com>
2014-09-17 10:58:35 +00:00
Dan Albert
4355c0c986
am e1e3d278
: Merge "Clean cruft out of makefiles."
...
* commit 'e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2':
Clean cruft out of makefiles.
2014-09-12 16:22:03 +00:00
Dan Albert
9e8b528926
resolved conflicts for merge of 07c9557f
to lmp-dev-plus-aosp
...
Change-Id: Ic212ab2ee90b1cc7db7203210b047c870bb5c476
2014-09-12 09:00:50 -07:00
Dan Albert
b79dfe6721
Clean cruft out of makefiles.
...
Cleans up manual uses of stlport and bionic (and removes uses of private
bionic headers).
Change-Id: I157309d702e59152adfa3450939082248ae4c043
2014-09-11 18:49:47 -07:00
Chih-Hung Hsieh
99d9fb15b4
Fix warnings on unused variables and parameters.
...
BUG: 17474723
Change-Id: If40f5e765090cfb970e4129b78b1e74cf8bad217
2014-09-11 16:57:59 -07:00
Jeff Sharkey
0ffb91383f
am 464e539c
: Merge "Add new system APK locations." into lmp-dev
...
* commit '464e539cd3e931aaca99a67d0addc6d68bd96b3d':
Add new system APK locations.
2014-09-09 16:44:52 +00:00
Jeff Sharkey
770180a4dd
Add new system APK locations.
...
Add /system/priv-app and /oem/app paths to system paths. Also allow
rmdex on system apps, and quietly ignore when it was already removed.
Also relax logging when clearing code cache, since it's optional.
Bug: 17205122
Change-Id: I4fc4d0f63a3596937c4defbd64e1f8a1c563f02d
2014-09-09 08:22:58 -07:00
Nick Kralevich
2a8bb978d5
am 51eec3b9
: Merge "Fix relabeling of secondary user package directories."
...
* commit '51eec3b98788039afc5fd7ffe76612c7f8d9b39c':
Fix relabeling of secondary user package directories.
2014-09-08 20:55:32 +00:00
Stephen Smalley
8ac2a648b6
Fix relabeling of secondary user package directories.
...
When relabeling secondary user package directories, we need to use
the uid of the directory rather than the primary package UID;
otherwise, levelFrom=user will not work correctly.
Change-Id: I0d76ec6ec6fe56a566023ca5e1398efdf28fc81e
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-09-08 15:51:55 -04:00
Brian Carlstrom
ad2a4083fe
am 8c1642ad
: Merge "Remove obsolete prunedexcache"
...
* commit '8c1642ad4ea8fbeb7d03f30e5f50e03c28d40065':
Remove obsolete prunedexcache
2014-08-29 11:39:54 +00:00
Alex Light
8b17ac6bd6
Remove obsolete prunedexcache
...
Bug: 16875245
(cherry picked from commit 5f727f8694
)
Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
2014-08-28 16:54:54 -07:00
Alex Light
5f727f8694
Remove obsolete prunedexcache
...
Bug: 16875245
Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
2014-08-28 23:30:52 +00:00
Jeff Sharkey
18a9457edd
am 7903c6a2
: Merge "Make clear data stricter." into lmp-dev
...
* commit '7903c6a263354506ace10fc32aa65c231b64f62b':
Make clear data stricter.
2014-08-27 18:26:20 +00:00
Jeff Sharkey
7903c6a263
Merge "Make clear data stricter." into lmp-dev
2014-08-27 17:58:35 +00:00
Jeff Sharkey
3316fe472f
Make clear data stricter.
...
It should nuke everything under the data directory. PMS will come
around and generate the lib symlink after we're finished.
Bug: 16739202
Change-Id: Ib70af2e1450e3bed6781fb497b9cc67e1e594c49
2014-08-27 10:46:28 -07:00
Calin Juravle
7330016a75
am 97477d20
: Set compiler filter flag to true when vmSafeMode is present.
...
* commit '97477d203eaf0c3235bbe2415356f20a0431cada':
Set compiler filter flag to true when vmSafeMode is present.
2014-08-27 16:33:27 +00:00
Calin Juravle
4f60ac2bbc
Add vm_safe_mode to dexopt.
...
The flag enforces interpret-only flag for dex2oat.
Bug: 12457423
(cherry picked from commit b1efac1035
)
(cherry picked from commit 97477d203e
)
Change-Id: I215339527e998b24e274c8df42a5024839e6a9fa
2014-08-27 16:16:05 +01:00
Calin Juravle
97477d203e
Set compiler filter flag to true when vmSafeMode is present.
...
Bug: 12457423
Change-Id: I33345c5cce76681d8a6592ebae8c9f96a9f0f8bd
2014-08-27 16:10:03 +01:00
Calin Juravle
2d509c0113
am 7de2bde3
: Merge "Add vm_safe_mode to dexopt." into lmp-dev
...
* commit '7de2bde3c4c3a6ecc7e6f21e3f3322688b718c4a':
Add vm_safe_mode to dexopt.
2014-08-26 19:28:57 +00:00
Calin Juravle
188fb813c1
am 20558f11
: Merge "Pass isa features flag to dex2oat." into lmp-dev
...
* commit '20558f1154abcf3360fd972f6d2c80bb80f78502':
Pass isa features flag to dex2oat.
2014-08-26 17:51:57 +00:00
Calin Juravle
e9eb12c291
Pass isa features flag to dex2oat.
...
Bug: 16716262
(cherry picked from commit 8fc7315a67
)
Change-Id: I3cb1d82604612bc7212bcbdeef685bc05b695b6a
2014-08-26 18:48:30 +01:00
Calin Juravle
b1efac1035
Add vm_safe_mode to dexopt.
...
The flag enforces interpret-only flag for dex2oat.
Bug: 12457423
Change-Id: Ifdafcc1afa32996577fa44c5682eeb58c79772ac
2014-08-26 18:10:40 +01:00
Calin Juravle
8fc7315a67
Pass isa features flag to dex2oat.
...
Bug: 16716262
Change-Id: Ifbc3a1520bc177aa87855edb60c36346f24c77cd
2014-08-26 18:10:36 +01:00
Calin Juravle
01f481649d
am c597b6dd
: Fix validation of system paths in installd.
...
* commit 'c597b6dd895dbb2b28c757ce7a2651b3cdc9b00c':
Fix validation of system paths in installd.
2014-08-22 14:54:28 +00:00
Calin Juravle
f53c08befc
Fix validation of system paths in installd.
...
System apps are now installed under their own directory
(system_app_dir/app_dir/app.apk). The new path doesn't pass installd
validation because of obsolete checks which verify that the path does
not contain subdirectories past the system_app_dir.
The CL fixes the validation to accept at most on subdirectory.
Bug: 17109858
(cherry picked from commit c597b6dd89
)
Change-Id: Ic5f15d1864c6af9f4c4b07dc27244ebbb521ad5e
2014-08-22 15:33:30 +01:00
Calin Juravle
c597b6dd89
Fix validation of system paths in installd.
...
System apps are now installed under their own directory
(system_app_dir/app_dir/app.apk). The new path doesn't pass installd
validation because of obsolete checks which verify that the path does
not contain subdirectories past the system_app_dir.
The CL fixes the validation to accept at most on subdirectory.
Bug: 17109858
Change-Id: I13abb52c0016610ff436f6a26bb6b3b85dc4dfb0
2014-08-22 14:52:53 +01:00
Calin Juravle
c542d1141d
am 67cfe0c0
: Merge "Allow apk path to contain one subdirectory." into lmp-dev
...
* commit '67cfe0c0660c36ca385ad0eeb1352a2df721b49c':
Allow apk path to contain one subdirectory.
2014-08-22 13:15:53 +00:00
Calin Juravle
9d76156266
Allow apk path to contain one subdirectory.
...
In the current directory layout this prevented rm_dex and move_dex
commands to validate the apk path and thus cleaning up resources.
Bug: 16888084
(cherry picked from commit fd88ff2edd
)
Change-Id: I1002529b0c35852c67540d3165d1444523460592
2014-08-22 14:04:45 +01:00
Calin Juravle
fd88ff2edd
Allow apk path to contain one subdirectory.
...
In the current directory layout this prevented rm_dex and move_dex
commands to validate the apk path and thus cleaning up resources.
Bug: 16888084
Change-Id: Iba579d075a9c6d7de047e7ffef95441498257086
2014-08-20 15:37:54 +01:00
Brian Carlstrom
46ab27e624
am e18987ef
: Disable verification based on vold.decrypt. [frameworks/native]
...
* commit 'e18987efb5e39ca1bed15527b7b82bde55c99669':
Disable verification based on vold.decrypt. [frameworks/native]
2014-08-15 17:20:38 +00:00
Brian Carlstrom
e18987efb5
Disable verification based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
Change-Id: Ie70bf4e1348b7b8b2454cf9b498b272416d61c34
2014-08-15 09:57:55 -07:00
Brian Carlstrom
f7765c4a17
Disable verification based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
(cherry picked from commit e18987efb5
)
Change-Id: Ie55ef400c9d1f231b3be64248c756ac798a11ffe
2014-08-15 10:05:32 -07:00
Andreas Gampe
f12e678d4b
am 1a22eb7b
: Merge "Change an accidental ALOGE to an ALOGV"
...
* commit '1a22eb7ba1062ed1ee35cdb9d797019699cbce8b':
Change an accidental ALOGE to an ALOGV
2014-08-11 20:00:46 +00:00
Andreas Gampe
1a22eb7ba1
Merge "Change an accidental ALOGE to an ALOGV"
2014-08-11 18:01:48 +00:00
Narayan Kamath
93b1b9a42c
am 82e98c21
: Merge "Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup"
...
* commit '82e98c21f8606e0de8c6beb4372bc4ae9f52b515':
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
2014-08-11 17:36:11 +00:00
Brian Carlstrom
3b14e5b1f3
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
...
Bug: 15927194
(cherry picked from commit 0378aaf257
)
Change-Id: I462b5ac256c4d091ed4023cf4b97dd6a4abcaa5f
2014-08-11 18:31:03 +01:00
Alex Light
a7915d437c
Change an accidental ALOGE to an ALOGV
...
Change-Id: If07bcef597dd9e531ce6d92c7780ba6ad5090f9a
2014-08-11 10:07:02 -07:00
Brian Carlstrom
0378aaf257
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
...
Bug: 15927194
Change-Id: Id8bc188de68d62fd5f91a99aaaa6c8f2dea06abd
2014-08-08 22:10:06 -07:00
Brian Carlstrom
41cd9eb424
Disable compilation based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
(cherry picked from commit 538998f204
)
Change-Id: Idae36efa1cb3fb99b51fa0a79b6bb037981d1c71
2014-08-06 21:59:35 -07:00
Brian Carlstrom
9a87db6e1f
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
...
This will allow us to conditionally change the compiler-filter based on other properties.
Bug: 15165413
(cherry picked from commit cf51ba1360
)
Change-Id: I6613c9710878d56ed8c121e0caded76a64430f76
2014-08-06 21:59:32 -07:00
Alex Light
43c5d30795
Make system use patchoat to relocate during runtime.
...
Make installd understand a patchoat directive and carry it out.
Bug: 15358152
(cherry picked from commit 7365a10689
)
Change-Id: Id84a15e626ddde63876914068d3d9aa037abc65b
2014-08-06 16:27:55 -07:00
Brian Carlstrom
021843c78d
am 8ce28672
: Merge "Make system use patchoat to relocate during runtime."
...
* commit '8ce28672106956eeff6d0ed2d1d826ec192e58ee':
Make system use patchoat to relocate during runtime.
2014-08-05 21:00:09 +00:00
Alex Light
7365a10689
Make system use patchoat to relocate during runtime.
...
Make installd understand a patchoat directive and carry it out.
Bug: 15358152
Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
2014-08-05 10:22:10 -07:00
Brian Carlstrom
755d35f5fa
am 74b3ecf4
: Merge "Disable compilation based on vold.decrypt. [frameworks/native]"
...
* commit '74b3ecf485254d8cb4ae2b1d4d5221454738a58d':
Disable compilation based on vold.decrypt. [frameworks/native]
2014-08-04 18:37:31 +00:00
Brian Carlstrom
6461ddb4e1
am 9c49e21d
: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]"
...
* commit '9c49e21d80cb55b7d77fdf118f06b88100141678':
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
2014-08-04 18:37:26 +00:00
Brian Carlstrom
538998f204
Disable compilation based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
Change-Id: Ibc39ab82e02e42345c6e2667ac45884f2e0cf7a4
2014-08-04 11:25:45 -07:00
Brian Carlstrom
cf51ba1360
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
...
This will allow us to conditionally change the compiler-filter based on other properties.
Bug: 15165413
Change-Id: Iff27dc2904f4f0d7c25a684cd6ba16a597f252fd
2014-07-30 14:36:35 -07:00
Elliott Hughes
6fd0408de1
am 4dd0d800
: Merge "Fix implicit declaration of function \'prctl\' in installd."
...
* commit '4dd0d8008a84d1b8e5d9cae2a3491fa92b79c388':
Fix implicit declaration of function 'prctl' in installd.
2014-07-19 00:38:11 +00:00
Elliott Hughes
119b765a05
Fix implicit declaration of function 'prctl' in installd.
...
(cherry picked from commit ec535c5ba5
)
Change-Id: I3da977d85ce544b23ff00934fdbd201d683e9210
2014-07-18 17:30:32 -07:00