Brian Carlstrom
fca814550c
Strip all multidex files, not just classes.dex
...
Bug: 10447095
Change-Id: I6053ca97cb0e28621262a385d57c0996e7c1aaab
2014-07-01 23:04:36 -07:00
Santos Cordon
2b432869de
Merge "Add phone directory to frameworks/base."
2014-07-01 19:22:38 +00:00
Santos Cordon
7d36e1574f
Add phone directory to frameworks/base.
...
Necessary to support the change: Id8b08d88a06a7b4e90a4a7f702ba56526e108ca5
Change-Id: I1a00d2cdcb26fa796c5d0840cfe16b0e416ad299
2014-07-02 18:05:25 +00:00
Ying Wang
00c67a0568
Fix typo.
...
Bug: 15978907
Bug: 15018047
Change-Id: I6250bb6d67af8c612283541efe0e2120077ad2fb
2014-06-30 18:01:46 -07:00
Brian Carlstrom
a5eb17b0ac
Merge "Fixes for core_tiny zygote to boot"
2014-07-01 00:40:37 +00:00
Brian Carlstrom
de5dce1ad1
Fixes for core_tiny zygote to boot
...
Change-Id: Ie926eb316d05702ddb715ca4519397e9be0e7049
2014-07-01 11:51:17 -07:00
Ying Wang
dcc8b3729d
Use "$@" to preserve argument word breaks
...
This fixes mmma broken due to quotes stripped in the argument passing.
Change-Id: I6095c7ccf0660ba7b17a659f5df29b05e50e6303
2014-07-01 10:58:10 -07:00
Ying Wang
e050245b7a
am 0d0b7b36
: am 2530c787
: am 4b539d15
: Merge "More consistent host library path in multilib build."
...
* commit '0d0b7b3669d3cb309ddd26cf23ddddbe4d42fd8e':
More consistent host library path in multilib build.
2014-07-01 00:35:21 +00:00
Ying Wang
0d0b7b3669
am 2530c787
: am 4b539d15
: Merge "More consistent host library path in multilib build."
...
* commit '2530c787db272bfb4afab80e37323b9b7d00671c':
More consistent host library path in multilib build.
2014-07-01 00:28:14 +00:00
Ying Wang
2530c787db
am 4b539d15
: Merge "More consistent host library path in multilib build."
...
* commit '4b539d1533a5d8647e5f54b0a41b2a49d7f4c785':
More consistent host library path in multilib build.
2014-07-01 00:22:30 +00:00
Elliott Hughes
0635498086
am 3a2f6ecf
: am 491871aa
: am 4b7ba417
: Merge "Add -Wl,--fatal-warnings to x86_64."
...
* commit '3a2f6ecf3f7af6819b601645334d4c563401d37a':
Add -Wl,--fatal-warnings to x86_64.
2014-06-30 23:04:35 +00:00
Elliott Hughes
3a2f6ecf3f
am 491871aa
: am 4b7ba417
: Merge "Add -Wl,--fatal-warnings to x86_64."
...
* commit '491871aa03b6a6b4d4f1d6ebb7e2f4dc746b4d4b':
Add -Wl,--fatal-warnings to x86_64.
2014-06-30 22:59:37 +00:00
Elliott Hughes
491871aa03
am 4b7ba417
: Merge "Add -Wl,--fatal-warnings to x86_64."
...
* commit '4b7ba41704a8f028ffdf9f2c8bff57d9d4055f93':
Add -Wl,--fatal-warnings to x86_64.
2014-06-30 22:53:49 +00:00
Ying Wang
4b539d1533
Merge "More consistent host library path in multilib build."
2014-06-30 22:29:38 +00:00
Ying Wang
36ef50f2a2
More consistent host library path in multilib build.
...
In 64-bit multilib host build, changed from
32-bit lib: out/host/<platform>/lib32
64-bit lib: out/host/<platform>/lib
to
32-bit lib: out/host/<platform>/lib
64-bit lib: out/host/<platform>/lib64
.
That way the host library path is consistent with the multilib target
build's. Also with this change prebuilt 32-bit libraries can be reused
in 64-bit host build as 2nd arch binaries. (With previous setup, they
can't be used because they have rpath ../lib in it while the 2nd arch
library path needs ../lib32.
Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1
2014-06-30 17:06:21 -07:00
Ying Wang
704776e14e
am 9327f77a
: am ccbf5930
: am 51254e6c
: Merge "Fix missing rs_compatibility_jni_libs."
...
* commit '9327f77a01828e0d13dc32be295d6338fe339abc':
Fix missing rs_compatibility_jni_libs.
2014-06-30 18:36:07 +00:00
Ying Wang
9327f77a01
am ccbf5930
: am 51254e6c
: Merge "Fix missing rs_compatibility_jni_libs."
...
* commit 'ccbf59304645dde557e24e7a8dd1440111d1a3ce':
Fix missing rs_compatibility_jni_libs.
2014-06-30 18:30:46 +00:00
Ying Wang
ccbf593046
am 51254e6c
: Merge "Fix missing rs_compatibility_jni_libs."
...
* commit '51254e6c6065c0c771886472853e6dbc5377c6ae':
Fix missing rs_compatibility_jni_libs.
2014-06-30 18:25:37 +00:00
Ying Wang
a626d3b44b
Fix missing rs_compatibility_jni_libs.
...
Bug: 15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
2014-06-30 11:17:16 -07:00
Ying Wang
3e164be71d
am 556efe00
: am 9e05c9e4
: am dc58c2a6
: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-a
...
* commit '556efe002f852dfa5ca5331e92b1d65a32339f26':
Remove nonexistent $ANDROID_QTOOLS from $PATH.
2014-06-30 17:39:28 +00:00
Ying Wang
556efe002f
am 9e05c9e4
: am dc58c2a6
: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.r
...
* commit '9e05c9e4e642673dc6d9104c44d26810773c382d':
Remove nonexistent $ANDROID_QTOOLS from $PATH.
2014-06-30 17:36:39 +00:00
Ying Wang
9e05c9e4e6
am dc58c2a6
: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/usr/lib/google-golang/bin:/usr/local/buildtools/java/jdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/buildbot/automergers:/buildbot/automergers."
...
* commit 'dc58c2a6c216577110682521fa787fd9640cc89d':
Remove nonexistent $ANDROID_QTOOLS from $PATH.
2014-06-30 17:32:05 +00:00
Brian Carlstrom
191e5988d0
resolved conflicts for merge of da92aef7
to master
...
Change-Id: I70b608d48b0e7cfea3d970101769c156a211f861
2014-06-28 13:54:24 -07:00
Ian Rogers
da92aef762
am 8625b6e7
: am 7634e413
: Merge "Host support for prefer symlink"
...
* commit '8625b6e74ae33db8ce7d18c131ba3d87f121d1f3':
Host support for prefer symlink
2014-06-28 00:36:10 +00:00
Ian Rogers
8625b6e74a
am 7634e413
: Merge "Host support for prefer symlink"
...
* commit '7634e4136fee6c7a02f4a343072400ba575c0051':
Host support for prefer symlink
2014-06-28 00:30:43 +00:00
Ying Wang
51254e6c60
Merge "Fix missing rs_compatibility_jni_libs."
2014-06-27 16:59:53 +00:00
Ying Wang
efe7779cfb
Fix missing rs_compatibility_jni_libs.
...
Bug: 15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
2014-06-30 11:20:41 -07:00
Ying Wang
dc58c2a6c2
Merge "Remove nonexistent $ANDROID_QTOOLS from $PATH."
2014-06-27 16:59:53 +00:00
Ying Wang
2a859d5a62
Remove nonexistent $ANDROID_QTOOLS from $PATH.
...
Bug: 15983070
Change-Id: Id3807a6dabd616ae06aafc2b894c1858e4400e26
2014-06-30 10:25:33 -07:00
Ian Rogers
7634e4136f
Merge "Host support for prefer symlink"
2014-06-27 16:59:53 +00:00
Ian Rogers
cf331d931d
Host support for prefer symlink
...
We need a host symlink for dalvik, our *-dalvik-host build targets
are failing.
Change-Id: I6045de20c948b456a150033deb3459895aff83c6
2014-06-27 17:23:03 -07:00
Ying Wang
7a6a9a5582
am 4bdbd6d4
: am e1b43254
: Merge "Add --pseudo-localize aapt parameter for builds."
...
* commit '4bdbd6d4346a246df8edaf9323e15d84a1f35951':
Add --pseudo-localize aapt parameter for builds.
2014-06-27 16:19:26 +00:00
Ying Wang
4bdbd6d434
am e1b43254
: Merge "Add --pseudo-localize aapt parameter for builds."
...
* commit 'e1b43254b72613e6bf9ac994c1b3f07e0020ed9c':
Add --pseudo-localize aapt parameter for builds.
2014-06-27 16:14:30 +00:00
Ying Wang
8d43e17bfd
Merge "Support to check System API."
2014-06-27 15:56:14 +00:00
Ed Heyl
c6d11f8c66
no color output, thanks Mac; better callback to real make
...
Change-Id: Iff2a15ed8aad28c264209b26a33d1206ec80b794
2014-06-27 14:19:51 -07:00
JP Abgrall
1207d5e02b
Merge "releasetools: only allow yaffs to have no userdata image size (fix build)"
2014-06-27 15:56:14 +00:00
JP Abgrall
4d09dcb2c6
releasetools: only allow yaffs to have no userdata image size (fix build)
...
In the past, there was an exception for ext-base fs types to
deal with the lack of image size.
Back then it was only yaffs and ext*.
So now we explicitely only allow yaffs to have no userdata image size.
Change-Id: Ie354ee6222a58228dbcce2c6934971a0737422af
Signed-off-by: JP Abgrall <jpa@google.com >
2014-06-26 21:15:39 -07:00
Ying Wang
829f68bb02
Support to check System API.
...
Change-Id: I60f8c9bb13efb6a440bb735d634f63fab035c810
2014-06-26 17:54:28 -07:00
Dirk Dougherty
80b97e1c19
am 23673843
: Doc change: add query param to force refresh in proxy caches.
...
* commit '236738439acab7c9b2afc2725b44c4867597ed7f':
Doc change: add query param to force refresh in proxy caches.
2014-06-26 21:09:09 +00:00
Dirk Dougherty
236738439a
Doc change: add query param to force refresh in proxy caches.
...
Change-Id: I7bbec536bba7878ef9b5fdc91a25a47437e276ed
2014-06-26 13:07:57 -07:00
Colin Cross
e2543ea2ea
Merge "build: fix vendor symbols in gdb"
2014-06-26 18:42:03 +00:00
Colin Cross
d00c0a2e20
HACK: report CPU abi as 2nd arch if present
...
Workaround to report armv7 abis for arm64 devices until the play store
looks at the new android.os.Build.SUPPORTED_ABIS list.
Bug: 15018047
Change-Id: If5f4081073ee80433aae51ef15ccbfa1c6ae624c
2014-06-27 10:49:26 -07:00
Colin Cross
a58f8e04c9
build: fix vendor symbols in gdb
...
Set TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED
Append '64' for 64-bit libraries
Change-Id: Ief289bb23950d4bed84cf616cff6038fbd8caf95
2014-06-27 10:48:22 -07:00
Ying Wang
a26a2123b8
am 7a6a9a55
: am 4bdbd6d4
: am e1b43254
: Merge "Add --pseudo-localize aapt parameter for builds."
...
* commit '7a6a9a558271ac959a2e441fe27aae3df77d4421':
Add --pseudo-localize aapt parameter for builds.
2014-06-27 16:24:46 +00:00
Elliott Hughes
4b7ba41704
Merge "Add -Wl,--fatal-warnings to x86_64."
2014-06-26 18:33:52 +00:00
Elliott Hughes
3beb51692e
Add -Wl,--fatal-warnings to x86_64.
...
Bug: 11358761
Change-Id: I0c86a2ce3f95e89cc6c6eed65f3595922a90f45f
2014-06-30 14:52:30 -07:00
Ying Wang
e1b43254b7
Merge "Add --pseudo-localize aapt parameter for builds."
2014-06-26 18:33:52 +00:00
Igor Viarheichyk
c4dfe6ef30
Add --pseudo-localize aapt parameter for builds.
...
Some packages can override list of locales with
LOCAL_AAPT_INCLUDE_ALL_RESOURCES parameter, disabling
pseudolocalization. Adding new --pseudo-localize flag to
aapt if pseudo-locales are specified in product locales
list solves this issue.
Change-Id: Iae705d4fe99453650339fd1ca65d1005671b3e4f
2014-06-26 17:27:36 -07:00
Baligh Uddin
0a74bf180a
Merge "Add new locales for Platform (L) release"
2014-06-26 18:07:29 +00:00
Baligh Uddin
c8ae20330c
Add new locales for Platform (L) release
...
Bug: 13437459
Change-Id: Ic186d288469b503118513a437de3a2ef446e34fc
2014-06-26 22:40:06 +00:00