Elliott Hughes
a97f675c92
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.
2014-07-08 20:15:39 +00:00
Elliott Hughes
1b1840cbef
am af95db03: Merge "ADBS now uses stack_core code to parse traces."
...
* commit 'af95db033de4808826fde12772a6d33a72dda608':
ADBS now uses stack_core code to parse traces.
2014-07-08 20:12:20 +00:00
Dan Albert
8f73aeea87
am 183f90f4: am 3ffcf184: Merge "Remove -Bsymbolic from builds."
...
* commit '183f90f40ce9e0fafa563dfaf1fb4450cb98168c':
Remove -Bsymbolic from builds.
2014-07-08 18:55:55 +00:00
Dan Albert
183f90f40c
am 3ffcf184: Merge "Remove -Bsymbolic from builds."
...
* commit '3ffcf184bcb61bad78f3e503ca1760e64e4d30bb':
Remove -Bsymbolic from builds.
2014-07-08 18:51:44 +00:00
Dan Albert
3ffcf184bc
Merge "Remove -Bsymbolic from builds."
2014-07-08 18:09:01 +00:00
Ying Wang
9e00b6385c
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.
2014-07-08 00:48:55 +00:00
Ying Wang
cd02c025ad
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.
2014-07-08 00:43:42 +00:00
Ying Wang
1c00c7026c
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.
2014-07-08 00:26:10 +00:00
Ying Wang
4532289026
am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
...
* commit 'd2aa51b8aee454baf96d8ac6d1997dd9450ae974':
Clean the last bit of LOCAL_BUILD_HOST_DEX.
2014-07-08 00:22:13 +00:00
Elliott Hughes
af95db033d
Merge "ADBS now uses stack_core code to parse traces."
2014-07-07 18:07:41 +00:00
Brigid Smith
90c66cff3a
ADBS now uses stack_core code to parse traces.
...
Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6
2014-07-07 15:14:41 -07:00
Ying Wang
e68ec71903
[DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.
...
Change-Id: I8042b045f20b870de84ea7c4c060c3cbe1cdfe69
2014-07-02 14:26:49 -07:00
Ying Wang
979d578ee4
Merge "Fix host java doc by referring to the correct classpath."
2014-07-02 20:59:15 +00:00
Ying Wang
ad7809bba4
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
2014-07-07 16:50:39 -07:00
Ying Wang
d2aa51b8ae
Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX."
2014-07-02 20:49:53 +00:00
Ying Wang
f25318a5f9
Clean the last bit of LOCAL_BUILD_HOST_DEX.
...
Long live LOCAL_BUILD_HOST_DEX!
Change-Id: I8de23cfc78edc554606a2e1a8a955e8bc3ad02b0
2014-07-07 17:15:38 -07:00
Brian Carlstrom
3be473bdb5
am 97609d7f: am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"
...
* commit '97609d7f0b0a9d944e1de8b85c150d2e1772c8cb':
Strip all multidex files, not just classes.dex
2014-07-02 16:44:19 +00:00
Brian Carlstrom
97609d7f0b
am 7b53bca0: Merge "Strip all multidex files, not just classes.dex"
...
* commit '7b53bca0b925bc9f47b51afba14c3c8f064eae81':
Strip all multidex files, not just classes.dex
2014-07-02 16:39:23 +00:00
Ying Wang
51f01f643f
am bf0a9c4a: am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"
...
* commit 'bf0a9c4ac842f340f4d995205999ed472b124f17':
Fix partition_tag usage in install_jni_libs
2014-07-02 16:20:40 +00:00
Ying Wang
bf0a9c4ac8
am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs"
...
* commit 'cc80f5a1ff4a8b751e36b7d1d5a3670f6ec12ba0':
Fix partition_tag usage in install_jni_libs
2014-07-02 16:15:35 +00:00
Ying Wang
cc80f5a1ff
Merge "Fix partition_tag usage in install_jni_libs"
2014-07-02 05:05:51 +00:00
Dan Willemsen
731322a90d
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
2014-07-01 18:56:31 -07:00
Brian Carlstrom
7b53bca0b9
Merge "Strip all multidex files, not just classes.dex"
2014-07-01 23:33:34 +00:00
Brian Carlstrom
fca814550c
Strip all multidex files, not just classes.dex
...
Bug: 10447095
Change-Id: I6053ca97cb0e28621262a385d57c0996e7c1aaab
2014-07-01 23:04:36 -07:00
Ying Wang
0d0b7b3669
am 2530c787: am 4b539d15: Merge "More consistent host library path in multilib build."
...
* commit '2530c787db272bfb4afab80e37323b9b7d00671c':
More consistent host library path in multilib build.
2014-07-01 00:28:14 +00:00
Ying Wang
2530c787db
am 4b539d15: Merge "More consistent host library path in multilib build."
...
* commit '4b539d1533a5d8647e5f54b0a41b2a49d7f4c785':
More consistent host library path in multilib build.
2014-07-01 00:22:30 +00:00
Elliott Hughes
3a2f6ecf3f
am 491871aa: am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
...
* commit '491871aa03b6a6b4d4f1d6ebb7e2f4dc746b4d4b':
Add -Wl,--fatal-warnings to x86_64.
2014-06-30 22:59:37 +00:00
Elliott Hughes
491871aa03
am 4b7ba417: Merge "Add -Wl,--fatal-warnings to x86_64."
...
* commit '4b7ba41704a8f028ffdf9f2c8bff57d9d4055f93':
Add -Wl,--fatal-warnings to x86_64.
2014-06-30 22:53:49 +00:00
Ying Wang
4b539d1533
Merge "More consistent host library path in multilib build."
2014-06-30 22:29:38 +00:00
Ying Wang
36ef50f2a2
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
2014-06-30 17:06:21 -07:00
Ying Wang
9327f77a01
am ccbf5930: am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs."
...
* commit 'ccbf59304645dde557e24e7a8dd1440111d1a3ce':
Fix missing rs_compatibility_jni_libs.
2014-06-30 18:30:46 +00:00
Ying Wang
ccbf593046
am 51254e6c: Merge "Fix missing rs_compatibility_jni_libs."
...
* commit '51254e6c6065c0c771886472853e6dbc5377c6ae':
Fix missing rs_compatibility_jni_libs.
2014-06-30 18:25:37 +00:00
Ying Wang
556efe002f
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.
2014-06-30 17:36:39 +00:00
Ying Wang
9e05c9e4e6
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.
2014-06-30 17:32:05 +00:00
Ian Rogers
da92aef762
am 8625b6e7: am 7634e413: Merge "Host support for prefer symlink"
...
* commit '8625b6e74ae33db8ce7d18c131ba3d87f121d1f3':
Host support for prefer symlink
2014-06-28 00:36:10 +00:00
Ian Rogers
8625b6e74a
am 7634e413: Merge "Host support for prefer symlink"
...
* commit '7634e4136fee6c7a02f4a343072400ba575c0051':
Host support for prefer symlink
2014-06-28 00:30:43 +00:00
Ying Wang
51254e6c60
Merge "Fix missing rs_compatibility_jni_libs."
2014-06-27 16:59:53 +00:00
Ying Wang
efe7779cfb
Fix missing rs_compatibility_jni_libs.
...
Bug: 15935150
Change-Id: I2971bcf4a9fa96e7a5098a759ecc67ba4f565b6c
2014-06-30 11:20:41 -07:00
Ying Wang
dc58c2a6c2
Merge "Remove nonexistent $ANDROID_QTOOLS from $PATH."
2014-06-27 16:59:53 +00:00
Ying Wang
2a859d5a62
Remove nonexistent $ANDROID_QTOOLS from $PATH.
...
Bug: 15983070
Change-Id: Id3807a6dabd616ae06aafc2b894c1858e4400e26
2014-06-30 10:25:33 -07:00
Ian Rogers
7634e4136f
Merge "Host support for prefer symlink"
2014-06-27 16:59:53 +00:00
Ian Rogers
cf331d931d
Host support for prefer symlink
...
We need a host symlink for dalvik, our *-dalvik-host build targets
are failing.
Change-Id: I6045de20c948b456a150033deb3459895aff83c6
2014-06-27 17:23:03 -07:00
Ying Wang
7a6a9a5582
am 4bdbd6d4: am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
...
* commit '4bdbd6d4346a246df8edaf9323e15d84a1f35951':
Add --pseudo-localize aapt parameter for builds.
2014-06-27 16:19:26 +00:00
Ying Wang
4bdbd6d434
am e1b43254: Merge "Add --pseudo-localize aapt parameter for builds."
...
* commit 'e1b43254b72613e6bf9ac994c1b3f07e0020ed9c':
Add --pseudo-localize aapt parameter for builds.
2014-06-27 16:14:30 +00:00
Dirk Dougherty
80b97e1c19
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.
2014-06-26 21:09:09 +00:00
Dirk Dougherty
236738439a
Doc change: add query param to force refresh in proxy caches.
...
Change-Id: I7bbec536bba7878ef9b5fdc91a25a47437e276ed
2014-06-26 13:07:57 -07:00
Elliott Hughes
4b7ba41704
Merge "Add -Wl,--fatal-warnings to x86_64."
2014-06-26 18:33:52 +00:00
Elliott Hughes
3beb51692e
Add -Wl,--fatal-warnings to x86_64.
...
Bug: 11358761
Change-Id: I0c86a2ce3f95e89cc6c6eed65f3595922a90f45f
2014-06-30 14:52:30 -07:00
Ying Wang
e1b43254b7
Merge "Add --pseudo-localize aapt parameter for builds."
2014-06-26 18:33:52 +00:00
Igor Viarheichyk
c4dfe6ef30
Add --pseudo-localize aapt parameter for builds.
...
Some packages can override list of locales with
LOCAL_AAPT_INCLUDE_ALL_RESOURCES parameter, disabling
pseudolocalization. Adding new --pseudo-localize flag to
aapt if pseudo-locales are specified in product locales
list solves this issue.
Change-Id: Iae705d4fe99453650339fd1ca65d1005671b3e4f
2014-06-26 17:27:36 -07:00