OSDN Git Service
Ying Wang [Wed, 23 Apr 2014 02:00:58 +0000 (02:00 +0000)]
am
6e048afb: am
ad60c86e: am
f1a3d5e8: am
871bc703: Merge "Update build system for better Clang behavior on Mac."
* commit '
6e048afb4bcac4118b09cc0dd01f0ca2a797a95a':
Update build system for better Clang behavior on Mac.
Ying Wang [Wed, 23 Apr 2014 00:23:22 +0000 (00:23 +0000)]
am
ad60c86e: am
f1a3d5e8: am
871bc703: Merge "Update build system for better Clang behavior on Mac."
* commit '
ad60c86eda1a975d6966f414b4a7065d97e7505b':
Update build system for better Clang behavior on Mac.
Ying Wang [Wed, 23 Apr 2014 00:17:31 +0000 (00:17 +0000)]
am
f1a3d5e8: am
871bc703: Merge "Update build system for better Clang behavior on Mac."
* commit '
f1a3d5e8ab2064f9ab4ba3d1a6d594c1905624da':
Update build system for better Clang behavior on Mac.
Ying Wang [Wed, 23 Apr 2014 00:15:12 +0000 (00:15 +0000)]
am
871bc703: Merge "Update build system for better Clang behavior on Mac."
* commit '
871bc703e57d5b7629c043a54f5ac2614a17981b':
Update build system for better Clang behavior on Mac.
Ying Wang [Wed, 23 Apr 2014 00:12:06 +0000 (00:12 +0000)]
Merge "Update build system for better Clang behavior on Mac."
Lajos Molnar [Tue, 22 Apr 2014 18:46:48 +0000 (18:46 +0000)]
am
9fcc2da4: Merge "Remove VideoEditor"
* commit '
9fcc2da4db19472dd92e6f9362fbcd1b2912af04':
Remove VideoEditor
Ian Rogers [Tue, 22 Apr 2014 18:45:51 +0000 (18:45 +0000)]
am
2b96d6ae: resolved conflicts for merge of
77efd7b4 to master
* commit '
2b96d6ae782188dadcb08523e44b8c94bd7626d3':
Make the zygote 64-bit for the x86-64 emulator.
Lajos Molnar [Tue, 22 Apr 2014 18:33:39 +0000 (18:33 +0000)]
Merge "Remove VideoEditor"
Ian Rogers [Tue, 22 Apr 2014 17:03:16 +0000 (10:03 -0700)]
resolved conflicts for merge of
77efd7b4 to master
Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f
Tim Murray [Mon, 21 Apr 2014 21:00:31 +0000 (14:00 -0700)]
Update build system for better Clang behavior on Mac.
Change-Id: I1813954681b670807d7e3faaf6d5f5a769cc5f2e
Ian Rogers [Tue, 22 Apr 2014 15:45:44 +0000 (15:45 +0000)]
am
f1d5dcdd: am
850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator."
* commit '
f1d5dcdd30e1f181cc1fce6d99f0f3aa589c8edd':
Make the zygote 64-bit for the x86-64 emulator.
Ian Rogers [Tue, 22 Apr 2014 15:43:04 +0000 (15:43 +0000)]
am
850299f6: Merge "Make the zygote 64-bit for the x86-64 emulator."
* commit '
850299f6a6a831d47af68a3004a62df21b5fee3a':
Make the zygote 64-bit for the x86-64 emulator.
Ian Rogers [Tue, 22 Apr 2014 15:41:32 +0000 (15:41 +0000)]
Merge "Make the zygote 64-bit for the x86-64 emulator."
Lajos Molnar [Mon, 21 Apr 2014 23:15:02 +0000 (16:15 -0700)]
Remove VideoEditor
This app is no longer supported as there are 3rd party video editing
apps, such as Google+ Video Editor.
Bug:
13542518
Change-Id: Ib3a4e2e7d3e261e12355650fc4db62ac59daef8e
Ying Wang [Mon, 21 Apr 2014 16:27:35 +0000 (16:27 +0000)]
am
2290cbf8: Merge "Support to extract JNI libs from prebuilt APK"
* commit '
2290cbf811eae0703a462c158c2f25f08f7c2811':
Support to extract JNI libs from prebuilt APK
Ying Wang [Mon, 21 Apr 2014 16:24:55 +0000 (16:24 +0000)]
Merge "Support to extract JNI libs from prebuilt APK"
Ying Wang [Mon, 21 Apr 2014 13:42:49 +0000 (13:42 +0000)]
am
141ed582: am
fff7583f: am
a59c2935: am
488b23d9: Merge "Update rules to install JNI libraries."
* commit '
141ed58283984109c7210339b3ba9c3c673e361f':
Update rules to install JNI libraries.
Ying Wang [Mon, 21 Apr 2014 13:32:57 +0000 (13:32 +0000)]
am
fff7583f: am
a59c2935: am
488b23d9: Merge "Update rules to install JNI libraries."
* commit '
fff7583f868a7de1eeeee22f141184e86b5e664b':
Update rules to install JNI libraries.
Ying Wang [Sat, 19 Apr 2014 03:13:41 +0000 (20:13 -0700)]
Support to extract JNI libs from prebuilt APK
Use LOCAL_PREBUILT_JNI_LIBS to install prebuilt JNI libraries extracted
from the prebuilt apk, or prebuilts as source, to the app specific lib path.
LOCAL_PREBUILT_JNI_LIBS accepts 2 kinds of files:
- Files like @path/to/libfoo.so (path inside the apk) are JNI libs
extracted from the prebuilt apk. In this case, all embedded JNI libs
inside the prebuilt apk are stripped.
- Files like path/to/libfoo.so (path relative to LOCAL_PATH) are
prebuilts in the source tree.
Those prebuilt JNI libs are not defined as modules in the build system,
so this works around possible module name conflict.
Bug:
13170859
Change-Id: I91bb844cc11b3621a85733bc7e8910f168957ef0
Ian Rogers [Fri, 21 Mar 2014 23:31:33 +0000 (16:31 -0700)]
Make the zygote 64-bit for the x86-64 emulator.
Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
Ying Wang [Sat, 19 Apr 2014 00:05:09 +0000 (00:05 +0000)]
am
a59c2935: am
488b23d9: Merge "Update rules to install JNI libraries."
* commit '
a59c2935bc63babded85aa1ce1a8b00e28dc6a11':
Update rules to install JNI libraries.
Ying Wang [Fri, 18 Apr 2014 23:59:52 +0000 (23:59 +0000)]
am
488b23d9: Merge "Update rules to install JNI libraries."
* commit '
488b23d96dc796e457d8df4d7775cefcf68320af':
Update rules to install JNI libraries.
Ying Wang [Fri, 18 Apr 2014 23:54:43 +0000 (23:54 +0000)]
Merge "Update rules to install JNI libraries."
Ying Wang [Thu, 17 Apr 2014 20:38:04 +0000 (13:38 -0700)]
Update rules to install JNI libraries.
Previously we have to use LOCAL_REQUIRED_MODULES to install jni
libraries for an apk in bundled build.
With this change, we'll use LOCAL_JNI_SHARED_LIBRARIES alone to
install jni shared libraries.
The new rules are:
- If we are doing unbundled build, or the apk isn't going to be
installed to system partitions, we'll embed the jni libs in the
built apk.
- Otherwise, the jni libraries will be installed to the system
lib path, and symlinks created in the app specific lib path.
Change-Id: Id6bd5301eb632bda3593664acee580f0d8b1d5d4
Ian Rogers [Fri, 18 Apr 2014 23:25:37 +0000 (23:25 +0000)]
am
621cefb8: am
29eb3d09: am
9b3fb2c3: am
67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled."
* commit '
621cefb88a225b62647534d1a2916dd677fb34b1':
For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
Ian Rogers [Fri, 18 Apr 2014 23:21:35 +0000 (23:21 +0000)]
am
29eb3d09: am
9b3fb2c3: am
67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled."
* commit '
29eb3d09c83c71e3178b027f9bcc5b4e4d75ca47':
For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
Ian Rogers [Fri, 18 Apr 2014 23:18:43 +0000 (23:18 +0000)]
am
9b3fb2c3: am
67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled."
* commit '
9b3fb2c32b89b3d20d6dda521ea3cd81ec75ce19':
For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
Ian Rogers [Fri, 18 Apr 2014 23:15:17 +0000 (23:15 +0000)]
am
67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled."
* commit '
67c209281ff0454213bc117691214bc67ad5a7f2':
For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
Ian Rogers [Fri, 18 Apr 2014 23:10:30 +0000 (23:10 +0000)]
Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled."
Ben Cheng [Fri, 18 Apr 2014 22:37:14 +0000 (22:37 +0000)]
am
1d9c67dd: am
1bb663a8: am
26232093: am
5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""
* commit '
1d9c67ddc5622f4d24eca0e20bbb9ddb207e724a':
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
Ying Wang [Fri, 18 Apr 2014 22:35:18 +0000 (22:35 +0000)]
am
c1676c92: Merge "Update rules to install JNI libraries."
* commit '
c1676c9278400b483ab653306b17f8fb2b92c97b':
Update rules to install JNI libraries.
Ian Rogers [Fri, 18 Apr 2014 22:23:40 +0000 (15:23 -0700)]
For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
Change-Id: Ia95d74517f8182031d6044ae55559010a98ec5ca
Ben Cheng [Fri, 18 Apr 2014 21:18:37 +0000 (21:18 +0000)]
am
1bb663a8: am
26232093: am
5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""
* commit '
1bb663a8baf25afaab22fbe92130a302fb32814d':
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
Ben Cheng [Fri, 18 Apr 2014 21:15:29 +0000 (21:15 +0000)]
am
26232093: am
5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""
* commit '
26232093bbec1a29aac18dbf2b18d9150632711d':
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
Ben Cheng [Fri, 18 Apr 2014 21:12:27 +0000 (21:12 +0000)]
am
5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""
* commit '
5c72b7266640ad8703d049910431c9ce7b91a9cd':
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
Ben Cheng [Fri, 18 Apr 2014 18:35:29 +0000 (18:35 +0000)]
Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""
Ben Cheng [Fri, 18 Apr 2014 18:34:35 +0000 (18:34 +0000)]
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
This reverts commit
084a7f83875d030c2e4819bed386c4a16168e731.
GCC 4.9 still has stability issues (b/
14160872)
Change-Id: I4d40829dbbfac0e7b6cd7eaf9924744bc5714271
Ying Wang [Fri, 18 Apr 2014 18:12:19 +0000 (18:12 +0000)]
Merge "Update rules to install JNI libraries."
Ying Wang [Thu, 17 Apr 2014 20:38:04 +0000 (13:38 -0700)]
Update rules to install JNI libraries.
Previously we have to use LOCAL_REQUIRED_MODULES to install jni
libraries for an apk in bundled build.
With this change, we'll use LOCAL_JNI_SHARED_LIBRARIES alone to
install jni shared libraries.
The new rules are:
- If we are doing unbundled build, or the apk isn't going to be
installed to system partitions, we'll embed the jni libs in the
built apk.
- Otherwise, the jni libraries will be installed to the system
lib path, and symlinks created in the app specific lib path.
Change-Id: Id6bd5301eb632bda3593664acee580f0d8b1d5d4
Ben Cheng [Thu, 17 Apr 2014 19:51:34 +0000 (19:51 +0000)]
am
5de2b7ff: am
ea9552eb: am
dc82c5a8: am
63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
* commit '
5de2b7ffe0e483cbe5428422dc427a6efc6523d1':
Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
Ben Cheng [Thu, 17 Apr 2014 19:36:49 +0000 (19:36 +0000)]
am
ea9552eb: am
dc82c5a8: am
63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
* commit '
ea9552eb2cf68c96078f2128b95490c08a9ec81b':
Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
Ben Cheng [Thu, 17 Apr 2014 17:08:06 +0000 (17:08 +0000)]
am
dc82c5a8: am
63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
* commit '
dc82c5a8c04da516057a75b212a3e9d1824628a3':
Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
Ben Cheng [Thu, 17 Apr 2014 17:02:25 +0000 (17:02 +0000)]
am
63030fe6: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
* commit '
63030fe60842d9385f75d5ecdd17aa11a67a4e05':
Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
Ben Cheng [Thu, 17 Apr 2014 16:54:24 +0000 (16:54 +0000)]
Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"
Ying Wang [Wed, 16 Apr 2014 20:59:09 +0000 (20:59 +0000)]
am
a376dd8b: Some LOCAL_DROIDDOC_HTML_DIR has "/" in it.
* commit '
a376dd8b02adcf0c6dc1f584c3a28a97dd97bdd6':
Some LOCAL_DROIDDOC_HTML_DIR has "/" in it.
Ying Wang [Wed, 16 Apr 2014 20:54:00 +0000 (13:54 -0700)]
Some LOCAL_DROIDDOC_HTML_DIR has "/" in it.
Change-Id: I77ded6ef35cd91625e7988eafe7eed24fb359757
Ying Wang [Wed, 16 Apr 2014 19:21:12 +0000 (19:21 +0000)]
am
7cd663f0: Merge "Fix html_dir_files in droiddoc.mk"
* commit '
7cd663f0c3d5911cf2cf7b8010cf033cca6fc55b':
Fix html_dir_files in droiddoc.mk
Ben Cheng [Wed, 16 Apr 2014 19:18:14 +0000 (12:18 -0700)]
Use aarch64-linux-android-4.9 for arm64 build (attempt #3)
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7
NDK libraries are still picked up from prebuilts/ndk/*/4.8/*
GCC has been patched to disable codegen for calling
__cxa_throw_bad_array_new_length.
Change-Id: Ie0bf38357c0cf3d265d8b5dd3c2b8a8fd83b1de1
Ying Wang [Wed, 16 Apr 2014 19:15:26 +0000 (19:15 +0000)]
Merge "Fix html_dir_files in droiddoc.mk"
Doug Zongker [Wed, 16 Apr 2014 19:10:01 +0000 (19:10 +0000)]
am
0d8179e8: fix tapas to work in more shells
* commit '
0d8179e84bcf729f580d9cad81cd2770e1af8a79':
fix tapas to work in more shells
Doug Zongker [Wed, 16 Apr 2014 18:34:34 +0000 (11:34 -0700)]
fix tapas to work in more shells
tapas with multiple app names currently works in bash but discards all
but the first app in others (specifically, zsh). Use shell
constructions that are more universal.
Change-Id: I2f836ddf75b89019ac04ef99647d782ffe79cfee
Ying Wang [Wed, 16 Apr 2014 18:25:31 +0000 (11:25 -0700)]
Fix html_dir_files in droiddoc.mk
Previously html_dir_files includes every file in $(LOCAL_PATH), if
$(LOCAL_DROIDDOC_HTML_DIR) isn't set.
Change-Id: I3c249e5f4a0f52f71edd92862361c1dc4ab6bed7
Ben Cheng [Wed, 16 Apr 2014 17:17:20 +0000 (17:17 +0000)]
am
45518095: am
455e499b: am
6350c21e: am
d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables."
* commit '
45518095f51ed4c0847b40073d4078237b331856':
Explicitly link libstdc++.a for static gtest executables.
Ben Cheng [Wed, 16 Apr 2014 17:12:23 +0000 (17:12 +0000)]
am
455e499b: am
6350c21e: am
d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables."
* commit '
455e499b1234132fa294c1ac755e97b646a88900':
Explicitly link libstdc++.a for static gtest executables.
Ben Cheng [Wed, 16 Apr 2014 17:09:06 +0000 (17:09 +0000)]
am
6350c21e: am
d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables."
* commit '
6350c21eaf50435471751808ad343b0143712bae':
Explicitly link libstdc++.a for static gtest executables.
Ben Cheng [Wed, 16 Apr 2014 17:05:58 +0000 (17:05 +0000)]
am
d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables."
* commit '
d32bbe7d060ac92c062a6d57c747ffc319aa5f86':
Explicitly link libstdc++.a for static gtest executables.
Ben Cheng [Wed, 16 Apr 2014 17:03:21 +0000 (17:03 +0000)]
Merge "Explicitly link libstdc++.a for static gtest executables."
Ben Cheng [Tue, 15 Apr 2014 21:52:16 +0000 (14:52 -0700)]
Explicitly link libstdc++.a for static gtest executables.
Change-Id: I29e3a4036264acd00dfa3229c9d0fc52ee20830e
Evgeniy Stepanov [Wed, 16 Apr 2014 16:36:39 +0000 (16:36 +0000)]
am
5d8029f2: Update ASan configuration.
* commit '
5d8029f234669cf1688739437810db11dcdb403d':
Update ASan configuration.
Evgeniy Stepanov [Fri, 21 Feb 2014 14:10:53 +0000 (18:10 +0400)]
Update ASan configuration.
Change runtime library name to keep in sync with upstream.
Enable frame pointers in instrumented code for fast stack unwind.
Change-Id: I815912bb856c56c399639ea76ad4cb6b97961840
Ying Wang [Tue, 15 Apr 2014 23:48:27 +0000 (23:48 +0000)]
am
105ed03c: am
25e75aba: am
6e3bbf64: am
0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '
105ed03cf01f2ece0aca279d4d53151b4fd4784e':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Ying Wang [Tue, 15 Apr 2014 23:42:38 +0000 (23:42 +0000)]
am
25e75aba: am
6e3bbf64: am
0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '
25e75abac2c9229c0c4741e33f504a341a36ad94':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Andrew Hsieh [Tue, 15 Apr 2014 23:42:34 +0000 (23:42 +0000)]
am
d37bf4e9: am
f93c7c70: am
041d4470: am
695d8f69: Merge "Add -Wl,-maarch64linux"
* commit '
d37bf4e99509aeb98706a1a2d273f39b92c7cfdb':
Add -Wl,-maarch64linux
Andrew Hsieh [Tue, 15 Apr 2014 23:37:09 +0000 (23:37 +0000)]
am
f93c7c70: am
041d4470: am
695d8f69: Merge "Add -Wl,-maarch64linux"
* commit '
f93c7c70247fb11dc99361c309bd6bd7b859e30e':
Add -Wl,-maarch64linux
Ying Wang [Tue, 15 Apr 2014 23:36:05 +0000 (23:36 +0000)]
am
6e3bbf64: am
0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '
6e3bbf64b2c8ac49b5b1e1ff368a120118c04e65':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Ying Wang [Tue, 15 Apr 2014 23:34:34 +0000 (23:34 +0000)]
am
0ac89b45: Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
* commit '
0ac89b459542ef88a8c61f45f0d6b680f9931ddf':
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Ying Wang [Tue, 15 Apr 2014 23:32:42 +0000 (23:32 +0000)]
Merge "Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build."
Ying Wang [Tue, 15 Apr 2014 22:36:06 +0000 (22:36 +0000)]
am
c73e4615: Fix variable name.
* commit '
c73e461537678af2c29fcc38857e26fa57103710':
Fix variable name.
Ying Wang [Tue, 15 Apr 2014 22:27:43 +0000 (15:27 -0700)]
Fix variable name.
Change-Id: Ie7439f71cf7fd2eeacd45a5d6625e610dad8bfbe
(cherry picked from commit
1a1dfcb5fcb6eda11d8dbf5df02f0083853dd5c1)
Andrew Hsieh [Tue, 15 Apr 2014 21:44:17 +0000 (21:44 +0000)]
am
041d4470: am
695d8f69: Merge "Add -Wl,-maarch64linux"
* commit '
041d44705205f7b36108bcc3a9dafe321e301221':
Add -Wl,-maarch64linux
Ying Wang [Tue, 15 Apr 2014 21:42:27 +0000 (14:42 -0700)]
Remove libGLES_android from non-emulator builds; Remove screenrecord from SDK build.
Bug:
11368415
Bug:
14087863
Change-Id: I05d406d174ea1d1bf67c7922c03950e700978baa
Andrew Hsieh [Tue, 15 Apr 2014 21:41:08 +0000 (21:41 +0000)]
am
695d8f69: Merge "Add -Wl,-maarch64linux"
* commit '
695d8f69561b8162abe8611d1f6796b6a91ca1ac':
Add -Wl,-maarch64linux
Andrew Hsieh [Tue, 15 Apr 2014 21:39:07 +0000 (21:39 +0000)]
Merge "Add -Wl,-maarch64linux"
Ying Wang [Tue, 15 Apr 2014 21:02:38 +0000 (21:02 +0000)]
am
51f0d3f5: resolved conflicts for merge of
70555a16 to master
* commit '
51f0d3f58a5c04ee328778bc97e42dc10cfa41ad':
Allow to build target-files.zip in sdk build.
Narayan Kamath [Tue, 15 Apr 2014 21:02:06 +0000 (21:02 +0000)]
am
a1f8afa9: am
d954c6b9: am
60b9496c: am
22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '
a1f8afa930ccaa0241892f25d37325743661755a':
"desktop" linux has Posix clocks.
Scott Main [Tue, 15 Apr 2014 21:02:05 +0000 (21:02 +0000)]
am
e65e2134: am
554bb7b6: am
cdbb1241: am
01adbdcb: am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
e65e2134444a28199c3ede61a692457c73478f94':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Ying Wang [Tue, 15 Apr 2014 20:55:24 +0000 (13:55 -0700)]
resolved conflicts for merge of
70555a16 to master
Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8
Narayan Kamath [Tue, 15 Apr 2014 20:52:52 +0000 (20:52 +0000)]
am
d954c6b9: am
60b9496c: am
22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '
d954c6b92024fbb183ea3acb7366a39765a6e3c0':
"desktop" linux has Posix clocks.
Scott Main [Tue, 15 Apr 2014 20:52:27 +0000 (20:52 +0000)]
am
554bb7b6: am
cdbb1241: am
01adbdcb: am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
554bb7b61081e80d79bf29a3690ba6fff391df55':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Ying Wang [Tue, 15 Apr 2014 20:34:44 +0000 (20:34 +0000)]
am
114b46f1: Accomodate to the import syntax in build.prop.
* commit '
114b46f15dec20ad6b55879fe072220b07dcc099':
Accomodate to the import syntax in build.prop.
Ying Wang [Tue, 15 Apr 2014 20:34:43 +0000 (20:34 +0000)]
am
5a7ad033: Accomodate to the import syntax in build.prop.
* commit '
5a7ad0338bf027e6398bff411c826b24f4faf358':
Accomodate to the import syntax in build.prop.
Ying Wang [Tue, 15 Apr 2014 18:24:00 +0000 (11:24 -0700)]
Accomodate to the import syntax in build.prop.
Bug:
14024566
Change-Id: I71692244fabcd4d12f65849ffa027295b3a2a79a
(cherry picked from commit
092fea0d3e644573d7f0dbfe6692f42431f83c5c)
Ying Wang [Tue, 15 Apr 2014 18:36:46 +0000 (11:36 -0700)]
Accomodate to the import syntax in build.prop.
Bug:
14024566
Change-Id: I70b8d3c8cfc968a7f039728375f3f7f341cdc11a
Andrew Hsieh [Tue, 15 Apr 2014 18:54:06 +0000 (11:54 -0700)]
Add -Wl,-maarch64linux
The "-maarch64linux" switch is needed before aarch64-*4.8 is rebuilt with
backport of upstream patch, see https://android-review.googlesource.com/#/c/91099/
The existing ld.bfd is fine because it's configured to support
aarch64linux only. ld.mcld (see https://android-review.googlesource.com/#/c/91047)
needs explicit emulation switch because it supports multiple targets
Change-Id: Idc1a491c5722ea9e26db917b667b1000bccc1f60
Ying Wang [Tue, 15 Apr 2014 18:16:08 +0000 (18:16 +0000)]
am
f0534c28: LOCAL_CERTIFICATE only applies to APPS.
* commit '
f0534c289786d6a6c98cc5550f5027e13a5a8bff':
LOCAL_CERTIFICATE only applies to APPS.
Ying Wang [Tue, 15 Apr 2014 18:12:21 +0000 (11:12 -0700)]
LOCAL_CERTIFICATE only applies to APPS.
Change-Id: Iae8c62f1686736f3ce21a2eb6b82fedc9fd12125
Ying Wang [Tue, 15 Apr 2014 16:12:26 +0000 (16:12 +0000)]
am
fcd22c88: Merge "Allow to build target-files.zip in sdk build." into klp-modular-dev
* commit '
fcd22c8848b829eec7e661fb270fea1a18bcba28':
Allow to build target-files.zip in sdk build.
Ying Wang [Tue, 15 Apr 2014 16:07:03 +0000 (16:07 +0000)]
Merge "Allow to build target-files.zip in sdk build." into klp-modular-dev
Narayan Kamath [Tue, 15 Apr 2014 11:06:26 +0000 (11:06 +0000)]
am
60b9496c: am
22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '
60b9496c016f81df8f1c4202ba8a5190543900d5':
"desktop" linux has Posix clocks.
Narayan Kamath [Tue, 15 Apr 2014 11:02:48 +0000 (11:02 +0000)]
am
22261a3f: Merge ""desktop" linux has Posix clocks."
* commit '
22261a3f9b50dfb567ca072ec7ca2c77fd64e531':
"desktop" linux has Posix clocks.
Narayan Kamath [Tue, 15 Apr 2014 10:58:51 +0000 (10:58 +0000)]
Merge ""desktop" linux has Posix clocks."
Scott Main [Tue, 15 Apr 2014 02:46:17 +0000 (02:46 +0000)]
am
cdbb1241: am
01adbdcb: am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
cdbb12418943889a86576b24ae91ddd6a2b5340e':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Scott Main [Tue, 15 Apr 2014 02:44:48 +0000 (02:44 +0000)]
am
01adbdcb: am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
01adbdcb954e2d694ec40ac149f07c44defcc796':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Scott Main [Tue, 15 Apr 2014 02:42:10 +0000 (02:42 +0000)]
am
613b251b: Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
* commit '
613b251b7b4b54507561ee52811c72fcd2ba731d':
remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag.
Scott Main [Tue, 15 Apr 2014 02:38:34 +0000 (02:38 +0000)]
Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scroll position based on changes to the hashtag." into klp-docs
Scott Main [Tue, 15 Apr 2014 02:00:12 +0000 (19:00 -0700)]
remove the animated scroll adjustment for sticky nav.
Instead adjust the scroll position based on changes to the hashtag.
Change-Id: I34a6b386fa2104f8f2ac04e1d9820199f0ef0e94
Ying Wang [Tue, 15 Apr 2014 00:25:43 +0000 (17:25 -0700)]
Allow to build target-files.zip in sdk build.
and put the target-files.zip on the build server.
Bug:
13763122
Change-Id: I71ab6aa40666fdb24ec0da0fbfc7b73753d4f0c7
Scott Main [Mon, 14 Apr 2014 15:54:20 +0000 (15:54 +0000)]
am
74e22573: am
78f264f7: am
3829f621: am
b1a6d644: am
1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '
74e22573a671f929c4d2daf526d72e49224f934f':
make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
Dirk Dougherty [Mon, 14 Apr 2014 15:54:19 +0000 (15:54 +0000)]
am
7b1fe64c: am
7de9c942: am
45094b5d: am
d0c6f0a1: am
318fb971: Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
* commit '
7b1fe64cfdce0f9492db00771735d39ec94be040':
Optimize truncation for card text, add About to sticky nav colors, minor adjustment to templates.
Scott Main [Mon, 14 Apr 2014 15:49:36 +0000 (15:49 +0000)]
am
78f264f7: am
3829f621: am
b1a6d644: am
1670cca5: Merge "make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results." into klp-docs
* commit '
78f264f79be427d4bbe6446c1e4893b1526e76d7':
make the sticky bar aware of search result visiblity. Fixes a bug that caused the sidenav to overlap search results.
OSDN Git Service
