Jean-Baptiste Queru
53ed93f3c4
Merge from jb-mr1-dev - do not merge
2013-02-26 14:20:43 -08:00
Jean-Baptiste Queru
22c22cf7e0
Reconcile with jb-mr1-release - do not merge
2013-02-26 14:02:57 -08:00
Scott Main
e3d336f549
am 02f3e81e
: am fb247b7e
: am 386cbaeb
: am 9f2971d1
: docs: fix suggestions due to file name change for js files
...
* commit '02f3e81e9ee93848d9805222d79a4a76ea2e898a':
docs: fix suggestions due to file name change for js files
2013-02-26 21:18:52 +00:00
Scott Main
02f3e81e9e
am fb247b7e
: am 386cbaeb
: am 9f2971d1
: docs: fix suggestions due to file name change for js files
...
* commit 'fb247b7e5c1067038518e52aa62a1cbb54ac6fde':
docs: fix suggestions due to file name change for js files
2013-02-26 13:16:22 -08:00
Scott Main
fb247b7e5c
am 386cbaeb
: am 9f2971d1
: docs: fix suggestions due to file name change for js files
...
* commit '386cbaeb90fef0ea90695fac8faa407fbffa356a':
docs: fix suggestions due to file name change for js files
2013-02-26 13:13:44 -08:00
Scott Main
386cbaeb90
am 9f2971d1
: docs: fix suggestions due to file name change for js files
...
* commit '9f2971d1f36e0bffd79033e946ff1378e6ceb309':
docs: fix suggestions due to file name change for js files
2013-02-26 13:10:04 -08:00
Scott Main
9f2971d1f3
docs: fix suggestions due to file name change for js files
...
Change-Id: I4037c80f79f37f7a80d0977b4e07f992e3de61e1
2013-02-26 13:07:41 -08:00
Scott Main
68434ff55f
am 70887ad4
: am 2e639566
: am 8429876f
: am 7e447edf
: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit '70887ad43cb1dcdc3527a91b31e875964191edda':
docs: update search suggest with google services apis including some optimizations for loading javascript resources
2013-02-26 20:40:58 +00:00
Scott Main
70887ad43c
am 2e639566
: am 8429876f
: am 7e447edf
: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit '2e639566471841811ad29cd13a1f029d15b0dd85':
docs: update search suggest with google services apis including some optimizations for loading javascript resources
2013-02-26 11:27:37 -08:00
Scott Main
2e63956647
am 8429876f
: am 7e447edf
: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit '8429876f53cbe617ea36d80a97454146f4b4b746':
docs: update search suggest with google services apis including some optimizations for loading javascript resources
2013-02-26 11:25:22 -08:00
Scott Main
8429876f53
am 7e447edf
: docs: update search suggest with google services apis including some optimizations for loading javascript resources
...
* commit '7e447edffa935a3c94978304521099b9ac43b53d':
docs: update search suggest with google services apis including some optimizations for loading javascript resources
2013-02-26 11:21:21 -08:00
Scott Main
7e447edffa
docs: update search suggest with google services apis
...
including some optimizations for loading javascript resources
Change-Id: Idfea12bbb70a24a7853d997e8376e3db50e56760
2013-02-26 10:53:54 -08:00
Ying Wang
b9d22596a8
Merge "Use $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES" into jb-mr2-dev
2013-02-26 02:13:23 +00:00
Ying Wang
6c86a133c7
Use $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES
...
To disentangle the host/target shared library dependencies.
Change-Id: I3122b370a7c24425861ab6dba91e6d8d84b27249
2013-02-25 18:12:11 -08:00
Ying Wang
9c1954c43a
am 31428917
: am 93cdbd0b
: Merge "Run zipalign after classes.dex is removed from the apk"
...
* commit '31428917bc781bbd802048c574488a9e9437c830':
Run zipalign after classes.dex is removed from the apk
2013-02-26 01:50:53 +00:00
Ying Wang
31428917bc
am 93cdbd0b
: Merge "Run zipalign after classes.dex is removed from the apk"
...
* commit '93cdbd0b81e96649ebb789710429388c054bc377':
Run zipalign after classes.dex is removed from the apk
2013-02-25 17:49:28 -08:00
Ying Wang
f7084ca921
Run zipalign after classes.dex is removed from the apk
...
If LOCAL_DEX_PREOPT is enabled.
Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
2013-02-25 16:58:05 -08:00
Ying Wang
93cdbd0b81
Merge "Run zipalign after classes.dex is removed from the apk"
2013-02-26 00:51:10 +00:00
Ying Wang
48b6e18f1f
Merge "Build rs_compatibility_jni_libs into product-specific dir" into jb-mr2-dev
2013-02-26 00:19:04 +00:00
Ying Wang
370fa673b5
Build rs_compatibility_jni_libs into product-specific dir
...
They can't be shared across products.
Change-Id: I2e2b9126f2e78eb28866978d58cf6eb8c52f3d09
2013-02-25 16:06:42 -08:00
Ying Wang
7f7d4d93b8
Run zipalign after classes.dex is removed from the apk
...
If LOCAL_DEX_PREOPT is enabled.
Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
2013-02-25 16:02:42 -08:00
Jean-Baptiste Queru
4dbbd8a37e
am 757e212c
: am 0426da29
: Merge "Fixed error message for using OpenJDK."
...
* commit '757e212ca2eb5584efb1631c3b26241ffb06e3c6':
Fixed error message for using OpenJDK.
2013-02-25 21:21:03 +00:00
Jean-Baptiste Queru
757e212ca2
am 0426da29
: Merge "Fixed error message for using OpenJDK."
...
* commit '0426da292cc7cf4b7889e6105c8ef8aa9cee4ce3':
Fixed error message for using OpenJDK.
2013-02-25 13:18:26 -08:00
Jean-Baptiste Queru
0426da292c
Merge "Fixed error message for using OpenJDK."
2013-02-25 21:01:49 +00:00
Tim Roes
304f5194fd
Fixed error message for using OpenJDK.
...
Output a meaningful error message, when OpenJDK is detected
instead of giving the "wrong java version" output.
That output confused several users (from experiences in IRC)
since it gives you an output like "You are using java
version 1.6.0, right version would be Java SE 1.6".
Change-Id: I31ceeb03f1f98524b2b7de9b8be45231985fdb9e
Signed-off-by: Tim Roes <tim.roes88@googlemail.com>
2013-02-23 20:25:00 +01:00
Ken Sumrall
7ef64e31a9
am 89fbf2e2
: am 3a588682
: am 8d27d6d3
: am 44281a1f
: Add unified fstab support to release tools
...
* commit '89fbf2e2acfa5ad94308876abd86a14194fd02c1':
Add unified fstab support to release tools
2013-02-23 00:58:55 -08:00
Ken Sumrall
89fbf2e2ac
am 3a588682
: am 8d27d6d3
: am 44281a1f
: Add unified fstab support to release tools
...
* commit '3a58868258aea60d17abe7e4169a3a64bf1a0d21':
Add unified fstab support to release tools
2013-02-23 00:55:23 -08:00
Ken Sumrall
3a58868258
am 8d27d6d3
: am 44281a1f
: Add unified fstab support to release tools
...
* commit '8d27d6d378fffba4c4254ccad6a1872692839a8c':
Add unified fstab support to release tools
2013-02-23 00:53:10 -08:00
Ken Sumrall
8d27d6d378
am 44281a1f
: Add unified fstab support to release tools
...
* commit '44281a1f3ec99d650595b01b34185e1ffb129c6f':
Add unified fstab support to release tools
2013-02-23 00:49:39 -08:00
Nick Kralevich
4da8048647
am 3346da0a
: am 33b190f6
: Merge "build: update fs_config calls for capabilities change."
...
* commit '3346da0a93f60a7039581e48182be347dcceabec':
build: update fs_config calls for capabilities change.
2013-02-22 18:31:43 -08:00
Nick Kralevich
3346da0a93
am 33b190f6
: Merge "build: update fs_config calls for capabilities change."
...
* commit '33b190f6c6653b3c3493c725a96ff340c4466604':
build: update fs_config calls for capabilities change.
2013-02-22 18:28:13 -08:00
Ying Wang
bff929e05d
Merge "Don't run cleanspecs if you are using mm/mmm."
2013-02-23 02:19:49 +00:00
Ying Wang
50e52fa11e
Don't run cleanspecs if you are using mm/mmm.
...
There is lurky bug in the previous logic I believe:
in rare cases, people saw almost all cleansteps rerun.
Anyway, it's very rare that you need to run cleansteps when you run mm/mmm.
Change-Id: I42e84b3bf01590712ba1b167fe9a500f4ae1ddde
2013-02-22 18:15:29 -08:00
Nick Kralevich
33b190f6c6
Merge "build: update fs_config calls for capabilities change."
2013-02-23 02:04:55 +00:00
Christopher Ferris
310e4b2fcc
Merge "Adding TARGET_CPU_VARIANT to config file."
2013-02-23 01:33:53 +00:00
Christopher Ferris
6d7c03bfc3
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.
Bug: 8005082
Change-Id: I5b945a36c10e0095bccbe453f7652da08ebc6162
2013-02-22 17:24:25 -08:00
Ken Sumrall
44281a1f3e
Add unified fstab support to release tools
...
Update the release tools to be able to handle the new unified fstab.
Change-Id: Id9d1810c89aba415e83ae2fc586520f148ec73ef
2013-02-22 16:55:30 -08:00
Ying Wang
e84420c3e4
Merge "Untwist the target/host shared library dependencies."
2013-02-22 23:27:54 +00:00
Ying Wang
9485a57bb2
Untwist the target/host shared library dependencies.
...
Before this, if there are duplicate module names in both the host and
target spaces, LOCAL_SHARED_LIBRARIES results in mixed dependencies.
Bug: 7026946
Change-Id: I5407e3d078a8903c94978cc6d3e256851c52340f
2013-02-22 14:32:30 -08:00
The Android Open Source Project
bc0efad108
am 33b8ce1b
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '33b8ce1bfd7f8e70e28859951cc4fc48c31d671a':
Drop official SDK 17
JOP40G
2013-02-22 13:42:02 -08:00
The Android Open Source Project
33b8ce1bfd
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I652e19ace85b7b2be9c723b5ce1e7f36f7ae963f
2013-02-22 13:39:36 -08:00
Geremy Condra
e822c1e3e1
Merge "Revert "Remove ping.""
2013-02-22 19:41:02 +00:00
Geremy Condra
09d232e977
Revert "Remove ping."
...
This reverts commit 68007028fd
Change-Id: I07ff0d756dff12472633e535c51a29b9062cc3fc
2013-02-22 19:37:38 +00:00
Ying Wang
00b2811e66
resolved conflicts for merge of 40ab92d0
to master
...
Change-Id: I400c1655c57237687a21a017b9c2065d166e3097
2013-02-22 11:02:03 -08:00
Ying Wang
1d1378462a
am 5cfe1c55
: am 4703b491
: Merge "We shouldn\'t use temporary variable in the build recipe."
...
* commit '5cfe1c55c70b69105c78c4ebc49e09ab3fa3d652':
We shouldn't use temporary variable in the build recipe.
2013-02-22 10:52:49 -08:00
Ying Wang
40ab92d002
am b303d5d7
: Merge "[MIPS] Update build rules"
...
* commit 'b303d5d7d461e7f9eca3fc058c6eed69bfed4094':
[MIPS] Update build rules
2013-02-22 10:50:21 -08:00
Ying Wang
5cfe1c55c7
am 4703b491
: Merge "We shouldn\'t use temporary variable in the build recipe."
...
* commit '4703b491d73938f7861b874a5212b2214a74e988':
We shouldn't use temporary variable in the build recipe.
2013-02-22 10:50:21 -08:00
Ying Wang
b303d5d7d4
Merge "[MIPS] Update build rules"
2013-02-22 18:03:15 +00:00
Ying Wang
4703b491d7
Merge "We shouldn't use temporary variable in the build recipe."
2013-02-22 18:02:04 +00:00
Ying Wang
514cc4d25e
We shouldn't use temporary variable in the build recipe.
...
Use $@ instead.
Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
2013-02-22 10:01:33 -08:00