Sebastien Hertz
3389b9e887
Merge "Vary non-image Xmx for dex2oat on MIPS." into lmp-dev
2014-07-17 19:51:18 +00:00
Ian Rogers
bb6593243f
Vary non-image Xmx for dex2oat on MIPS.
...
The image Xmx is already fixed at 64m. The issue is in the non boot image case.
(cherry picked from commit 87f0d006f2
)
Change-Id: Id4a6d9e8edf00505198c3f3dd599cb7b7f06363a
2014-07-22 18:36:25 +02:00
Tsu Chiang Chuang
64a0607262
Merge "Include cts-junit target for cts tests." into lmp-dev
2014-07-22 16:29:55 +00:00
Tsu Chiang Chuang
c73d200ca5
Include cts-junit target for cts tests.
...
(cherry picked from commit 1949a41e70
)
Change-Id: Ic1d05f0eb1ceb1ac732b57ba1322acd17758b8d3
2014-07-21 22:23:18 -07:00
Ying Wang
0ea63e0cbd
Merge "Remove framework2" into lmp-dev
2014-07-19 22:40:06 +00:00
Ying Wang
14c975b830
Remove framework2
...
We don't need fraemwork2 split with the multidex framework.jar.
Change-Id: Ifc595b3679946d8958a9282360c7da9bc18e8adc
2014-07-21 14:42:29 -07:00
Ying Wang
2f7b92c90a
The order of SDK version matters.
...
Because some places assumes the last item is the latest public SDK
version number.
Change-Id: I0ac83ab204dcabec0b9399db1bebc77322808074
2014-07-21 13:44:06 -07:00
Sebastien Hertz
2715dc678a
Merge "Fix the MIPS build." into lmp-dev
2014-07-17 19:51:18 +00:00
Ian Rogers
16de128da1
Fix the MIPS build.
...
Use an override for the dex2oat Xmx value when cross-compiling.
Bug: 16221224
(cherry picked from commit 7d70f830bc
)
Change-Id: Ic13b471c74325e8145a0a9c93a417355505e484a
2014-07-22 09:46:37 +02:00
Ying Wang
ab4a98a85d
Remove unnecessary dependency of the sdk target.
...
ALL_GENERATED_SOURCES forces to build heavy things already covered by
build cache.
Change-Id: I362bc450b9e303120d12ee8d53d75e86ef71e58f
2014-07-21 16:06:21 -07:00
Nick Kralevich
1756474d87
Merge "runhat: use /data/local/tmp" into lmp-dev
2014-07-17 17:59:02 +00:00
Nick Kralevich
9948b1e9ed
runhat: use /data/local/tmp
...
Use /data/local/tmp for runhat reports, instead of the sdcard.
system_server isn't allowed to handle sdcard file descriptors, since
the sdcard could be ejected at any time, causing the kernel to kill the
system process.
This addresses the following SELinux denial:
W/main ( 9906): type=1400 audit(0.0:16): avc: denied { read write } for path="/mnt/shell/emulated/0/hprof-600" dev="fuse" ino=3077890536 scontext=u:r:system_server:s0 tcontext=u:object_r:fuse:s0 tclass=file
Bug: 16375996
Change-Id: I4c2053c327526c2f8e6812f4ed911a712ae9a9b8
2014-07-18 15:45:38 -07:00
Ying Wang
cff386250f
Include vendor.img in PDK build.
...
- Add the stuff in /vendor to platform.zip.
- Pull things of vendor.img from platform.zip when doing PDK fusion
build.
Bug: 16354024
Change-Id: I4f3fd392af8c357a5614b3e26ceac15fd3e6a0d0
2014-07-16 17:46:35 -07:00
David Friedman
9384878820
am 81415ada
: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
...
* commit '81415adad38fe06f50f381d6317ca0b93848e095':
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
2014-07-16 13:29:09 +00:00
Joe LaPenna
683d9867b5
Merge "Add tvdpi to list of possible recovery asset densities" into lmp-dev
2014-07-16 13:12:22 +00:00
David Friedman
ba6dc7272c
am 93848788
: am 81415ada
: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
...
* commit '9384878820ec7c881fdf054e8a0a88b2d1b94f64':
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
2014-07-16 13:36:20 +00:00
Deepanshu Gupta
9c5564e060
Fix incremental builds for SDK.
...
Atree used to output files without escaping the filenames. This resulted
in breaks for incremental builds when filenames contained '$' symbol.
The change fixes this by escaping the filename properly.
Change-Id: I957787b1b3536c64ba6fcb5b4bb5fc60e8b04452
2014-07-15 17:26:56 -07:00
Joe LaPenna
792ab6cd24
Add tvdpi to list of possible recovery asset densities
...
Bug: 16306251
Change-Id: Iaf2d36d734bb6b639b01e1097723d8387259265b
2014-07-15 16:51:44 -07:00
David Friedman
81415adad3
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
...
Change-Id: I33af76d23035067ed740d2bf734708aca8dcffe2
2014-07-15 11:38:40 -07:00
Ed Heyl
f6771f631b
reconcile aosp ( 8689b90bcf
) after branching. Please do not merge.
...
Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161
2014-07-14 23:32:28 -07:00
Guang Zhu
4f892ab728
DO NOT MERGE: Change build id to LMP
...
Change-Id: Ic52925bb3f01c5d3f6560f6c9d7a8f4c58500101
2014-07-15 02:45:43 +00:00
Daniel Rosenberg
f3bcb2d4c3
Merge "Added support for building verified vendor partition" into lmp-dev
2014-07-14 18:38:02 +00:00
Daniel Rosenberg
f4eabc3961
Added support for building verified vendor partition
...
Change-Id: I762724800ccab3a365e6d2efdf86cd9c394818eb
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-07-14 22:55:22 +00:00
Colin Cross
f4535b257f
Merge "HACK: use CPU_ABI hack only for arm64" into lmp-dev
2014-07-14 18:37:56 +00:00
Colin Cross
8179d4dcf6
HACK: use CPU_ABI hack only for arm64
...
The previous hack breaks x86_64, use it only for arm64.
Bug: 15018047
Bug: 16116257
Change-Id: Ia11f237590f7f3c7bc6a25208415b86240d2d6be
2014-07-14 12:51:52 -07:00
Jeff Brown
4d7769aea2
Merge "Build docs for android-support-media-protocols.jar." into lmp-dev
2014-07-14 18:37:56 +00:00
leozwang
3240483383
Remove bcc from generic_no_telephony.mk.
...
bcc was added into core_minimal.mk.
Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc
2014-07-14 13:54:22 -07:00
leozwang
38bbc70d04
Add bcc into /system/bin.
...
Bug: 16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
(cherry picked from commit 1bb19d3262
)
2014-07-14 17:06:32 +00:00
Jeff Brown
5d0da1f959
Build docs for android-support-media-protocols.jar.
...
Change-Id: Ib98b1cf3c4ab04594788f5182e616987a64b55be
2014-07-14 04:08:15 -07:00
The Android Automerger
263bce3e2a
"LDW13B"
2014-07-13 13:24:05 -07:00
Baligh Uddin
af0aa3ca6d
Fix Tamil country code. ta_TN should be ta_IN
...
Change-Id: I177bc5ba09f0c529409c5a81d67b6dc61d5afdf6
Bug: 16234964
2014-07-12 19:28:17 +00:00
Dan Albert
7992590462
am 202c962b
: am 8f73aeea
: am 183f90f4
: am 3ffcf184
: Merge "Remove -Bsymbolic from builds."
...
* commit '202c962b0500be38014904c96e740b3e63ce8ece':
2014-07-11 17:46:56 +00:00
Ying Wang
5df55f3db8
am c44f69a3
: am 9e00b638
: am cd02c025
: am 979d578e
: Merge "Fix host java doc by referring to the correct classpath."
...
* commit 'c44f69a38f76415d3f11fe7c3331ea7515fb479d':
2014-07-11 17:32:53 +00:00
Dan Albert
202c962b05
am 8f73aeea
: am 183f90f4
: am 3ffcf184
: Merge "Remove -Bsymbolic from builds."
...
* commit '8f73aeea87f96d715ca2f39a35fd73986feecceb':
Remove -Bsymbolic from builds.
2014-07-11 17:29:00 +00:00
Ying Wang
c44f69a38f
am 9e00b638
: am cd02c025
: am 979d578e
: Merge "Fix host java doc by referring to the correct classpath."
...
* commit '9e00b6385c5805743f5beaa22dffce021342ed5e':
Fix host java doc by referring to the correct classpath.
2014-07-11 16:18:43 +00:00
Raph Levien
fed4c5ca5a
Merge "Add Zopfli-recompress option to zipalign"
2014-07-10 20:54:59 +00:00
Geremy Condra
557e9c977f
Merge "Add support for signed boot images."
2014-07-10 20:49:26 +00:00
Geremy Condra
740b6636cc
Add support for signed boot images.
2014-07-10 14:53:08 -07:00
Geremy Condra
f5ca5c4b0d
Merge "Revert "Add support for signed boot images.""
2014-07-10 20:49:26 +00:00
Geremy Condra
ac880493e2
Revert "Add support for signed boot images."
...
This reverts commit 7e2c5ed84f
.
Change-Id: Id90e3b2d986fac3ac9b2748194747af712ac4ab1
2014-07-10 21:29:24 +00:00
Geremy Condra
7e2c5ed84f
Add support for signed boot images.
...
Change-Id: Ib08fc700f626d838efa9a543316afbcd4b782525
2014-07-10 12:23:25 -07:00
Geremy Condra
2987048f81
Merge "Add support for signed boot images."
2014-07-10 17:35:05 +00:00
Colin Cross
5c75fa6561
am 50fb938f
: am ec5563b5
: Merge "build: fix host dex2oat runtime args"
...
* commit '50fb938f79387ab92ed3b64194da47b146d74db6':
build: fix host dex2oat runtime args
2014-07-10 09:43:33 +00:00
Colin Cross
50fb938f79
am ec5563b5
: Merge "build: fix host dex2oat runtime args"
...
* commit 'ec5563b55146372fe33ebd4fc13661d811b77323':
build: fix host dex2oat runtime args
2014-07-10 06:33:08 +00:00
Paul Jensen
41c124b30e
Merge "Add app to handle captive portal login."
2014-07-10 00:46:47 +00:00
Paul Jensen
d42ae84863
Add app to handle captive portal login.
...
This app is only used if no other app handles the broadcast to perform captive
portal login.
Bug:15409233
Bug:15409354
Change-Id: Ie240d7eac4bdbab8cc7578782bd72d8b26de7951
2014-07-10 17:18:35 +00:00
Colin Cross
fddd992d90
am 5c75fa65
: am 50fb938f
: am ec5563b5
: Merge "build: fix host dex2oat runtime args"
...
* commit '5c75fa6561b7b58ae8f024bc6936433242cc9b43':
build: fix host dex2oat runtime args
2014-07-10 11:05:13 +00:00
Ying Wang
cab3ac84c2
am 094ab99f
: am bc3b9801
: am c4954f39
: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
...
* commit '094ab99f27e68cfb6a39c2355be377e27bd6df72':
Don't enable LOCAL_DEX_PREOPT for apks outside system.img
2014-07-10 00:42:53 +00:00
Ying Wang
703709dba4
am baad790d
: am f27e3fb4
: am c35cc93d
: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
...
* commit 'baad790de671f680d6584edc4712a9cde823f49c':
Allow symlinks to device or vendor tree in envsetup.sh.
2014-07-10 00:42:52 +00:00
Ying Wang
094ab99f27
am bc3b9801
: am c4954f39
: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
...
* commit 'bc3b98012dc77474d146db7747c7f33c50fe31c0':
Don't enable LOCAL_DEX_PREOPT for apks outside system.img
2014-07-10 00:16:48 +00:00