leozwang
24d67ba7e5
am 32404833
: Remove bcc from generic_no_telephony.mk.
...
* commit '324048338323aac4bdc497698391292c4561a557':
Remove bcc from generic_no_telephony.mk.
2014-07-14 22:24:44 +00:00
Ying Wang
1778c87465
am 3017e13f
: am c7f1389d
: Merge "Fix Java detection on some Linux distributions"
...
* commit '3017e13fc8556420a2c0fb8f4a38a866b6689e0a':
Fix Java detection on some Linux distributions
2014-07-14 21:44:57 +00:00
Ying Wang
3017e13fc8
am c7f1389d
: Merge "Fix Java detection on some Linux distributions"
...
* commit 'c7f1389d2683be9068d22666b484e48abcff12f1':
Fix Java detection on some Linux distributions
2014-07-14 21:40:49 +00:00
leozwang
2d6cf01075
am 38bbc70d
: Add bcc into /system/bin.
...
* commit '38bbc70d045b46b9f3389f0c2693bcff6083b297':
Add bcc into /system/bin.
2014-07-14 21:01:45 +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
The Android Automerger
96bf1f7597
am 263bce3e
: "LDW13B"
...
* commit '263bce3e2ab08f81945bcdce41339a84c11ff875':
"LDW13B"
2014-07-14 20:44:15 +00:00
Baligh Uddin
948f97197c
am af0aa3ca
: Fix Tamil country code. ta_TN should be ta_IN
...
* commit 'af0aa3ca6d5888b0d7e2c1a279ad129d9c1536cd':
Fix Tamil country code. ta_TN should be ta_IN
2014-07-14 20:44:14 +00:00
Dan Albert
1f65a5fb11
am 79925904
: am 202c962b
: am 8f73aeea
: am 183f90f4
: am 3ffcf184
: Merge "Remove -Bsymbolic from builds."
...
* commit '7992590462c9fafd35829dd99a7f1104dab483b0':
2014-07-14 20:44:12 +00:00
Ying Wang
25deb49510
am 5df55f3d
: am c44f69a3
: am 9e00b638
: am cd02c025
: am 979d578e
: Merge "Fix host java doc by referring to the correct classpath."
...
* commit '5df55f3db8a672c94ef7406447ee8ec1c0d8732f':
2014-07-14 20:44:10 +00:00
Raph Levien
b64d7baffd
am fed4c5ca
: Merge "Add Zopfli-recompress option to zipalign"
...
* commit 'fed4c5ca5aab536c891caed8be6504a58409e433':
Add Zopfli-recompress option to zipalign
2014-07-14 20:44:09 +00:00
Geremy Condra
f780204db4
am 557e9c97
: Merge "Add support for signed boot images."
...
* commit '557e9c977fda15dd58830cb7391022e7766d78fe':
Add support for signed boot images.
2014-07-14 20:44:08 +00:00
Geremy Condra
3b21424533
am f5ca5c4b
: Merge "Revert "Add support for signed boot images.""
...
* commit 'f5ca5c4b0d444800ddba0d8fa9138748de5c635d':
Revert "Add support for signed boot images."
2014-07-14 20:44:07 +00:00
Geremy Condra
9236493acf
am 2987048f
: Merge "Add support for signed boot images."
...
* commit '2987048f8191ece8bc8be88a2e9632acb9806e5b':
Add support for signed boot images.
2014-07-14 20:44:05 +00:00
Paul Jensen
0a0a5ca875
am 41c124b3
: Merge "Add app to handle captive portal login."
...
* commit '41c124b30e49f8ccedec8fce5febcfa7971b49d0':
Add app to handle captive portal login.
2014-07-14 20:44:04 +00:00
Colin Cross
8b5b432976
am fddd992d
: am 5c75fa65
: am 50fb938f
: am ec5563b5
: Merge "build: fix host dex2oat runtime args"
...
* commit 'fddd992d9023d3d40d4e0e26d52dcdd49ce37e0b':
2014-07-14 20:44:03 +00:00
Ying Wang
151abf7d4d
am cab3ac84
: am 094ab99f
: am bc3b9801
: am c4954f39
: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
...
* commit 'cab3ac84c2b5e7e88e848c0bb2243051f655084a':
2014-07-14 20:44:00 +00:00
Ying Wang
4ee14dea68
am 703709db
: am baad790d
: am f27e3fb4
: am c35cc93d
: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
...
* commit '703709dba45405834fbe0516509f52fd13b379d3':
2014-07-14 20:43:58 +00:00
Brian Carlstrom
1f3c5d709b
am b1c9734b
: am ef0b6e0c
: am 8a749606
: am 02a5b517
: Merge "Make dex2oat heap size product configurable [build]"
...
* commit 'b1c9734b681ae985a7cab03311b7f8abe04d47ee':
2014-07-14 20:43:57 +00:00
Ying Wang
6f2d0a0954
am 26dbc3e6
: am d3b5d574
: am ce40d5f9
: am bc7501e1
: Merge "More consistent use of 64-bit build variable."
...
* commit '26dbc3e6e4f957e552fbf66ef71be196c86c2892':
2014-07-14 20:43:56 +00:00
Deepanshu Gupta
57f0cd3242
am 4221bb7c
: am 042c8a06
: (-s ours) am f0200e87
: am 72146221
: am 0b3aa00e
: am da111964
: (-s ours) am d23dcdf1
: am a0130a4d
: am 9915a60c
: (-s ours) am 1bb64302
: am 1699a434
: am 075f7751
: Integrate build_font.py [DO NOT MERGE]
...
* commit '4221bb7c4a4ddf1aab4662efdfc970e2f142014d':
Integrate build_font.py [DO NOT MERGE]
2014-07-14 20:43:55 +00:00
Deepanshu Gupta
23e2bb530e
am 4fc3a60a
: am 75cdce7b
: (-s ours) am 98da9070
: am 307a8ec9
: am 8eaddc6c
: am 071a2f83
: (-s ours) am ea2f4e3c
: am daee7822
: Integrate build_font.py [DO NOT MERGE]
...
* commit '4fc3a60ab678a66c5e5051f6889b2a4c2df46e29':
Integrate build_font.py [DO NOT MERGE]
2014-07-14 20:43:53 +00:00
smain@google.com
331a03d2a2
am 49a723a5
: am afb83c6b
: (-s ours) am 62cf72b0
: am 60d43dde
: (-s ours) am 97539b1c
: DO NOT MERGE revise butter bar message for clarity
...
* commit '49a723a514de66318de334aeff8cce1a0ac1384b':
DO NOT MERGE revise butter bar message for clarity
2014-07-14 20:43:52 +00:00
Ying Wang
3823ca4c04
am 3abc2a39
: Copy over aidl info for modules not loaded by the current build
...
* commit '3abc2a392664fd08288d39513fc41182af7fefaf':
Copy over aidl info for modules not loaded by the current build
2014-07-14 20:43:51 +00:00
Elliott Hughes
80a84c6b4c
am 45a45d61
: am a97f675c
: am 1b1840cb
: am af95db03
: Merge "ADBS now uses stack_core code to parse traces."
...
* commit '45a45d611fa96307d194bf95b8e48e870495f870':
2014-07-14 20:43:46 +00:00
Joe LaPenna
c6e65a7255
am 6b37fd74
: Merge "CW on Master: Add wifi-service to core_tiny"
...
* commit '6b37fd74831b807967f876356d7710bbc446ba78':
CW on Master: Add wifi-service to core_tiny
2014-07-14 20:43:45 +00:00
Dan Albert
e3b719c443
am 9d8d20a1
: am 8f73aeea
: am 183f90f4
: am 3ffcf184
: Merge "Remove -Bsymbolic from builds."
...
* commit '9d8d20a1e1f7b79af1f8f0e491740811ae5bacb2':
2014-07-14 20:43:44 +00:00
Ying Wang
7f7b312563
am 55ec7e63
: am 9e00b638
: am cd02c025
: am 979d578e
: Merge "Fix host java doc by referring to the correct classpath."
...
* commit '55ec7e63d016fd4d43f9d3e3be026850c5efbd13':
2014-07-14 20:43:43 +00:00
Stephen Hines
16caafe17c
am 69a86f2f
: am 60a0ba2b
: Merge "Remove bcc from generic_no_telephony.mk."
...
* commit '69a86f2f0fa0d1e97428f7b3633234e50ca0011d':
Remove bcc from generic_no_telephony.mk.
2014-07-14 20:32:28 +00:00
Stephen Hines
76a93b31b5
am 29f93270
: am fd5e704c
: Merge "Add bcc into /system/bin."
...
* commit '29f932706d39799a572544b1b26e7460b16040a3':
Add bcc into /system/bin.
2014-07-14 20:32:27 +00:00
Stephen Hines
69a86f2f0f
am 60a0ba2b
: Merge "Remove bcc from generic_no_telephony.mk."
...
* commit '60a0ba2b345720313d1beb0421db57ece75c063c':
Remove bcc from generic_no_telephony.mk.
2014-07-14 20:29:47 +00:00
Stephen Hines
29f932706d
am fd5e704c
: Merge "Add bcc into /system/bin."
...
* commit 'fd5e704c5683077e4c689d4a27769c034b48be7f':
Add bcc into /system/bin.
2014-07-14 20:29:46 +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
Nick Kralevich
d07a58bc6d
am 8689b90b
: am 6ff84956
: Merge "Fix PIC default to be -fPIC"
...
* commit '8689b90bcfdc92c94475901935b5f6efae0c9abc':
Fix PIC default to be -fPIC
2014-07-14 18:17:18 +00:00
Colin Cross
9984ea2b68
am 50fb938f
: am ec5563b5
: Merge "build: fix host dex2oat runtime args"
...
* commit '50fb938f79387ab92ed3b64194da47b146d74db6':
build: fix host dex2oat runtime args
2014-07-14 17:48:47 +00:00
Ying Wang
3f3ac1bfc5
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-14 17:48:34 +00:00
Ying Wang
b01d5dd954
am f27e3fb4
: am c35cc93d
: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
...
* commit 'f27e3fb4cf1d51f3abd5261d5626997c71df22b7':
Allow symlinks to device or vendor tree in envsetup.sh.
2014-07-14 17:48:33 +00:00
Brian Carlstrom
d477a11396
am 8a749606
: am 02a5b517
: Merge "Make dex2oat heap size product configurable [build]"
...
* commit '8a7496060df85c241b976d6cd69b13828e452ef9':
Make dex2oat heap size product configurable [build]
2014-07-14 17:48:23 +00:00
Ying Wang
98eb90f142
am ce40d5f9
: am bc7501e1
: Merge "More consistent use of 64-bit build variable."
...
* commit 'ce40d5f99e9c0658aab9539bf8afa253dfd985e4':
More consistent use of 64-bit build variable.
2014-07-14 17:48:21 +00:00
Ying Wang
c7f1389d26
Merge "Fix Java detection on some Linux distributions"
2014-07-14 17:15:23 +00: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
Stephen Hines
fd5e704c56
Merge "Add bcc into /system/bin."
2014-07-14 16:08:11 +00:00
leozwang
01e6853556
Add bcc into /system/bin.
...
Bug: 16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
2014-07-14 13:27:02 -07:00
Stephen Hines
60a0ba2b34
Merge "Remove bcc from generic_no_telephony.mk."
2014-07-14 16:03:19 +00:00
leozwang
176b0d3f86
Remove bcc from generic_no_telephony.mk.
...
bcc was added into core_minimal.mk.
Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc
2014-07-14 10:28:38 -07:00
Jeff Brown
5d0da1f959
Build docs for android-support-media-protocols.jar.
...
Change-Id: Ib98b1cf3c4ab04594788f5182e616987a64b55be
2014-07-14 04:08:15 -07:00
Bernhard Rosenkränzer
09040dd823
Fix Java detection on some Linux distributions
...
On some Linux distributions (spotted here on OpenMandriva Lx, but I'm
pretty sure some others do the same thing), "which javac" returns
/usr/bin/javac, which is a symlink to "../../etc/alternatives/javac",
which in turn points at whatever the JDK the user picked as his default.
Given "../../etc/alternatives/javac" is a relative, symlink, the next
iteration of LSLINE=$(ls -l "$JAVAC") fails (no
../../etc/alternatives/java relative to the build directory), causing
tools.jar not to be found.
Using readlink -f should work in all cases (while also simplifying the
script a bit).
Change-Id: I96afcf8e6460861bf8bb849dae05c27c42b91e84
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-07-14 10:54:58 +02:00