OSDN Git Service
Dirk Dougherty [Sat, 27 Sep 2014 05:20:41 +0000 (05:20 +0000)]
am
11451e2e: am
83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '
11451e2ec160b0405528b2ba6c13b40b15df8ed1':
Doc change: increment queryparam to trigger cache flush on proxies.
Dirk Dougherty [Sat, 27 Sep 2014 05:14:16 +0000 (05:14 +0000)]
am
83fadade: Doc change: increment queryparam to trigger cache flush on proxies.
* commit '
83fadade5bbc43914059405c1e49dd112e66d28d':
Doc change: increment queryparam to trigger cache flush on proxies.
Dirk Dougherty [Fri, 26 Sep 2014 22:00:55 +0000 (15:00 -0700)]
Doc change: increment queryparam to trigger cache flush on proxies.
Change-Id: I0ffbcc48761e697340e0c4a721893b33a085a137
Mark Renouf [Wed, 10 Sep 2014 01:42:21 +0000 (01:42 +0000)]
am
99332f11: Allow for opt-in of proguard shrinking of tests with new flag
* commit '
99332f11c5cdf1e58eb056c019d3ca8b1e3f034a':
Allow for opt-in of proguard shrinking of tests with new flag
Mark Renouf [Wed, 10 Sep 2014 00:08:46 +0000 (20:08 -0400)]
Allow for opt-in of proguard shrinking of tests with new flag
By adding 'shrinktests' to LOCAL_PROGUARD_ENABLED, the -dontshrink
flag will be omitted from the resulting proguard config allowing
tests to have unnecessary classes removed before dexxing.
Clockwork is running into 64k method limits on some tests which
depend on GmsCore. On 4.4W (klp-modular-dev) we don't have the
option for multi-dex so proguard is the only solution here.
This change leaves the default behavior unchanged. Shrinking is
still disabled for tests by default unless the 'shrinktests'
flag is set in the Makefile.
Change-Id: Ib586ae9e7f617072b41e95742559bf7c8a6a6ce1
Baligh Uddin [Sat, 6 Sep 2014 02:47:04 +0000 (02:47 +0000)]
am
4f3d3147: Merge "Add java_args as a valid option" into klp-modular-dev
* commit '
4f3d31479d5e4e8d35e60de628417cb820d69f5e':
Add java_args as a valid option
Baligh Uddin [Sat, 6 Sep 2014 02:47:02 +0000 (02:47 +0000)]
am
1131d89b: Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools
* commit '
1131d89b426d7da401885d37a50a908c9f87d2a1':
Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools
Baligh Uddin [Sat, 6 Sep 2014 02:19:36 +0000 (02:19 +0000)]
Merge "Add java_args as a valid option" into klp-modular-dev
Baligh Uddin [Sat, 6 Sep 2014 00:36:20 +0000 (17:36 -0700)]
Add java_args as a valid option
Bug:
17393134
Change-Id: If2749d03b5d409a08d415a829dd21f986cac1789
(cherry picked from commit
bdc2e3186fc4ab22b9249d8e1b317a024e295c7f)
Baligh Uddin [Fri, 5 Sep 2014 18:18:07 +0000 (11:18 -0700)]
Add jvm args option. I rather not hardcode some large value just for Volantis. This can easily be passed in from sign-build.sh and should be a no-op for any other tools
Bug:
17393134
Change-Id: Ic2325d7c1e1e7292c9339e169efbed526f82263c
(cherry picked from commit
339ee4968a26d3a795ecfcd798c6e2d7b01d81d9)
Ricardo Cervera [Wed, 27 Aug 2014 16:16:15 +0000 (16:16 +0000)]
am
14d6c100: am
54d2ca33: docs: Changing adt bundle links to HTTPS
* commit '
14d6c100aa1926ec9e24c1f17e3aabba95141503':
docs: Changing adt bundle links to HTTPS
Ricardo Cervera [Wed, 27 Aug 2014 16:10:44 +0000 (16:10 +0000)]
am
54d2ca33: docs: Changing adt bundle links to HTTPS
* commit '
54d2ca33a3ccf2716cb80f8cfa990adff6935c39':
docs: Changing adt bundle links to HTTPS
Ricardo Cervera [Wed, 27 Aug 2014 15:48:49 +0000 (08:48 -0700)]
docs: Changing adt bundle links to HTTPS
Change-Id: I35c291bfef9a267aab5b8f108a6c6592c4f08750
Ying Wang [Sat, 16 Aug 2014 06:09:14 +0000 (06:09 +0000)]
Ying Wang [Sat, 16 Aug 2014 06:01:13 +0000 (06:01 +0000)]
Ying Wang [Sat, 16 Aug 2014 05:56:06 +0000 (05:56 +0000)]
am
f7115dbe: am
2888b790: am
c48566fb: am
48b4f2b4: am
ed7bdb8f: am
6d1f2c64: am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
f7115dbe3cbf2fc25e5d507517e6ca4dd1ce5dc9':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 05:52:42 +0000 (05:52 +0000)]
am
2888b790: am
c48566fb: am
48b4f2b4: am
ed7bdb8f: am
6d1f2c64: am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
2888b790852af988331be1d59af01d242012f7e4':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 05:18:20 +0000 (05:18 +0000)]
am
c48566fb: am
48b4f2b4: am
ed7bdb8f: am
6d1f2c64: am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
c48566fb6129c979186d919dcd55d7c682cf46a3':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 05:09:26 +0000 (05:09 +0000)]
am
48b4f2b4: am
ed7bdb8f: am
6d1f2c64: am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
48b4f2b476b660977d1d2179d12efb933f187efb':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:55:50 +0000 (00:55 +0000)]
am
ed7bdb8f: am
6d1f2c64: am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
ed7bdb8f48e6388f780da824be054fcc3c103523':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:48:31 +0000 (00:48 +0000)]
am
6d1f2c64: am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
6d1f2c647b68767880cb006df02fa9191d763e42':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:45:10 +0000 (00:45 +0000)]
am
6afa19ab: am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
6afa19abfcce434f15ba2aa87e7dcbc53b66b402':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:39:04 +0000 (00:39 +0000)]
am
40e0cfd3: am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
40e0cfd31ccb46465ee510e7b7dac66c0b8be827':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:35:42 +0000 (00:35 +0000)]
am
a5bb9a73: am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
a5bb9a73cfb2cbc4a592ae45645c8440e169c746':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:29:58 +0000 (00:29 +0000)]
am
66c28d86: am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
66c28d86a47ed284492ffbe6a59d30bf201198cd':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:23:56 +0000 (00:23 +0000)]
am
042e3b75: am
a65eb8c7: Split to multiple bash commands.
* commit '
042e3b75b4847f675848203f91396a1740579d69':
Split to multiple bash commands.
Ying Wang [Sat, 16 Aug 2014 00:20:19 +0000 (00:20 +0000)]
am
a65eb8c7: Split to multiple bash commands.
* commit '
a65eb8c7899751f91fd34824f755fa4708cde30b':
Split to multiple bash commands.
Ying Wang [Fri, 26 Oct 2012 16:21:28 +0000 (09:21 -0700)]
Split to multiple bash commands.
This can fix the error "/bin/bash: Argument list too long", if we get a
really long apk list.
Link: http://code.google.com/p/android/issues/detail?id=38937
(cherry picked from commit
d9a88d585f162c5b99c5c6f995c0400fc616bd26)
Change-Id: I80cd07cf50cc2b04e4b6aa9d5ecb1faf80d4cb5c
Ying Wang [Fri, 15 Aug 2014 23:48:21 +0000 (23:48 +0000)]
am
989cdde7: am
39ddf5fc: am
e3999d7d: am
9aafe186: am
9ec5c4d6: am
9b7a2912: am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
989cdde7f4197521f8b74432e80f0eb492532cae':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:41:49 +0000 (23:41 +0000)]
am
39ddf5fc: am
e3999d7d: am
9aafe186: am
9ec5c4d6: am
9b7a2912: am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
39ddf5fc79f01c774407468631da2249bad4e904':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:36:32 +0000 (23:36 +0000)]
am
e3999d7d: am
9aafe186: am
9ec5c4d6: am
9b7a2912: am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
e3999d7d1ee7c891e3ee7f6108545aa183e22b1c':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:30:29 +0000 (23:30 +0000)]
am
9aafe186: am
9ec5c4d6: am
9b7a2912: am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
9aafe1861b269b32fdc6a42207a2197ddc38665d':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:22:46 +0000 (23:22 +0000)]
am
9ec5c4d6: am
9b7a2912: am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
9ec5c4d6f0fc9ef4b3285463175e5c8ff65b2bb3':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:16:35 +0000 (23:16 +0000)]
am
9b7a2912: am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
9b7a2912e77d9397cf8b2b5218d34c20995586f5':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:10:07 +0000 (23:10 +0000)]
am
d86851e1: am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
d86851e11937bfebbfe42d1bb8b5e7526233781f':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 23:03:22 +0000 (23:03 +0000)]
am
f412865c: am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
f412865c322e045606c2b354a4e20b8aaf5c5efa':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 22:59:26 +0000 (22:59 +0000)]
am
ff71c499: am
2ff73494: Split to multiple bash commands.
* commit '
ff71c49950682d31c5df9f9b979cc942d32dab9c':
Split to multiple bash commands.
Ying Wang [Fri, 15 Aug 2014 22:53:33 +0000 (22:53 +0000)]
am
2ff73494: Split to multiple bash commands.
* commit '
2ff73494bcc20d5812fd65a996c4a67016dbd8e8':
Split to multiple bash commands.
Ying Wang [Fri, 26 Oct 2012 16:21:28 +0000 (09:21 -0700)]
Split to multiple bash commands.
This can fix the error "/bin/bash: Argument list too long", if we get a
really long apk list.
Link: http://code.google.com/p/android/issues/detail?id=38937
(cherry picked from commit
d9a88d585f162c5b99c5c6f995c0400fc616bd26)
Change-Id: I80cd07cf50cc2b04e4b6aa9d5ecb1faf80d4cb5c
Justin Koh [Tue, 12 Aug 2014 23:14:33 +0000 (23:14 +0000)]
am
e2ff12bf: DO NOT MERGE Bump version string.
* commit '
e2ff12bf2a6892ec56676b6a845a02e81b372e8c':
DO NOT MERGE Bump version string.
Justin Koh [Tue, 12 Aug 2014 20:55:57 +0000 (13:55 -0700)]
DO NOT MERGE Bump version string.
Bump version string for KKWT MR0
Bug:
16982332
Change-Id: I8636169362ec45891257c39fb47574a6e021a3f0
Ed Heyl [Fri, 18 Jul 2014 18:38:24 +0000 (18:38 +0000)]
am
6190a0c3: back port
cc6be0a3: wrap make. do not merge
* commit '
6190a0c3b33ea43639a7e748182fbac62560a09d':
back port
cc6be0a3: wrap make. do not merge
Ed Heyl [Fri, 18 Jul 2014 17:53:54 +0000 (10:53 -0700)]
back port
cc6be0a3: wrap make. do not merge
Bug:
16368823 | Lunch sets $out with extra text
Change-Id: I2a1d422865a073cd30e86f1e20b4d99a3747cc0b
David Friedman [Wed, 16 Jul 2014 13:29:09 +0000 (13:29 +0000)]
am
81415ada: Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
* commit '
81415adad38fe06f50f381d6317ca0b93848e095':
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
David Friedman [Tue, 15 Jul 2014 18:38:40 +0000 (11:38 -0700)]
Updated .cs page to accommodate split of NDK into 32- and 64-bit packages.
Change-Id: I33af76d23035067ed740d2bf734708aca8dcffe2
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
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
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.
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.
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: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."
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: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.
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
Ying Wang [Wed, 2 Jul 2014 21:26:49 +0000 (14:26 -0700)]
[DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.
Change-Id: I8042b045f20b870de84ea7c4c060c3cbe1cdfe69
Ying Wang [Tue, 8 Jul 2014 00:39:35 +0000 (00:39 +0000)]
Merge "Fix host java doc by referring to the correct classpath."
Ying Wang [Mon, 7 Jul 2014 23:43:49 +0000 (16:43 -0700)]
Fix host java doc by referring to the correct classpath.
In droiddoc for host, we don't generate classes.jar for
LOCAL_JAVA_LIBRARIES. Switch to refer to the installed jar file instead.
This is consistent with how LOCAL_JAVA_LIBRARIES for host is handled in
base_rules.mk.
Bug:
9176318
Change-Id: If7460b30ca5da28743487d66da0029a44108d556
Ying Wang [Tue, 8 Jul 2014 00:17:31 +0000 (00:17 +0000)]
Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
Ying Wang [Tue, 8 Jul 2014 00:15:38 +0000 (17:15 -0700)]
Clean the last bit of LOCAL_BUILD_HOST_DEX.
Long live LOCAL_BUILD_HOST_DEX!
Change-Id: I8de23cfc78edc554606a2e1a8a955e8bc3ad02b0
Brian Carlstrom [Wed, 2 Jul 2014 16:44:19 +0000 (16:44 +0000)]
am
97609d7f: am
7b53bca0: Merge "Strip all multidex files, not just classes.dex"
* commit '
97609d7f0b0a9d944e1de8b85c150d2e1772c8cb':
Strip all multidex files, not just classes.dex