OSDN Git Service
Jeff Sharkey [Mon, 28 Apr 2014 16:51:11 +0000 (16:51 +0000)]
Merge "Set up rules to build oem.img"
Ying Wang [Wed, 12 Mar 2014 00:13:27 +0000 (17:13 -0700)]
Set up rules to build oem.img
To build oem.img:
- You must define BOARD_OEMIMAGE_PARTITION_SIZE in your BoardConfig.mk
- The file system type will be the same as system.img and userdata.img.
- To install a module to oem.img, use "LOCAL_OEM_MODULE := true"
- run "make -j48 showcommands oem_image dist". By default it's not
built.
Bug:
13367676
Change-Id: I1a26d4d0c61b72ecffe60279667b1b3de050780d
Torne (Richard Coles) [Mon, 28 Apr 2014 16:12:00 +0000 (16:12 +0000)]
am
93d0245b: am
5646d2f6: am
7250b63a: Merge "Fix PATH setup for arm64."
* commit '
93d0245bc9cebf68a677d59b2ada1f72f9ea2dd2':
Fix PATH setup for arm64.
Torne (Richard Coles) [Mon, 28 Apr 2014 16:06:24 +0000 (16:06 +0000)]
am
5646d2f6: am
7250b63a: Merge "Fix PATH setup for arm64."
* commit '
5646d2f6aa851ca79440d573e73fa51cf6afaf81':
Fix PATH setup for arm64.
Torne (Richard Coles) [Mon, 28 Apr 2014 16:00:30 +0000 (16:00 +0000)]
am
7250b63a: Merge "Fix PATH setup for arm64."
* commit '
7250b63a1a3e726aa83e2351b23f2d0c79903247':
Fix PATH setup for arm64.
Torne (Richard Coles) [Mon, 28 Apr 2014 15:54:23 +0000 (15:54 +0000)]
Merge "Fix PATH setup for arm64."
Torne (Richard Coles) [Fri, 25 Apr 2014 15:24:22 +0000 (16:24 +0100)]
Fix PATH setup for arm64.
On architectures other than "arm", the combination of
ANDROID_KERNEL_TOOLCHAIN_PATH being empty, and CODE_REVIEWS being empty,
leads to adding a :: into the user's PATH, which is highly undesirable.
Neither CODE_REVIEWS nor the mips toolchaindir is ever used, so just
remove them, and make sure we only include the extra colon when setting
the kernel toolchain path to a non-empty value.
Change-Id: I2dfa7d3a322b56b6abbc47476082dc6ae4dd6a82
Ying Wang [Fri, 25 Apr 2014 22:52:04 +0000 (22:52 +0000)]
am
d4cc9dad: am
1427f872: am
676e11fe: Merge "include LGPL projects in GPL archives"
* commit '
d4cc9dad6cf21e12b45b8b756a731d6e21c86c97':
include LGPL projects in GPL archives
Stephen Hines [Fri, 25 Apr 2014 22:51:38 +0000 (22:51 +0000)]
am
f0dda8d0: am
9661b09f: am
9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit '
f0dda8d0cbb249be24a71776289b1d9ebe17faaf':
Build changes necessary for LLVM 3.5 switch.
Ying Wang [Fri, 25 Apr 2014 22:03:07 +0000 (22:03 +0000)]
am
1427f872: am
676e11fe: Merge "include LGPL projects in GPL archives"
* commit '
1427f872b99c4e019fe0b5a75a283bed68814204':
include LGPL projects in GPL archives
Ying Wang [Fri, 25 Apr 2014 21:59:35 +0000 (21:59 +0000)]
am
676e11fe: Merge "include LGPL projects in GPL archives"
* commit '
676e11fed82c5a4afb02d1082472fad14e625915':
include LGPL projects in GPL archives
Ying Wang [Fri, 25 Apr 2014 21:56:26 +0000 (21:56 +0000)]
Merge "include LGPL projects in GPL archives"
Stephen Hines [Fri, 25 Apr 2014 20:57:30 +0000 (20:57 +0000)]
am
9661b09f: am
9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit '
9661b09ff1fb43014d7777b391531ebe59dd83bc':
Build changes necessary for LLVM 3.5 switch.
Stephen Hines [Fri, 25 Apr 2014 20:53:02 +0000 (20:53 +0000)]
am
9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit '
9956bb6aebf5084b730e9f4ac4d00b3a7c4a2f27':
Build changes necessary for LLVM 3.5 switch.
Stephen Hines [Fri, 25 Apr 2014 20:47:33 +0000 (20:47 +0000)]
Merge "Build changes necessary for LLVM 3.5 switch."
Ying Wang [Fri, 25 Apr 2014 16:28:00 +0000 (09:28 -0700)]
resolved conflicts for merge of
0a694f4c to master
Change-Id: Idec6e6837c6329dae423a12fc084a11bca82463d
Ying Wang [Fri, 25 Apr 2014 16:13:55 +0000 (16:13 +0000)]
am
c564b691: Remove libs from target/product/base.mk.
* commit '
c564b691d55d4dcede7ce46248b1a87acf3d2618':
Remove libs from target/product/base.mk.
Ying Wang [Fri, 25 Apr 2014 00:12:58 +0000 (17:12 -0700)]
Remove libs from target/product/base.mk.
LatinIME has libjni_latinime as dependency, so we don't need it in
PRODUCT_PACKAGES;
Moved libpac close to PacProcesser, which requires libpac.
Change-Id: I8674d76bcfde4c0e1f1b04bc96e636022d008576
Dianne Hackborn [Thu, 24 Apr 2014 23:19:14 +0000 (16:19 -0700)]
Add new facility to have multiple active codenames.
Use this to have both L and KKWT.
Change-Id: I78cd5ed2dcffab9e93030184ba6f9eb9a6a3cba5
Tim Murray [Thu, 3 Apr 2014 23:06:59 +0000 (16:06 -0700)]
Build changes necessary for LLVM 3.5 switch.
Change-Id: Icb6065daada7cb1d7425206830a4ef9e23454c03
Conflicts:
core/clang/arm.mk
Elliott Hughes [Thu, 24 Apr 2014 16:32:55 +0000 (16:32 +0000)]
am
bb21bfb0: am
7cad688e: am
847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
* commit '
bb21bfb090c29be17473b318a0d54ec5bcc5243c':
Leave 'linux' defined on x86/x86-64, like arm.
Elliott Hughes [Thu, 24 Apr 2014 16:29:25 +0000 (16:29 +0000)]
am
439f279d: am
62911d47: am
1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."
* commit '
439f279d0cd0a3c9118d7fcd688210bf614d69a9':
Leave 'linux' defined on mips/mips64, like arm.
Elliott Hughes [Thu, 24 Apr 2014 16:27:28 +0000 (16:27 +0000)]
am
7cad688e: am
847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
* commit '
7cad688ea267df86ceb9c7fbfd6bc463af4580b1':
Leave 'linux' defined on x86/x86-64, like arm.
Elliott Hughes [Thu, 24 Apr 2014 16:23:42 +0000 (16:23 +0000)]
am
847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
* commit '
847fd0311f6c82b8ac90d970cfc68aafd9913471':
Leave 'linux' defined on x86/x86-64, like arm.
Elliott Hughes [Thu, 24 Apr 2014 16:23:33 +0000 (16:23 +0000)]
am
62911d47: am
1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."
* commit '
62911d473e0798a626cdf8773eab0a7f6c461d1b':
Leave 'linux' defined on mips/mips64, like arm.
Elliott Hughes [Thu, 24 Apr 2014 16:20:02 +0000 (16:20 +0000)]
am
1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."
* commit '
1076c5685b1f1dd0f8b691466f6e16259722ca56':
Leave 'linux' defined on mips/mips64, like arm.
Elliott Hughes [Thu, 24 Apr 2014 16:19:17 +0000 (16:19 +0000)]
Merge "Leave 'linux' defined on x86/x86-64, like arm."
Elliott Hughes [Thu, 24 Apr 2014 16:16:06 +0000 (16:16 +0000)]
Merge "Leave 'linux' defined on mips/mips64, like arm."
Torne (Richard Coles) [Thu, 24 Apr 2014 16:01:27 +0000 (16:01 +0000)]
am
04a6aa26: am
081c1c59: am
3467048f: Merge "Remove chromium_org and webview from the 64-bit blacklist."
* commit '
04a6aa26489f62d33c08dbbb90973e8c2ea4b11a':
Remove chromium_org and webview from the 64-bit blacklist.
Torne (Richard Coles) [Thu, 24 Apr 2014 15:58:52 +0000 (15:58 +0000)]
am
081c1c59: am
3467048f: Merge "Remove chromium_org and webview from the 64-bit blacklist."
* commit '
081c1c5943aacb3cb05615793ecc33a75ae26b17':
Remove chromium_org and webview from the 64-bit blacklist.
Torne (Richard Coles) [Thu, 24 Apr 2014 15:53:33 +0000 (15:53 +0000)]
am
3467048f: Merge "Remove chromium_org and webview from the 64-bit blacklist."
* commit '
3467048f3f5a483ca2fff529ebd4c8d3b7827143':
Remove chromium_org and webview from the 64-bit blacklist.
Torne (Richard Coles) [Thu, 24 Apr 2014 15:49:44 +0000 (15:49 +0000)]
Merge "Remove chromium_org and webview from the 64-bit blacklist."
Andrew Hsieh [Thu, 24 Apr 2014 15:43:17 +0000 (15:43 +0000)]
am
aabe27cc: am
9754735f: am
db55f602: Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
* commit '
aabe27ccfd7f372d75426181eeeede4a7f908179':
Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
Torne (Richard Coles) [Thu, 24 Apr 2014 12:29:03 +0000 (13:29 +0100)]
Remove chromium_org and webview from the 64-bit blacklist.
external/chromium_org has been updated to handle 64-bit architectures
correctly in its makefiles; remove it from the blacklist so we can start
experimenting with building a 64/32 multilib version.
Change-Id: Ieb0e4f3cfea1578e01954c4656df90cd8d36b8cc
Andrew Hsieh [Thu, 24 Apr 2014 09:02:32 +0000 (09:02 +0000)]
am
9754735f: am
db55f602: Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
* commit '
9754735f7e86bd7647796a6d804c18e6be94675c':
Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
Elliott Hughes [Thu, 24 Apr 2014 06:24:36 +0000 (23:24 -0700)]
Leave 'linux' defined on mips/mips64, like arm.
Change-Id: Idf1e781c34d45d1e20b7e5542d79201ae93668fe
Elliott Hughes [Thu, 24 Apr 2014 06:09:30 +0000 (23:09 -0700)]
Leave 'linux' defined on x86/x86-64, like arm.
Change-Id: I53013a45c19a643a985de3f339b8b3f8f4dc39d2
Andrew Hsieh [Thu, 24 Apr 2014 01:06:42 +0000 (01:06 +0000)]
am
db55f602: Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
* commit '
db55f602be5434c0a2b7ffdfe601878d910f0914':
Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
Andrew Hsieh [Thu, 24 Apr 2014 00:40:27 +0000 (00:40 +0000)]
Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
Andrew Hsieh [Fri, 21 Mar 2014 13:05:45 +0000 (21:05 +0800)]
Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
Change-Id: I763398d523bf4851a13722f72b12ec69d7a4bb4f
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: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:24:55 +0000 (16:24 +0000)]
Merge "Support to extract JNI libs from prebuilt APK"
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: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."
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: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:54:00 +0000 (13:54 -0700)]
Some LOCAL_DROIDDOC_HTML_DIR has "/" in it.
Change-Id: I77ded6ef35cd91625e7988eafe7eed24fb359757
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 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: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 [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: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: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: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 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 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)