Stephen Hines
9956bb6aeb
Merge "Build changes necessary for LLVM 3.5 switch."
2014-04-25 20:47:33 +00:00
Ying Wang
8d4562a14d
resolved conflicts for merge of 0a694f4c
to master
...
Change-Id: Idec6e6837c6329dae423a12fc084a11bca82463d
2014-04-25 09:28:00 -07:00
Ying Wang
0a694f4c57
am c564b691
: Remove libs from target/product/base.mk.
...
* commit 'c564b691d55d4dcede7ce46248b1a87acf3d2618':
Remove libs from target/product/base.mk.
2014-04-25 16:13:55 +00:00
Ying Wang
c564b691d5
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
2014-04-24 17:12:58 -07: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
7cad688ea2
am 847fd031
: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
...
* commit '847fd0311f6c82b8ac90d970cfc68aafd9913471':
Leave 'linux' defined on x86/x86-64, like arm.
2014-04-24 16:23:42 +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
62911d473e
am 1076c568
: Merge "Leave \'linux\' defined on mips/mips64, like arm."
...
* commit '1076c5685b1f1dd0f8b691466f6e16259722ca56':
Leave 'linux' defined on mips/mips64, like arm.
2014-04-24 16:20:02 +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
Torne (Richard Coles)
081c1c5943
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.
2014-04-24 15:53:33 +00:00
Torne (Richard Coles)
3467048f3f
Merge "Remove chromium_org and webview from the 64-bit blacklist."
2014-04-24 15:49:45 +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
9754735f7e
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
2014-04-24 01:06:42 +00:00
Andrew Hsieh
db55f602be
Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
2014-04-24 00:40:28 +00: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
Ying Wang
f1a3d5e8ab
am 871bc703
: Merge "Update build system for better Clang behavior on Mac."
...
* commit '871bc703e57d5b7629c043a54f5ac2614a17981b':
Update build system for better Clang behavior on Mac.
2014-04-23 00:15:12 +00:00
Ying Wang
871bc703e5
Merge "Update build system for better Clang behavior on Mac."
2014-04-23 00:12:07 +00:00
Lajos Molnar
9fcc2da4db
Merge "Remove VideoEditor"
2014-04-22 18:33:39 +00:00
Ian Rogers
2b96d6ae78
resolved conflicts for merge of 77efd7b4
to master
...
Change-Id: I2ff1be499d3c4a5c7da3b016c63a519edcda458f
2014-04-22 10:03:16 -07:00
Tim Murray
d318ba66f9
Update build system for better Clang behavior on Mac.
...
Change-Id: I1813954681b670807d7e3faaf6d5f5a769cc5f2e
2014-04-22 09:26:22 -07:00
Ian Rogers
77efd7b4cd
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.
2014-04-22 15:45:44 +00:00
Ian Rogers
f1d5dcdd30
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.
2014-04-22 15:43:04 +00:00
Ian Rogers
850299f6a6
Merge "Make the zygote 64-bit for the x86-64 emulator."
2014-04-22 15:41:32 +00:00
Lajos Molnar
e685ff0f0c
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
2014-04-22 00:18:42 +00:00
Marco Nelissen
863c9e9cf5
Add libmediandk
...
Change-Id: I2c9645d16b56aafb05b52369b0774adffb575197
2014-04-21 10:26:17 -07:00
Ying Wang
2290cbf811
Merge "Support to extract JNI libs from prebuilt APK"
2014-04-21 16:24:56 +00:00
Ying Wang
141ed58283
am fff7583f
: am a59c2935
: am 488b23d9
: Merge "Update rules to install JNI libraries."
...
* commit 'fff7583f868a7de1eeeee22f141184e86b5e664b':
Update rules to install JNI libraries.
2014-04-21 13:32:57 +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
Ian Rogers
d4186e8c1f
Make the zygote 64-bit for the x86-64 emulator.
...
Change-Id: I4ad5d1ef2406e947176c8e180822b25c04fc83f0
2014-04-18 17:09:33 -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
a59c2935bc
am 488b23d9
: Merge "Update rules to install JNI libraries."
...
* commit '488b23d96dc796e457d8df4d7775cefcf68320af':
Update rules to install JNI libraries.
2014-04-18 23:59:52 +00:00
Ying Wang
488b23d96d
Merge "Update rules to install JNI libraries."
2014-04-18 23:54:43 +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
9b3fb2c32b
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.
2014-04-18 23:15:17 +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