OSDN Git Service
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
Brian Carlstrom [Wed, 2 Jul 2014 16:39:23 +0000 (16:39 +0000)]
am
7b53bca0: Merge "Strip all multidex files, not just classes.dex"
* commit '
7b53bca0b925bc9f47b51afba14c3c8f064eae81':
Strip all multidex files, not just classes.dex
Ying Wang [Wed, 2 Jul 2014 16:20:40 +0000 (16:20 +0000)]
am
bf0a9c4a: am
cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"
* commit '
bf0a9c4ac842f340f4d995205999ed472b124f17':
Fix partition_tag usage in install_jni_libs
Ying Wang [Wed, 2 Jul 2014 16:15:35 +0000 (16:15 +0000)]
am
cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"
* commit '
cc80f5a1ff4a8b751e36b7d1d5a3670f6ec12ba0':
Fix partition_tag usage in install_jni_libs
Ying Wang [Wed, 2 Jul 2014 16:12:10 +0000 (16:12 +0000)]
Merge "Fix partition_tag usage in install_jni_libs"
Dan Willemsen [Wed, 2 Jul 2014 01:56:31 +0000 (18:56 -0700)]
Fix partition_tag usage in install_jni_libs
This was expanding to TARGET_VENDOR_OUT_SHARED_LIBRARIES which was
empty. It should be expanding to TARGET_OUT_VENDOR_SHARED_LIBRARIES.
Change-Id: I32fe22e3e0b91a6d41f6a09a33d3ce2e4061d078
Brian Carlstrom [Wed, 2 Jul 2014 16:35:53 +0000 (16:35 +0000)]
Merge "Strip all multidex files, not just classes.dex"
Brian Carlstrom [Mon, 30 Jun 2014 17:09:56 +0000 (10:09 -0700)]
Strip all multidex files, not just classes.dex
Bug:
10447095
Change-Id: I6053ca97cb0e28621262a385d57c0996e7c1aaab
Ying Wang [Tue, 1 Jul 2014 00:28:14 +0000 (00:28 +0000)]
am
2530c787: am
4b539d15: Merge "More consistent host library path in multilib build."
* commit '
2530c787db272bfb4afab80e37323b9b7d00671c':
More consistent host library path in multilib build.
Ying Wang [Tue, 1 Jul 2014 00:22:30 +0000 (00:22 +0000)]
am
4b539d15: Merge "More consistent host library path in multilib build."
* commit '
4b539d1533a5d8647e5f54b0a41b2a49d7f4c785':
More consistent host library path in multilib build.
Elliott Hughes [Mon, 30 Jun 2014 22:59:37 +0000 (22:59 +0000)]
am
491871aa: am
4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '
491871aa03b6a6b4d4f1d6ebb7e2f4dc746b4d4b':
Add -Wl,--fatal-warnings to x86_64.
Elliott Hughes [Mon, 30 Jun 2014 22:53:49 +0000 (22:53 +0000)]
am
4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
* commit '
4b7ba41704a8f028ffdf9f2c8bff57d9d4055f93':
Add -Wl,--fatal-warnings to x86_64.
Ying Wang [Tue, 1 Jul 2014 00:16:30 +0000 (00:16 +0000)]
Merge "More consistent host library path in multilib build."
Ying Wang [Tue, 1 Jul 2014 00:06:21 +0000 (17:06 -0700)]
More consistent host library path in multilib build.
In 64-bit multilib host build, changed from
32-bit lib: out/host/<platform>/lib32
64-bit lib: out/host/<platform>/lib
to
32-bit lib: out/host/<platform>/lib
64-bit lib: out/host/<platform>/lib64
.
That way the host library path is consistent with the multilib target
build's. Also with this change prebuilt 32-bit libraries can be reused
in 64-bit host build as 2nd arch binaries. (With previous setup, they
can't be used because they have rpath ../lib in it while the 2nd arch
library path needs ../lib32.
Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1
Ying Wang [Mon, 30 Jun 2014 18:30:46 +0000 (18:30 +0000)]
am
ccbf5930: am
51254e6c: Merge "Fix missing rs_compatibility_jni_libs."
* commit '
ccbf59304645dde557e24e7a8dd1440111d1a3ce':
Fix missing rs_compatibility_jni_libs.
Ying Wang [Mon, 30 Jun 2014 18:25:37 +0000 (18:25 +0000)]
am
51254e6c: Merge "Fix missing rs_compatibility_jni_libs."
* commit '
51254e6c6065c0c771886472853e6dbc5377c6ae':
Fix missing rs_compatibility_jni_libs.
Ying Wang [Mon, 30 Jun 2014 17:36:39 +0000 (17:36 +0000)]
am
9e05c9e4: am
dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.r
* commit '
9e05c9e4e642673dc6d9104c44d26810773c382d':
Remove nonexistent $ANDROID_QTOOLS from $PATH.
Ying Wang [Mon, 30 Jun 2014 17:32:05 +0000 (17:32 +0000)]
am
dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/usr/lib/google-golang/bin:/usr/local/buildtools/java/jdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/buildbot/automergers:/buildbot/automergers."
* commit '
dc58c2a6c216577110682521fa787fd9640cc89d':
Remove nonexistent $ANDROID_QTOOLS from $PATH.
Ian Rogers [Sat, 28 Jun 2014 00:36:10 +0000 (00:36 +0000)]
am
8625b6e7: am
7634e413: Merge "Host support for prefer symlink"
* commit '
8625b6e74ae33db8ce7d18c131ba3d87f121d1f3':
Host support for prefer symlink
Ian Rogers [Sat, 28 Jun 2014 00:30:43 +0000 (00:30 +0000)]
am
7634e413: Merge "Host support for prefer symlink"
* commit '
7634e4136fee6c7a02f4a343072400ba575c0051':
Host support for prefer symlink
Ying Wang [Mon, 30 Jun 2014 18:21:22 +0000 (18:21 +0000)]
Merge "Fix missing rs_compatibility_jni_libs."
Ying Wang [Mon, 30 Jun 2014 18:17:16 +0000 (11:17 -0700)]
Fix missing rs_compatibility_jni_libs.
Bug:
15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
Ying Wang [Mon, 30 Jun 2014 17:27:07 +0000 (17:27 +0000)]
Merge "Remove nonexistent $ANDROID_QTOOLS from $PATH."
Ying Wang [Mon, 30 Jun 2014 17:25:33 +0000 (10:25 -0700)]
Remove nonexistent $ANDROID_QTOOLS from $PATH.
Bug:
15983070
Change-Id: Id3807a6dabd616ae06aafc2b894c1858e4400e26
Ian Rogers [Sat, 28 Jun 2014 00:26:33 +0000 (00:26 +0000)]
Merge "Host support for prefer symlink"
Ian Rogers [Wed, 25 Jun 2014 07:04:30 +0000 (00:04 -0700)]
Host support for prefer symlink
We need a host symlink for dalvik, our *-dalvik-host build targets
are failing.
Change-Id: I6045de20c948b456a150033deb3459895aff83c6
Ying Wang [Fri, 27 Jun 2014 16:19:26 +0000 (16:19 +0000)]
am
4bdbd6d4: am
e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
* commit '
4bdbd6d4346a246df8edaf9323e15d84a1f35951':
Add --pseudo-localize aapt parameter for builds.
Ying Wang [Fri, 27 Jun 2014 16:14:30 +0000 (16:14 +0000)]
am
e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
* commit '
e1b43254b72613e6bf9ac994c1b3f07e0020ed9c':
Add --pseudo-localize aapt parameter for builds.
Dirk Dougherty [Thu, 26 Jun 2014 21:09:09 +0000 (21:09 +0000)]
am
23673843: Doc change: add query param to force refresh in proxy caches.
* commit '
236738439acab7c9b2afc2725b44c4867597ed7f':
Doc change: add query param to force refresh in proxy caches.
OSDN Git Service
