Ying Wang
66750e6395
am d4cc9dad: am 1427f872: am 676e11fe: Merge "include LGPL projects in GPL archives"
...
* commit 'd4cc9dad6cf21e12b45b8b756a731d6e21c86c97':
include LGPL projects in GPL archives
2014-04-25 22:52:04 +00:00
Stephen Hines
46df181815
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.
2014-04-25 22:51:38 +00:00
Ying Wang
d4cc9dad6c
am 1427f872: am 676e11fe: Merge "include LGPL projects in GPL archives"
...
* commit '1427f872b99c4e019fe0b5a75a283bed68814204':
include LGPL projects in GPL archives
2014-04-25 22:03:07 +00:00
Ying Wang
676e11fed8
Merge "include LGPL projects in GPL archives"
2014-04-25 21:56:27 +00:00
Stephen Hines
f0dda8d0cb
am 9661b09f: am 9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
...
* commit '9661b09ff1fb43014d7777b391531ebe59dd83bc':
Build changes necessary for LLVM 3.5 switch.
2014-04-25 20:57:30 +00:00
Dianne Hackborn
6ee3c4327d
Add new facility to have multiple active codenames.
...
Use this to have both L and KKWT.
Change-Id: I78cd5ed2dcffab9e93030184ba6f9eb9a6a3cba5
2014-04-24 16:19:14 -07:00
Tim Murray
43d5e1bbc4
Build changes necessary for LLVM 3.5 switch.
...
Change-Id: Icb6065daada7cb1d7425206830a4ef9e23454c03
Conflicts:
core/clang/arm.mk
2014-04-24 13:14:32 -07:00
Elliott Hughes
52db54cc8e
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.
2014-04-24 16:32:55 +00:00
Elliott Hughes
1d753dda0a
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.
2014-04-24 16:29:25 +00:00
Elliott Hughes
bb21bfb090
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.
2014-04-24 16:27:28 +00:00
Elliott Hughes
439f279d0c
am 62911d47: am 1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."
...
* commit '62911d473e0798a626cdf8773eab0a7f6c461d1b':
Leave 'linux' defined on mips/mips64, like arm.
2014-04-24 16:23:33 +00:00
Elliott Hughes
847fd0311f
Merge "Leave 'linux' defined on x86/x86-64, like arm."
2014-04-24 16:19:17 +00:00
Elliott Hughes
1076c5685b
Merge "Leave 'linux' defined on mips/mips64, like arm."
2014-04-24 16:16:06 +00:00
Torne (Richard Coles)
131e93af3c
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.
2014-04-24 16:01:27 +00:00
Torne (Richard Coles)
04a6aa2648
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.
2014-04-24 15:58:52 +00:00
Andrew Hsieh
582e5ecb75
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
2014-04-24 15:43:17 +00:00
Torne (Richard Coles)
0933cf22fc
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
2014-04-24 13:30:47 +01:00
Andrew Hsieh
aabe27ccfd
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
2014-04-24 09:02:32 +00:00
Elliott Hughes
1acd8b0552
Leave 'linux' defined on mips/mips64, like arm.
...
Change-Id: Idf1e781c34d45d1e20b7e5542d79201ae93668fe
2014-04-23 23:24:36 -07:00
Elliott Hughes
2c8e95528c
Leave 'linux' defined on x86/x86-64, like arm.
...
Change-Id: I53013a45c19a643a985de3f339b8b3f8f4dc39d2
2014-04-23 23:09:30 -07:00
Andrew Hsieh
dfde360b2c
Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
...
Change-Id: I763398d523bf4851a13722f72b12ec69d7a4bb4f
2014-04-23 14:47:00 -07:00
Ying Wang
6e048afb4b
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.
2014-04-23 00:23:22 +00:00
Ying Wang
ad60c86eda
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.
2014-04-23 00:17:31 +00:00
Tim Murray
d318ba66f9
Update build system for better Clang behavior on Mac.
...
Change-Id: I1813954681b670807d7e3faaf6d5f5a769cc5f2e
2014-04-22 09:26:22 -07:00
Ying Wang
2290cbf811
Merge "Support to extract JNI libs from prebuilt APK"
2014-04-21 16:24:56 +00:00
Ying Wang
74eb6600b4
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
2014-04-18 20:13:41 -07:00
Ying Wang
fff7583f86
am a59c2935: am 488b23d9: Merge "Update rules to install JNI libraries."
...
* commit 'a59c2935bc63babded85aa1ce1a8b00e28dc6a11':
Update rules to install JNI libraries.
2014-04-19 00:05:09 +00:00
Ying Wang
695e826a0c
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
2014-04-18 16:36:19 -07:00
Ian Rogers
621cefb88a
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.
2014-04-18 23:21:35 +00:00
Ian Rogers
29eb3d09c8
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.
2014-04-18 23:18:43 +00:00
Ian Rogers
67c209281f
Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled."
2014-04-18 23:10:31 +00:00
Ian Rogers
5d186aee8e
For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.
...
Change-Id: Ia95d74517f8182031d6044ae55559010a98ec5ca
2014-04-18 15:23:40 -07:00
Ben Cheng
1d9c67ddc5
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 )"
2014-04-18 21:18:37 +00:00
Ben Cheng
1bb663a8ba
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 )"
2014-04-18 21:15:29 +00:00
Ben Cheng
e76fee59fc
Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3 )"
...
This reverts commit 084a7f8387
.
GCC 4.9 still has stability issues (b/14160872)
Change-Id: I4d40829dbbfac0e7b6cd7eaf9924744bc5714271
2014-04-18 18:34:35 +00:00
Ying Wang
c1676c9278
Merge "Update rules to install JNI libraries."
2014-04-18 18:12:20 +00:00
Ying Wang
96bcad49f4
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
2014-04-18 10:38:53 -07:00
Ben Cheng
5de2b7ffe0
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 )
2014-04-17 19:36:49 +00:00
Ben Cheng
ea9552eb2c
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 )
2014-04-17 17:08:06 +00:00
Ying Wang
a376dd8b02
Some LOCAL_DROIDDOC_HTML_DIR has "/" in it.
...
Change-Id: I77ded6ef35cd91625e7988eafe7eed24fb359757
2014-04-16 13:54:00 -07:00
Ben Cheng
084a7f8387
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
2014-04-16 12:18:14 -07:00
Ying Wang
3bb5d8bca7
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
2014-04-16 11:28:48 -07:00
Ben Cheng
45518095f5
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.
2014-04-16 17:12:23 +00:00
Ben Cheng
455e499b12
am 6350c21e: am d32bbe7d: Merge "Explicitly link libstdc++.a for static gtest executables."
...
* commit '6350c21eaf50435471751808ad343b0143712bae':
Explicitly link libstdc++.a for static gtest executables.
2014-04-16 17:09:06 +00:00
Ben Cheng
d32bbe7d06
Merge "Explicitly link libstdc++.a for static gtest executables."
2014-04-16 17:03:21 +00:00
Ben Cheng
e34bb09eab
Explicitly link libstdc++.a for static gtest executables.
...
Change-Id: I29e3a4036264acd00dfa3229c9d0fc52ee20830e
2014-04-16 09:42:56 -07:00
Evgeniy Stepanov
5d8029f234
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
2014-04-16 10:52:10 +00:00
Andrew Hsieh
d37bf4e995
am f93c7c70: am 041d4470: am 695d8f69: Merge "Add -Wl,-maarch64linux"
...
* commit 'f93c7c70247fb11dc99361c309bd6bd7b859e30e':
Add -Wl,-maarch64linux
2014-04-15 23:37:09 +00:00
Andrew Hsieh
f93c7c7024
am 041d4470: am 695d8f69: Merge "Add -Wl,-maarch64linux"
...
* commit '041d44705205f7b36108bcc3a9dafe321e301221':
Add -Wl,-maarch64linux
2014-04-15 21:44:17 +00:00
Ying Wang
51f0d3f58a
resolved conflicts for merge of 70555a16
to master
...
Change-Id: Ibb8ea3159e2a3fa7a70f2359a02c4625812995a8
2014-04-15 13:55:24 -07:00