OSDN Git Service
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.
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]
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.
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.
Dirk Dougherty [Thu, 26 Jun 2014 20:07:57 +0000 (13:07 -0700)]
Doc change: add query param to force refresh in proxy caches.
Change-Id: I7bbec536bba7878ef9b5fdc91a25a47437e276ed
Elliott Hughes [Mon, 30 Jun 2014 22:48:54 +0000 (22:48 +0000)]
Merge "Add -Wl,--fatal-warnings to x86_64."
Elliott Hughes [Mon, 30 Jun 2014 21:52:30 +0000 (14:52 -0700)]
Add -Wl,--fatal-warnings to x86_64.
Bug:
11358761
Change-Id: I0c86a2ce3f95e89cc6c6eed65f3595922a90f45f
Ying Wang [Fri, 27 Jun 2014 16:09:37 +0000 (16:09 +0000)]
Merge "Add --pseudo-localize aapt parameter for builds."
Igor Viarheichyk [Thu, 26 Jun 2014 21:56:21 +0000 (14:56 -0700)]
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
Robert Ly [Thu, 26 Jun 2014 09:50:21 +0000 (09:50 +0000)]
am
28d695a0: css changes for index page card
* commit '
28d695a0051af88d72cd025cdd3df01ae5fffed1':
css changes for index page card
Robert Ly [Thu, 26 Jun 2014 09:49:40 +0000 (09:49 +0000)]
am
a34ef028: Merge "docs: Updating download dir for ADT 23.0.0 links to new location" into klp-modular-dev
* commit '
a34ef028a00192877209281490a468c29cdacd40':
docs: Updating download dir for ADT 23.0.0 links to new location
Robert Ly [Wed, 25 Jun 2014 08:38:51 +0000 (01:38 -0700)]
css changes for index page card
Change-Id: I4fca8284acf50ad05bf9c06ada0daa636b3e9e6f
Ying Wang [Wed, 25 Jun 2014 23:03:02 +0000 (23:03 +0000)]
am
bb964f00: am
432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
* commit '
bb964f00403a23d2f1ec3313f7b579a9e7f0f12a':
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
Ying Wang [Wed, 25 Jun 2014 22:58:11 +0000 (22:58 +0000)]
am
432cd6dd: Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
* commit '
432cd6dd78afe9c23cd0ddf669e4f0f973a17a7c':
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
smain@google.com [Wed, 25 Jun 2014 22:23:02 +0000 (22:23 +0000)]
am
5771ee3c: add style for stand-alone back link with left arrow
* commit '
5771ee3c41afc7024ca8c76c7b8deef3798d0bcd':
add style for stand-alone back link with left arrow
smain@google.com [Wed, 25 Jun 2014 22:12:52 +0000 (15:12 -0700)]
add style for stand-alone back link with left arrow
Change-Id: Ia9219e3e77ef23c6bf6374244c57c4c7e8d1f386
smain@google.com [Wed, 25 Jun 2014 19:12:42 +0000 (19:12 +0000)]
am
bb9ecf42: undo the butterbar change, because automerger is ruthless
* commit '
bb9ecf420f136681a3bd4d5503207733b4dc283b':
undo the butterbar change, because automerger is ruthless
Ying Wang [Wed, 25 Jun 2014 18:46:34 +0000 (18:46 +0000)]
am
1a3d260f: am
e69d4350: Merge "Support to add JNI of both archs in multilib build."
* commit '
1a3d260f68755b476aa867477fc75d47ef5317bf':
Support to add JNI of both archs in multilib build.
Ying Wang [Wed, 25 Jun 2014 18:37:53 +0000 (18:37 +0000)]
am
e69d4350: Merge "Support to add JNI of both archs in multilib build."
* commit '
e69d4350cd4af04349b703ba169ba516a96913ba':
Support to add JNI of both archs in multilib build.
smain@google.com [Wed, 25 Jun 2014 17:52:35 +0000 (17:52 +0000)]
am
97539b1c: DO NOT MERGE revise butter bar message for clarity
* commit '
97539b1c8e70e772b256f574fb95481df901851e':
DO NOT MERGE revise butter bar message for clarity
Ying Wang [Wed, 25 Jun 2014 22:53:17 +0000 (22:53 +0000)]
Merge "Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build"
Ying Wang [Wed, 25 Jun 2014 20:23:58 +0000 (13:23 -0700)]
Allow LOCAL_RESOURCE_DIR pointing to dir generated during the build
Bug:
15850610
Change-Id: I46b98adb556d8e6bf166761f8bb240006dbe5b14
Ying Wang [Wed, 25 Jun 2014 18:33:51 +0000 (18:33 +0000)]
Merge "Support to add JNI of both archs in multilib build."
Ying Wang [Wed, 25 Jun 2014 03:01:52 +0000 (20:01 -0700)]
Support to add JNI of both archs in multilib build.
Use "LOCAL_MULTILIB := both" to install jni libraries of both archs in
multilib build.
The build system will package jni of both archs to the apk, or install
them to the right location on the system image and create symlinks,
extract .so files from prebuilt apk, etc if appropriate.
Bug:
15849902
Change-Id: I7e147b5a47db476584c38250de7b36c75ea40d81
smain@google.com [Wed, 25 Jun 2014 02:45:51 +0000 (19:45 -0700)]
DO NOT MERGE
revise butter bar message for clarity
Change-Id: I3672f5537425580758bc40c2c41d8a11ee2d22ee
smain@google.com [Wed, 25 Jun 2014 01:40:36 +0000 (18:40 -0700)]
undo the butterbar change, because automerger is ruthless
Change-Id: If9953c9c7af1250a26a74691d8aac58808595c85
Michael Wright [Wed, 25 Jun 2014 01:36:16 +0000 (01:36 +0000)]
am
e49d461a: am
b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
* commit '
e49d461a8f713e61ad39ba20b48d2b5fee7beafe':
Invoke debuggerd64 when appropriate with stacks.
Michael Wright [Wed, 25 Jun 2014 01:30:40 +0000 (01:30 +0000)]
am
b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
* commit '
b0c6ea9f290261c12b6cb127b7bcd53f8ecc2d60':
Invoke debuggerd64 when appropriate with stacks.
smain@google.com [Wed, 25 Jun 2014 00:42:51 +0000 (00:42 +0000)]
am
04edc344: Merge "DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com" into klp-modular-dev
* commit '
04edc344a1887465692b49e3eb58e03dccedd675':
DO NOT MERGE remove leanback and recyclerview from javadoc build for d.android.com
smain@google.com [Wed, 25 Jun 2014 00:27:58 +0000 (00:27 +0000)]
am
58b617b9: am
cd59b7df: am
5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '
58b617b902e5a9aa8c0367c894fefa747ea1b5e6':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
smain@google.com [Wed, 25 Jun 2014 00:24:34 +0000 (00:24 +0000)]
am
cd59b7df: am
5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '
cd59b7dfdb392153422f5618e2d6e847dcff790b':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
smain@google.com [Wed, 25 Jun 2014 00:19:46 +0000 (00:19 +0000)]
am
5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '
5f6019ab6cdcb3000eaf4b695424361a5038ade9':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
smain@google.com [Wed, 25 Jun 2014 00:10:19 +0000 (17:10 -0700)]
DO NOT MERGE
add butterbar notice for the google IO SDK announcements
Change-Id: I25bbb0ee4cab95b0c26cd2bd517e490e44ae1465
smain@google.com [Tue, 24 Jun 2014 21:14:30 +0000 (21:14 +0000)]
am
cfb92aa9: add a smaller version of the device frame for wear
* commit '
cfb92aa963f2fee3251c393bc6dcff9b194af3e1':
add a smaller version of the device frame for wear
Ying Wang [Tue, 24 Jun 2014 19:35:31 +0000 (19:35 +0000)]
am
5899ad25: am
b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
* commit '
5899ad254d3b94653b88e5f0f41f54690f22bd24':
Resolve :32 to 32-bit variant only if the variant exists.
smain@google.com [Tue, 24 Jun 2014 17:29:50 +0000 (10:29 -0700)]
add a smaller version of the device frame for wear
Change-Id: I91ead3f689844c5cf4b6862f38c686263f7d5cbf
Ying Wang [Tue, 24 Jun 2014 18:17:52 +0000 (18:17 +0000)]
am
b00bb2d8: Merge "Resolve :32 to 32-bit variant only if the variant exists."
* commit '
b00bb2d865c21a446d94422346e1bb0fdbc9ba29':
Resolve :32 to 32-bit variant only if the variant exists.