OSDN Git Service
Ying Wang [Tue, 15 Jul 2014 01:35:54 +0000 (01:35 +0000)]
am
9d29fc2d: am
7beaea15: am
15d00664: Merge "Revert "Fix Java detection on some Linux distributions""
* commit '
9d29fc2d3cd080e2ca6dc560df447d4fcfa7222b':
Revert "Fix Java detection on some Linux distributions"
Ying Wang [Tue, 15 Jul 2014 01:31:14 +0000 (01:31 +0000)]
am
7beaea15: am
15d00664: Merge "Revert "Fix Java detection on some Linux distributions""
* commit '
7beaea15f001eb9f51cfe38d6c87c9fca2100a63':
Revert "Fix Java detection on some Linux distributions"
Ying Wang [Tue, 15 Jul 2014 01:27:42 +0000 (01:27 +0000)]
am
15d00664: Merge "Revert "Fix Java detection on some Linux distributions""
* commit '
15d00664884b9b8ce4766ab3a7fd15b83cbeaad9':
Revert "Fix Java detection on some Linux distributions"
Ying Wang [Tue, 15 Jul 2014 01:23:49 +0000 (01:23 +0000)]
Merge "Revert "Fix Java detection on some Linux distributions""
Ying Wang [Tue, 15 Jul 2014 01:22:50 +0000 (01:22 +0000)]
Revert "Fix Java detection on some Linux distributions"
This reverts commit
09040dd8232f8fe588d938e04581ba1648f452f4.
Change-Id: Iafb126a6200e259f4176d903bacf8d3de28c6d97
Daniel Rosenberg [Mon, 14 Jul 2014 23:50:35 +0000 (23:50 +0000)]
am
24e4157e: am
f3bcb2d4: Merge "Added support for building verified vendor partition" into lmp-dev
* commit '
24e4157e0fe8295d32f510ad7b7663bb74e9b035':
Added support for building verified vendor partition
Daniel Rosenberg [Mon, 14 Jul 2014 23:44:18 +0000 (23:44 +0000)]
am
f3bcb2d4: Merge "Added support for building verified vendor partition" into lmp-dev
* commit '
f3bcb2d4c3a4b7e3b67805e964571f7346b7af80':
Added support for building verified vendor partition
Colin Cross [Mon, 14 Jul 2014 23:31:23 +0000 (23:31 +0000)]
am
8e14bac8: am
f4535b25: Merge "HACK: use CPU_ABI hack only for arm64" into lmp-dev
* commit '
8e14bac8be1bedd6da24330d477add1b0279c8a1':
HACK: use CPU_ABI hack only for arm64
Colin Cross [Mon, 14 Jul 2014 23:21:12 +0000 (23:21 +0000)]
am
f4535b25: Merge "HACK: use CPU_ABI hack only for arm64" into lmp-dev
* commit '
f4535b257f6ca60545b50952886c3d1e35a339f0':
HACK: use CPU_ABI hack only for arm64
Jeff Brown [Mon, 14 Jul 2014 23:08:45 +0000 (23:08 +0000)]
am
5754e2dd: am
4d7769ae: Merge "Build docs for android-support-media-protocols.jar." into lmp-dev
* commit '
5754e2dd752de78b982e2214b72bd54ea6bea65c':
Build docs for android-support-media-protocols.jar.
leozwang [Mon, 14 Jul 2014 23:08:44 +0000 (23:08 +0000)]
am
24d67ba7: am
32404833: Remove bcc from generic_no_telephony.mk.
* commit '
24d67ba7e52de5f26b32e22343af366b8ca69afb':
Remove bcc from generic_no_telephony.mk.
Jeff Brown [Mon, 14 Jul 2014 22:25:04 +0000 (22:25 +0000)]
am
4d7769ae: Merge "Build docs for android-support-media-protocols.jar." into lmp-dev
* commit '
4d7769aea21c116a68725e6888c140677470c35c':
Build docs for android-support-media-protocols.jar.
leozwang [Mon, 14 Jul 2014 22:24:44 +0000 (22:24 +0000)]
am
32404833: Remove bcc from generic_no_telephony.mk.
* commit '
324048338323aac4bdc497698391292c4561a557':
Remove bcc from generic_no_telephony.mk.
Ying Wang [Mon, 14 Jul 2014 21:49:25 +0000 (21:49 +0000)]
am
1778c874: am
3017e13f: am
c7f1389d: Merge "Fix Java detection on some Linux distributions"
* commit '
1778c8746551c8f132a020f9ea4d56d13c7712d5':
Fix Java detection on some Linux distributions
Ying Wang [Mon, 14 Jul 2014 21:44:57 +0000 (21:44 +0000)]
am
3017e13f: am
c7f1389d: Merge "Fix Java detection on some Linux distributions"
* commit '
3017e13fc8556420a2c0fb8f4a38a866b6689e0a':
Fix Java detection on some Linux distributions
Ying Wang [Mon, 14 Jul 2014 21:40:49 +0000 (21:40 +0000)]
am
c7f1389d: Merge "Fix Java detection on some Linux distributions"
* commit '
c7f1389d2683be9068d22666b484e48abcff12f1':
Fix Java detection on some Linux distributions
leozwang [Mon, 14 Jul 2014 21:08:41 +0000 (21:08 +0000)]
am
2d6cf010: am
38bbc70d: Add bcc into /system/bin.
* commit '
2d6cf01075120fc8bb05ecaeff9fd130aff9fa1e':
Add bcc into /system/bin.
leozwang [Mon, 14 Jul 2014 21:01:45 +0000 (21:01 +0000)]
am
38bbc70d: Add bcc into /system/bin.
* commit '
38bbc70d045b46b9f3389f0c2693bcff6083b297':
Add bcc into /system/bin.
leozwang [Mon, 14 Jul 2014 17:28:38 +0000 (10:28 -0700)]
Remove bcc from generic_no_telephony.mk.
bcc was added into core_minimal.mk.
Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc
The Android Automerger [Mon, 14 Jul 2014 20:51:08 +0000 (20:51 +0000)]
Baligh Uddin [Mon, 14 Jul 2014 20:51:07 +0000 (20:51 +0000)]
am
948f9719: am
af0aa3ca: Fix Tamil country code. ta_TN should be ta_IN
* commit '
948f97197c515dced3ed2156f76dfff0af57792b':
Dan Albert [Mon, 14 Jul 2014 20:51:06 +0000 (20:51 +0000)]
Ying Wang [Mon, 14 Jul 2014 20:51:05 +0000 (20:51 +0000)]
am
25deb495: am
5df55f3d: am
c44f69a3: am
9e00b638: am
cd02c025: am
979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '
25deb495100f014463f075374870c35944d98644':
Raph Levien [Mon, 14 Jul 2014 20:51:04 +0000 (20:51 +0000)]
am
b64d7baf: am
fed4c5ca: Merge "Add Zopfli-recompress option to zipalign"
* commit '
b64d7baffd9e46ebf842c28444d92a0efc32b016':
Geremy Condra [Mon, 14 Jul 2014 20:51:03 +0000 (20:51 +0000)]
am
f780204d: am
557e9c97: Merge "Add support for signed boot images."
* commit '
f780204db4196fc06fed60e8ed37e6d8d99ad0ba':
Geremy Condra [Mon, 14 Jul 2014 20:51:01 +0000 (20:51 +0000)]
am
3b214245: am
f5ca5c4b: Merge "Revert "Add support for signed boot images.""
* commit '
3b21424533b52aabe2d50ebb8b045eb28d3cbf55':
Geremy Condra [Mon, 14 Jul 2014 20:51:00 +0000 (20:51 +0000)]
am
9236493a: am
2987048f: Merge "Add support for signed boot images."
* commit '
9236493acf1724308ea9358c5cdcb1fb7d0bfc0c':
Paul Jensen [Mon, 14 Jul 2014 20:50:59 +0000 (20:50 +0000)]
am
0a0a5ca8: am
41c124b3: Merge "Add app to handle captive portal login."
* commit '
0a0a5ca875768c55f52ca3ebe140ae2b06a18c58':
Colin Cross [Mon, 14 Jul 2014 20:50:58 +0000 (20:50 +0000)]
am
8b5b4329: am
fddd992d: am
5c75fa65: am
50fb938f: am
ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '
8b5b4329763f8399ec864c388fa058dc86ec4d7d':
Ying Wang [Mon, 14 Jul 2014 20:50:57 +0000 (20:50 +0000)]
am
151abf7d: am
cab3ac84: am
094ab99f: am
bc3b9801: am
c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
* commit '
151abf7d4d720f128a99ee7c6a5875b90d2b5546':
Ying Wang [Mon, 14 Jul 2014 20:50:56 +0000 (20:50 +0000)]
am
4ee14dea: am
703709db: am
baad790d: am
f27e3fb4: am
c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit '
4ee14dea6873022a17b2294c52f9d2311a22c654':
Brian Carlstrom [Mon, 14 Jul 2014 20:50:55 +0000 (20:50 +0000)]
am
1f3c5d70: am
b1c9734b: am
ef0b6e0c: am
8a749606: am
02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '
1f3c5d709b4236e5fdd396e741eadd782dde3fb8':
Ying Wang [Mon, 14 Jul 2014 20:50:53 +0000 (20:50 +0000)]
am
6f2d0a09: am
26dbc3e6: am
d3b5d574: am
ce40d5f9: am
bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit '
6f2d0a095488048c511c72d6e1c4176c92dd9469':
Deepanshu Gupta [Mon, 14 Jul 2014 20:50:52 +0000 (20:50 +0000)]
am
57f0cd32: (-s ours) 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 '
57f0cd3242d90d86bcb1e2e549d695490dccc55a':
Deepanshu Gupta [Mon, 14 Jul 2014 20:50:51 +0000 (20:50 +0000)]
am
23e2bb53: (-s ours) 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 '
23e2bb530e38c782ec918f760e3660f97441de62':
smain@google.com [Mon, 14 Jul 2014 20:50:50 +0000 (20:50 +0000)]
am
331a03d2: (-s ours) am
49a723a5: am
afb83c6b: (-s ours) am
62cf72b0: am
60d43dde: (-s ours) am
97539b1c: DO NOT MERGE revise butter bar message for clarity
* commit '
331a03d2a284cdfce190c9503716a56dba417708':
Ying Wang [Mon, 14 Jul 2014 20:50:49 +0000 (20:50 +0000)]
am
3823ca4c: am
3abc2a39: Copy over aidl info for modules not loaded by the current build
* commit '
3823ca4c046fcf08b3fab0c6efaf23dce28ba73c':
Elliott Hughes [Mon, 14 Jul 2014 20:50:48 +0000 (20:50 +0000)]
am
80a84c6b: am
45a45d61: am
a97f675c: am
1b1840cb: am
af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit '
80a84c6b4c2b8f9bd55e50ccf675875456a5225e':
Joe LaPenna [Mon, 14 Jul 2014 20:50:47 +0000 (20:50 +0000)]
am
c6e65a72: am
6b37fd74: Merge "CW on Master: Add wifi-service to core_tiny"
* commit '
c6e65a7255c908c36e9a70dc0743a765bf5eb146':
Dan Albert [Mon, 14 Jul 2014 20:50:45 +0000 (20:50 +0000)]
Ying Wang [Mon, 14 Jul 2014 20:50:44 +0000 (20:50 +0000)]
am
7f7b3125: am
55ec7e63: am
9e00b638: am
cd02c025: am
979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '
7f7b31256367c0bff9a8c65907744df6b1697168':
The Android Automerger [Mon, 14 Jul 2014 20:44:15 +0000 (20:44 +0000)]
Baligh Uddin [Mon, 14 Jul 2014 20:44:14 +0000 (20:44 +0000)]
am
af0aa3ca: Fix Tamil country code. ta_TN should be ta_IN
* commit '
af0aa3ca6d5888b0d7e2c1a279ad129d9c1536cd':
Fix Tamil country code. ta_TN should be ta_IN
Dan Albert [Mon, 14 Jul 2014 20:44:12 +0000 (20:44 +0000)]
Ying Wang [Mon, 14 Jul 2014 20:44:10 +0000 (20:44 +0000)]
am
5df55f3d: am
c44f69a3: am
9e00b638: am
cd02c025: am
979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '
5df55f3db8a672c94ef7406447ee8ec1c0d8732f':
Raph Levien [Mon, 14 Jul 2014 20:44:09 +0000 (20:44 +0000)]
am
fed4c5ca: Merge "Add Zopfli-recompress option to zipalign"
* commit '
fed4c5ca5aab536c891caed8be6504a58409e433':
Add Zopfli-recompress option to zipalign
Geremy Condra [Mon, 14 Jul 2014 20:44:08 +0000 (20:44 +0000)]
am
557e9c97: Merge "Add support for signed boot images."
* commit '
557e9c977fda15dd58830cb7391022e7766d78fe':
Add support for signed boot images.
Geremy Condra [Mon, 14 Jul 2014 20:44:07 +0000 (20:44 +0000)]
am
f5ca5c4b: Merge "Revert "Add support for signed boot images.""
* commit '
f5ca5c4b0d444800ddba0d8fa9138748de5c635d':
Revert "Add support for signed boot images."
Geremy Condra [Mon, 14 Jul 2014 20:44:05 +0000 (20:44 +0000)]
am
2987048f: Merge "Add support for signed boot images."
* commit '
2987048f8191ece8bc8be88a2e9632acb9806e5b':
Add support for signed boot images.
Paul Jensen [Mon, 14 Jul 2014 20:44:04 +0000 (20:44 +0000)]
am
41c124b3: Merge "Add app to handle captive portal login."
* commit '
41c124b30e49f8ccedec8fce5febcfa7971b49d0':
Add app to handle captive portal login.
Colin Cross [Mon, 14 Jul 2014 20:44:03 +0000 (20:44 +0000)]
am
fddd992d: am
5c75fa65: am
50fb938f: am
ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '
fddd992d9023d3d40d4e0e26d52dcdd49ce37e0b':
Ying Wang [Mon, 14 Jul 2014 20:44:00 +0000 (20:44 +0000)]
am
cab3ac84: am
094ab99f: am
bc3b9801: am
c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
* commit '
cab3ac84c2b5e7e88e848c0bb2243051f655084a':
Ying Wang [Mon, 14 Jul 2014 20:43:58 +0000 (20:43 +0000)]
am
703709db: am
baad790d: am
f27e3fb4: am
c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit '
703709dba45405834fbe0516509f52fd13b379d3':
Brian Carlstrom [Mon, 14 Jul 2014 20:43:57 +0000 (20:43 +0000)]
am
b1c9734b: am
ef0b6e0c: am
8a749606: am
02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '
b1c9734b681ae985a7cab03311b7f8abe04d47ee':
Ying Wang [Mon, 14 Jul 2014 20:43:56 +0000 (20:43 +0000)]
am
26dbc3e6: am
d3b5d574: am
ce40d5f9: am
bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit '
26dbc3e6e4f957e552fbf66ef71be196c86c2892':
Deepanshu Gupta [Mon, 14 Jul 2014 20:43:55 +0000 (20:43 +0000)]
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]
Deepanshu Gupta [Mon, 14 Jul 2014 20:43:53 +0000 (20:43 +0000)]
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]
smain@google.com [Mon, 14 Jul 2014 20:43:52 +0000 (20:43 +0000)]
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
Ying Wang [Mon, 14 Jul 2014 20:43:51 +0000 (20:43 +0000)]
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
Elliott Hughes [Mon, 14 Jul 2014 20:43:46 +0000 (20:43 +0000)]
am
45a45d61: am
a97f675c: am
1b1840cb: am
af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit '
45a45d611fa96307d194bf95b8e48e870495f870':
Joe LaPenna [Mon, 14 Jul 2014 20:43:45 +0000 (20:43 +0000)]
am
6b37fd74: Merge "CW on Master: Add wifi-service to core_tiny"
* commit '
6b37fd74831b807967f876356d7710bbc446ba78':
CW on Master: Add wifi-service to core_tiny
Dan Albert [Mon, 14 Jul 2014 20:43:44 +0000 (20:43 +0000)]
Ying Wang [Mon, 14 Jul 2014 20:43:43 +0000 (20:43 +0000)]
am
55ec7e63: am
9e00b638: am
cd02c025: am
979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '
55ec7e63d016fd4d43f9d3e3be026850c5efbd13':
Stephen Hines [Mon, 14 Jul 2014 20:36:19 +0000 (20:36 +0000)]
am
16caafe1: am
69a86f2f: am
60a0ba2b: Merge "Remove bcc from generic_no_telephony.mk."
* commit '
16caafe17c0240ddbdfb90aab4ea22a6337dae18':
Remove bcc from generic_no_telephony.mk.
Stephen Hines [Mon, 14 Jul 2014 20:36:18 +0000 (20:36 +0000)]
am
76a93b31: am
29f93270: am
fd5e704c: Merge "Add bcc into /system/bin."
* commit '
76a93b31b5e32b8b542709463dce314ce326f19c':
Add bcc into /system/bin.
Stephen Hines [Mon, 14 Jul 2014 20:32:28 +0000 (20:32 +0000)]
am
69a86f2f: am
60a0ba2b: Merge "Remove bcc from generic_no_telephony.mk."
* commit '
69a86f2f0fa0d1e97428f7b3633234e50ca0011d':
Remove bcc from generic_no_telephony.mk.
Stephen Hines [Mon, 14 Jul 2014 20:32:27 +0000 (20:32 +0000)]
am
29f93270: am
fd5e704c: Merge "Add bcc into /system/bin."
* commit '
29f932706d39799a572544b1b26e7460b16040a3':
Add bcc into /system/bin.
Stephen Hines [Mon, 14 Jul 2014 20:29:47 +0000 (20:29 +0000)]
am
60a0ba2b: Merge "Remove bcc from generic_no_telephony.mk."
* commit '
60a0ba2b345720313d1beb0421db57ece75c063c':
Remove bcc from generic_no_telephony.mk.
Stephen Hines [Mon, 14 Jul 2014 20:29:46 +0000 (20:29 +0000)]
am
fd5e704c: Merge "Add bcc into /system/bin."
* commit '
fd5e704c5683077e4c689d4a27769c034b48be7f':
Add bcc into /system/bin.
Nick Kralevich [Mon, 14 Jul 2014 18:52:35 +0000 (18:52 +0000)]
am
d07a58bc: am
8689b90b: am
6ff84956: Merge "Fix PIC default to be -fPIC"
* commit '
d07a58bc6df23497981a1114e37fc1d70bcca0b4':
Fix PIC default to be -fPIC
Daniel Rosenberg [Mon, 14 Jul 2014 23:32:19 +0000 (23:32 +0000)]
Merge "Added support for building verified vendor partition" into lmp-dev
Daniel Rosenberg [Thu, 10 Jul 2014 22:42:38 +0000 (15:42 -0700)]
Added support for building verified vendor partition
Change-Id: I762724800ccab3a365e6d2efdf86cd9c394818eb
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Colin Cross [Mon, 14 Jul 2014 23:09:48 +0000 (23:09 +0000)]
Merge "HACK: use CPU_ABI hack only for arm64" into lmp-dev
Colin Cross [Mon, 14 Jul 2014 19:34:49 +0000 (12:34 -0700)]
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
Jeff Brown [Mon, 14 Jul 2014 21:43:50 +0000 (21:43 +0000)]
Merge "Build docs for android-support-media-protocols.jar." into lmp-dev
Nick Kralevich [Mon, 14 Jul 2014 18:17:18 +0000 (18:17 +0000)]
am
8689b90b: am
6ff84956: Merge "Fix PIC default to be -fPIC"
* commit '
8689b90bcfdc92c94475901935b5f6efae0c9abc':
Fix PIC default to be -fPIC
Colin Cross [Mon, 14 Jul 2014 18:07:51 +0000 (18:07 +0000)]
am
9984ea2b: am
50fb938f: am
ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '
9984ea2b685012dbfd4616da5b9821b663a88d95':
Ying Wang [Mon, 14 Jul 2014 18:07:50 +0000 (18:07 +0000)]
am
3f3ac1bf: am
bc3b9801: am
c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
* commit '
3f3ac1bfc563eccefafb168edc202d2f62963db5':
Ying Wang [Mon, 14 Jul 2014 18:07:49 +0000 (18:07 +0000)]
am
b01d5dd9: am
f27e3fb4: am
c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit '
b01d5dd9548045638b4dd4b48cca870930b75136':
Brian Carlstrom [Mon, 14 Jul 2014 18:07:48 +0000 (18:07 +0000)]
am
d477a113: am
8a749606: am
02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '
d477a11396434311717f916fef484ff318fa495c':
Ying Wang [Mon, 14 Jul 2014 18:07:46 +0000 (18:07 +0000)]
am
98eb90f1: am
ce40d5f9: am
bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit '
98eb90f142b0405f8f47f3c3d8fd43f702fb65ed':
Elliott Hughes [Mon, 14 Jul 2014 17:59:54 +0000 (17:59 +0000)]
am
30e12487: am
1b1840cb: am
af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit '
30e124873c31795101da435fba1aa4e53751d0f1':
Colin Cross [Mon, 14 Jul 2014 17:48:47 +0000 (17:48 +0000)]
am
50fb938f: am
ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '
50fb938f79387ab92ed3b64194da47b146d74db6':
build: fix host dex2oat runtime args
Ying Wang [Mon, 14 Jul 2014 17:48:34 +0000 (17:48 +0000)]
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
Ying Wang [Mon, 14 Jul 2014 17:48:33 +0000 (17:48 +0000)]
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.
Brian Carlstrom [Mon, 14 Jul 2014 17:48:23 +0000 (17:48 +0000)]
am
8a749606: am
02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '
8a7496060df85c241b976d6cd69b13828e452ef9':
Make dex2oat heap size product configurable [build]
Ying Wang [Mon, 14 Jul 2014 17:48:21 +0000 (17:48 +0000)]
am
ce40d5f9: am
bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit '
ce40d5f99e9c0658aab9539bf8afa253dfd985e4':
More consistent use of 64-bit build variable.
Ying Wang [Mon, 14 Jul 2014 21:36:53 +0000 (21:36 +0000)]
Merge "Fix Java detection on some Linux distributions"
leozwang [Sun, 13 Jul 2014 05:03:52 +0000 (22:03 -0700)]
Add bcc into /system/bin.
Bug:
16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
(cherry picked from commit
1bb19d32627fdad6a8c301b152ea26d41f2c8f09)
Stephen Hines [Mon, 14 Jul 2014 20:27:53 +0000 (20:27 +0000)]
Merge "Add bcc into /system/bin."
leozwang [Sun, 13 Jul 2014 05:03:52 +0000 (22:03 -0700)]
Add bcc into /system/bin.
Bug:
16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
Stephen Hines [Mon, 14 Jul 2014 20:28:27 +0000 (20:28 +0000)]
Merge "Remove bcc from generic_no_telephony.mk."
leozwang [Mon, 14 Jul 2014 17:28:38 +0000 (10:28 -0700)]
Remove bcc from generic_no_telephony.mk.
bcc was added into core_minimal.mk.
Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc
Jeff Brown [Mon, 14 Jul 2014 11:08:15 +0000 (04:08 -0700)]
Build docs for android-support-media-protocols.jar.
Change-Id: Ib98b1cf3c4ab04594788f5182e616987a64b55be
Bernhard Rosenkränzer [Mon, 14 Jul 2014 08:42:11 +0000 (10:42 +0200)]
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>
The Android Automerger [Sun, 13 Jul 2014 20:24:05 +0000 (13:24 -0700)]
"LDW13B"
Elliott Hughes [Sun, 13 Jul 2014 08:34:59 +0000 (08:34 +0000)]
am
1b1840cb: am
af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit '
1b1840cbef77f2abfe95af56bc927c647a693429':
ADBS now uses stack_core code to parse traces.
leozwang [Sun, 13 Jul 2014 05:03:52 +0000 (22:03 -0700)]
Add bcc into /system/bin.
Bug:
16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
Baligh Uddin [Sat, 12 Jul 2014 19:26:45 +0000 (12:26 -0700)]
Fix Tamil country code. ta_TN should be ta_IN
Change-Id: I177bc5ba09f0c529409c5a81d67b6dc61d5afdf6
Bug:
16234964
Dan Albert [Fri, 11 Jul 2014 17:46:56 +0000 (17:46 +0000)]