OSDN Git Service
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':
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
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.
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.
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)]
Ying Wang [Fri, 11 Jul 2014 17:32:53 +0000 (17:32 +0000)]
am
c44f69a3: am
9e00b638: am
cd02c025: am
979d578e: Merge "Fix host java doc by referring to the correct classpath."
* commit '
c44f69a38f76415d3f11fe7c3331ea7515fb479d':
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
Raph Levien [Fri, 11 Jul 2014 14:52:22 +0000 (14:52 +0000)]
Merge "Add Zopfli-recompress option to zipalign"
Geremy Condra [Thu, 10 Jul 2014 23:35:32 +0000 (23:35 +0000)]
Merge "Add support for signed boot images."
Geremy Condra [Wed, 9 Jul 2014 03:07:41 +0000 (20:07 -0700)]
Add support for signed boot images.
Geremy Condra [Thu, 10 Jul 2014 21:39:17 +0000 (21:39 +0000)]
Merge "Revert "Add support for signed boot images.""
Geremy Condra [Thu, 10 Jul 2014 21:29:24 +0000 (21:29 +0000)]
Revert "Add support for signed boot images."
This reverts commit
7e2c5ed84f59c4f19e2baa02733e85006292156e.
Change-Id: Id90e3b2d986fac3ac9b2748194747af712ac4ab1
Geremy Condra [Wed, 9 Jul 2014 03:07:41 +0000 (20:07 -0700)]
Add support for signed boot images.
Change-Id: Ib08fc700f626d838efa9a543316afbcd4b782525
Geremy Condra [Thu, 10 Jul 2014 19:32:39 +0000 (19:32 +0000)]
Merge "Add support for signed boot images."
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]
OSDN Git Service
