OSDN Git Service
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: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: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 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.
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
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.
Dan Albert [Fri, 11 Jul 2014 17:29:00 +0000 (17:29 +0000)]
am
8f73aeea: am
183f90f4: am
3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '
8f73aeea87f96d715ca2f39a35fd73986feecceb':
Remove -Bsymbolic from builds.
Ying Wang [Fri, 11 Jul 2014 16:18:43 +0000 (16:18 +0000)]
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.
Nick Kralevich [Fri, 11 Jul 2014 01:56:46 +0000 (01:56 +0000)]
am
6ff84956: Merge "Fix PIC default to be -fPIC"
* commit '
6ff849568c94c53c8a722f71f33c1e688ebbed74':
Fix PIC default to be -fPIC
Colin Cross [Thu, 10 Jul 2014 11:05:13 +0000 (11:05 +0000)]
am
5c75fa65: am
50fb938f: am
ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '
5c75fa6561b7b58ae8f024bc6936433242cc9b43':
build: fix host dex2oat runtime args
Colin Cross [Thu, 10 Jul 2014 09:43:33 +0000 (09:43 +0000)]
am
50fb938f: am
ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '
50fb938f79387ab92ed3b64194da47b146d74db6':
build: fix host dex2oat runtime args
Colin Cross [Thu, 10 Jul 2014 06:33:08 +0000 (06:33 +0000)]
am
ec5563b5: Merge "build: fix host dex2oat runtime args"
* commit '
ec5563b55146372fe33ebd4fc13661d811b77323':
build: fix host dex2oat runtime args
Paul Jensen [Thu, 10 Jul 2014 19:05:25 +0000 (19:05 +0000)]
Merge "Add app to handle captive portal login."
Paul Jensen [Thu, 10 Jul 2014 01:49:12 +0000 (21:49 -0400)]
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
Ying Wang [Thu, 10 Jul 2014 00:42:53 +0000 (00:42 +0000)]
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
Ying Wang [Thu, 10 Jul 2014 00:42:52 +0000 (00:42 +0000)]
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.
Nick Kralevich [Thu, 10 Jul 2014 17:27:20 +0000 (17:27 +0000)]
Merge "Fix PIC default to be -fPIC"
Ying Wang [Thu, 10 Jul 2014 00:16:48 +0000 (00:16 +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 [Thu, 10 Jul 2014 00:16:48 +0000 (00:16 +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.
Ying Wang [Thu, 10 Jul 2014 00:08:18 +0000 (00:08 +0000)]
am
c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img"
* commit '
c4954f392e94f1877ab77ccef725a26c5d549ed1':
Don't enable LOCAL_DEX_PREOPT for apks outside system.img
Ying Wang [Thu, 10 Jul 2014 00:08:13 +0000 (00:08 +0000)]
am
c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit '
c35cc93d3b12880ae4de00ae9ef867ab91dbc412':
Allow symlinks to device or vendor tree in envsetup.sh.
Ying Wang [Wed, 9 Jul 2014 23:18:08 +0000 (23:18 +0000)]
Merge "Don't enable LOCAL_DEX_PREOPT for apks outside system.img"
Ying Wang [Wed, 9 Jul 2014 22:40:33 +0000 (22:40 +0000)]
Merge "Allow symlinks to device or vendor tree in envsetup.sh."
Ying Wang [Wed, 9 Jul 2014 22:37:34 +0000 (15:37 -0700)]
Allow symlinks to device or vendor tree in envsetup.sh.
Change-Id: I1190a0b1c84fa17b3692427eb6071ffbe84bc529
Ying Wang [Wed, 9 Jul 2014 17:57:32 +0000 (10:57 -0700)]
Don't enable LOCAL_DEX_PREOPT for apks outside system.img
Bug:
15621103
Change-Id: If267a4aaad17b66d9779169237e06d65d67f088f
Brian Carlstrom [Wed, 9 Jul 2014 15:07:13 +0000 (15:07 +0000)]
am
ef0b6e0c: am
8a749606: am
02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '
ef0b6e0c19eb37f4fbc42491771611e247168519':
Make dex2oat heap size product configurable [build]
Ying Wang [Wed, 9 Jul 2014 15:07:12 +0000 (15:07 +0000)]
am
d3b5d574: am
ce40d5f9: am
bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit '
d3b5d574defd565d6e810cbb86e3943837f94065':
More consistent use of 64-bit build variable.
Deepanshu Gupta [Wed, 9 Jul 2014 14:42:43 +0000 (14:42 +0000)]
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 '
042c8a06c1fce45856d49ae73c06f1eb7043669f':
Integrate build_font.py [DO NOT MERGE]
Colin Cross [Thu, 10 Jul 2014 06:10:50 +0000 (06:10 +0000)]
Merge "build: fix host dex2oat runtime args"
Colin Cross [Thu, 10 Jul 2014 05:09:50 +0000 (22:09 -0700)]
build: fix host dex2oat runtime args
The dalvik.vm.* properties are in PRODUCT_DEFAULT_PROPERTY_OVERRIDES,
not PRODUCT_PROPERTY_OVERRIDES.
Use $(call func,args) for user defined functions
Prepend the property contents with -Xms or -Xmx when passing to
dex2oat. This only worked before because DEX2OAT_XMS, etc. were blank
due to the first two bugs, which resulted in --runtime-arg --runtime-arg
and anything starting with -- as the argument to --runtime-arg is
silently ignored.
Change-Id: Ifa30038b397355171fefcc5248eea033bb634036
Brian Carlstrom [Wed, 9 Jul 2014 12:36:31 +0000 (12:36 +0000)]
am
8a749606: am
02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '
8a7496060df85c241b976d6cd69b13828e452ef9':
Make dex2oat heap size product configurable [build]
Ying Wang [Wed, 9 Jul 2014 12:36:30 +0000 (12:36 +0000)]
am
ce40d5f9: am
bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit '
ce40d5f99e9c0658aab9539bf8afa253dfd985e4':
More consistent use of 64-bit build variable.
Deepanshu Gupta [Wed, 9 Jul 2014 12:23:47 +0000 (12:23 +0000)]
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 '
75cdce7bd6f821eb4103f496fcd3cfbf82c66269':
Integrate build_font.py [DO NOT MERGE]
smain@google.com [Wed, 9 Jul 2014 12:23:46 +0000 (12:23 +0000)]
am
afb83c6b: (-s ours) am
62cf72b0: am
60d43dde: (-s ours) am
97539b1c: DO NOT MERGE revise butter bar message for clarity
* commit '
afb83c6b3ca9935f7ad89a549105b27fb40f5fdb':
DO NOT MERGE revise butter bar message for clarity
Brian Carlstrom [Wed, 9 Jul 2014 12:21:56 +0000 (12:21 +0000)]
am
02a5b517: Merge "Make dex2oat heap size product configurable [build]"
* commit '
02a5b51798b06434b08ffe2f6e6c485e73cd42bc':
Make dex2oat heap size product configurable [build]
Ying Wang [Wed, 9 Jul 2014 12:21:48 +0000 (12:21 +0000)]
am
bc7501e1: Merge "More consistent use of 64-bit build variable."
* commit '
bc7501e10324caf1318769901d8a382d46be0b60':
More consistent use of 64-bit build variable.
Ying Wang [Wed, 9 Jul 2014 05:11:06 +0000 (22:11 -0700)]
Copy over aidl info for modules not loaded by the current build
That way we don't lose the record if user is running mm/mmm.
Change-Id: I1e1a8b99b4f659b73f73d89f409a24aa36464066
Elliott Hughes [Wed, 9 Jul 2014 01:28:20 +0000 (01:28 +0000)]
am
a97f675c: am
1b1840cb: am
af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit '
a97f675c921efdbc34f33f12c9a523fc898e624f':
ADBS now uses stack_core code to parse traces.
Deepanshu Gupta [Wed, 9 Jul 2014 00:01:57 +0000 (00:01 +0000)]
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 '
f0200e87547272a33e147f435fbae384ea82b359':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:58:18 +0000 (23:58 +0000)]
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 '
721462210a5713e9bc59ed292a8bbea9c433a1c1':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:54:07 +0000 (23:54 +0000)]
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 '
0b3aa00eaf7a836770681f69c096e915cd686dd9':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:48:54 +0000 (23:48 +0000)]
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 '
da1119642d5a3eb4fd34459ef88d6e1cfbecd1da':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:44:34 +0000 (23:44 +0000)]
am
d23dcdf1: am
a0130a4d: am
9915a60c: (-s ours) am
1bb64302: am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
d23dcdf135541f2c4d7e61b1f02a04fe6b0bac48':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:40:06 +0000 (23:40 +0000)]
am
a0130a4d: am
9915a60c: (-s ours) am
1bb64302: am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
a0130a4d6fea1b0b256c5a5ad11886f9291a4c0a':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:38:28 +0000 (23:38 +0000)]
am
98da9070: am
307a8ec9: am
8eaddc6c: am
071a2f83: (-s ours) am
ea2f4e3c: am
daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '
98da90707f1c5fdec61b75196d593b56ec6f4c79':
Integrate build_font.py [DO NOT MERGE]
smain@google.com [Tue, 8 Jul 2014 23:38:27 +0000 (23:38 +0000)]
am
62cf72b0: am
60d43dde: (-s ours) am
97539b1c: DO NOT MERGE revise butter bar message for clarity
* commit '
62cf72b03fe2888b2dd80442ad4ec9851ddc431c':
DO NOT MERGE revise butter bar message for clarity
Deepanshu Gupta [Tue, 8 Jul 2014 23:35:01 +0000 (23:35 +0000)]
am
9915a60c: (-s ours) am
1bb64302: am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
9915a60c5d1a003f45455930e2a55033d6e15f3f':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:34:10 +0000 (23:34 +0000)]
am
307a8ec9: am
8eaddc6c: am
071a2f83: (-s ours) am
ea2f4e3c: am
daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '
307a8ec96132dc3d6859a5e1cf338b0dc9c25273':
Integrate build_font.py [DO NOT MERGE]
smain@google.com [Tue, 8 Jul 2014 23:34:10 +0000 (23:34 +0000)]
am
60d43dde: (-s ours) am
97539b1c: DO NOT MERGE revise butter bar message for clarity
* commit '
60d43ddecf8f582348685f4bfc5cd980dca9a1ba':
DO NOT MERGE revise butter bar message for clarity
Deepanshu Gupta [Tue, 8 Jul 2014 23:28:45 +0000 (23:28 +0000)]
am
8eaddc6c: am
071a2f83: (-s ours) am
ea2f4e3c: am
daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '
8eaddc6cac7f10e434dcdd4efc119e363353e8a8':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:26:18 +0000 (23:26 +0000)]
am
1bb64302: am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
1bb64302ad23e9edea50b09c673f59f681e4f47a':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:24:17 +0000 (23:24 +0000)]
am
071a2f83: (-s ours) am
ea2f4e3c: am
daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '
071a2f8363e32fd99da8c03e03dc8f7a9a5378c2':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:21:36 +0000 (23:21 +0000)]
am
1699a434: am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
1699a434a669a70e8696c5e110cacaf0725a68c0':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:19:48 +0000 (23:19 +0000)]
am
ea2f4e3c: am
daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '
ea2f4e3cbbf21531d00ba966ca5863bb575c0cf4':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:17:25 +0000 (23:17 +0000)]
am
075f7751: Integrate build_font.py [DO NOT MERGE]
* commit '
075f7751faaa37394c8f24d0ed840edd0640a9e3':
Integrate build_font.py [DO NOT MERGE]
Deepanshu Gupta [Tue, 8 Jul 2014 23:15:47 +0000 (23:15 +0000)]
am
daee7822: Integrate build_font.py [DO NOT MERGE]
* commit '
daee78227c9156704cce134f62f3e88416728652':
Integrate build_font.py [DO NOT MERGE]
Brian Carlstrom [Wed, 9 Jul 2014 04:07:43 +0000 (04:07 +0000)]
Merge "Make dex2oat heap size product configurable [build]"
Ying Wang [Wed, 9 Jul 2014 01:06:23 +0000 (01:06 +0000)]
Merge "More consistent use of 64-bit build variable."
Ying Wang [Wed, 9 Jul 2014 00:07:36 +0000 (17:07 -0700)]
More consistent use of 64-bit build variable.
Set up TARGET_IS_64_BIT and HOST_IS_64_BIT early so we don't need 2
mechanisms to judge if it's 64-bit build;
Remove the unnecessary 32-bit host variables.
Change-Id: I08d6d4d9ea70f91135fe2ee05463fb9a0d1cee42
Elliott Hughes [Tue, 8 Jul 2014 20:15:39 +0000 (20:15 +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.
Elliott Hughes [Tue, 8 Jul 2014 20:12:20 +0000 (20:12 +0000)]
am
af95db03: Merge "ADBS now uses stack_core code to parse traces."
* commit '
af95db033de4808826fde12772a6d33a72dda608':
ADBS now uses stack_core code to parse traces.
Dan Albert [Tue, 8 Jul 2014 18:59:48 +0000 (18:59 +0000)]
am
8f73aeea: am
183f90f4: am
3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '
8f73aeea87f96d715ca2f39a35fd73986feecceb':
Remove -Bsymbolic from builds.
Dan Albert [Tue, 8 Jul 2014 18:55:55 +0000 (18:55 +0000)]
am
183f90f4: am
3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '
183f90f40ce9e0fafa563dfaf1fb4450cb98168c':
Remove -Bsymbolic from builds.
Dan Albert [Tue, 8 Jul 2014 18:51:44 +0000 (18:51 +0000)]
am
3ffcf184: Merge "Remove -Bsymbolic from builds."
* commit '
3ffcf184bcb61bad78f3e503ca1760e64e4d30bb':
Remove -Bsymbolic from builds.
Brian Carlstrom [Tue, 8 Jul 2014 17:35:29 +0000 (10:35 -0700)]
Make dex2oat heap size product configurable [build]
Bug:
15919420
Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45
Dan Albert [Tue, 8 Jul 2014 18:47:16 +0000 (18:47 +0000)]
Merge "Remove -Bsymbolic from builds."
Joe LaPenna [Tue, 8 Jul 2014 20:30:34 +0000 (20:30 +0000)]
Merge "CW on Master: Add wifi-service to core_tiny"
Joe LaPenna [Sat, 5 Jul 2014 08:39:24 +0000 (01:39 -0700)]
CW on Master: Add wifi-service to core_tiny
BUG:
15143878
Change-Id: Idd31188456fa5cf9622f2ff754157286b3de97d1
Ying Wang [Tue, 8 Jul 2014 01:38:44 +0000 (01:38 +0000)]
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.
Ying Wang [Tue, 8 Jul 2014 00:48:55 +0000 (00:48 +0000)]
am
cd02c025: am
979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '
cd02c025ad6b0647d612c4b939df8e5de55f5192':
Fix host java doc by referring to the correct classpath.
Ying Wang [Tue, 8 Jul 2014 00:43:42 +0000 (00:43 +0000)]
am
979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '
979d578ee40c0a7d3e25915049350a23165f7a5a':
Fix host java doc by referring to the correct classpath.
Ying Wang [Tue, 8 Jul 2014 00:31:00 +0000 (00:31 +0000)]
am
1c00c702: am
45322890: am
d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '
1c00c7026c23967ca33524356dc11d9885f960f9':
Clean the last bit of LOCAL_BUILD_HOST_DEX.
Ying Wang [Tue, 8 Jul 2014 00:26:10 +0000 (00:26 +0000)]
am
45322890: am
d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '
45322890266c1d704b130fabd7ee5bab5db35997':
Clean the last bit of LOCAL_BUILD_HOST_DEX.
Ying Wang [Tue, 8 Jul 2014 00:22:13 +0000 (00:22 +0000)]
am
d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
* commit '
d2aa51b8aee454baf96d8ac6d1997dd9450ae974':
Clean the last bit of LOCAL_BUILD_HOST_DEX.
Ying Wang [Mon, 7 Jul 2014 22:01:15 +0000 (15:01 -0700)]
Auto-clean obsolete aidl-generated Java files.
The build system compares aidl files of every module to the previous
build and deletes the intermediate generated source dir if an aidl file
has gone.
Change-Id: I55fcfe1baaae3496613e12c20bca564d408bba58
Elliott Hughes [Tue, 8 Jul 2014 20:06:09 +0000 (20:06 +0000)]
Merge "ADBS now uses stack_core code to parse traces."
Brigid Smith [Tue, 1 Jul 2014 00:21:27 +0000 (17:21 -0700)]
ADBS now uses stack_core code to parse traces.
Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6