OSDN Git Service
Andrew Hsieh [Tue, 29 Apr 2014 00:29:51 +0000 (00:29 +0000)]
am
293ccf9a: am
d815dbd1: am
f14ba5b9: am
8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit '
293ccf9ae6cfdcab73728190b8437ead5dbb3f12':
Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
Andrew Hsieh [Tue, 29 Apr 2014 00:23:52 +0000 (00:23 +0000)]
am
d815dbd1: am
f14ba5b9: am
8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit '
d815dbd1343d05aae5f5430dc38d8846107d202b':
Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
Andrew Hsieh [Tue, 29 Apr 2014 00:12:01 +0000 (00:12 +0000)]
am
f14ba5b9: am
8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit '
f14ba5b93583b33ad47b22b9de07c3907b8b5074':
Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
Andrew Hsieh [Tue, 29 Apr 2014 00:08:21 +0000 (00:08 +0000)]
am
8afa2555: Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
* commit '
8afa25552efb51286fe0f010f0bf78fea71fc12a':
Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
Andrew Hsieh [Mon, 28 Apr 2014 22:52:49 +0000 (22:52 +0000)]
Merge "Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib"
Jason Parks [Mon, 28 Apr 2014 20:38:08 +0000 (20:38 +0000)]
am
13b2e19e: Use java_home to determine jdk location.
* commit '
13b2e19ef240804908629ed2e54a98ec9dede337':
Use java_home to determine jdk location.
Jason Parks [Mon, 28 Apr 2014 18:32:10 +0000 (13:32 -0500)]
Use java_home to determine jdk location.
Specifying the major version rather than hard coding
to a minor version.
Change-Id: Ieccec98c1b41e3eb7f512bcebc83f6034d634862
Jeff Sharkey [Mon, 28 Apr 2014 16:54:05 +0000 (16:54 +0000)]
am
5ffee768: Merge "Set up rules to build oem.img"
* commit '
5ffee768ea6ead544e7c8927853d0b03d2216b10':
Set up rules to build oem.img
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:15:44 +0000 (16:15 +0000)]
am
0b120475: am
93d0245b: am
5646d2f6: am
7250b63a: Merge "Fix PATH setup for arm64."
* commit '
0b1204753ecb3e0177706ca6933ce08361b16aa8':
Fix PATH setup for arm64.
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
Andrew Hsieh [Sat, 26 Apr 2014 06:47:10 +0000 (23:47 -0700)]
Rename my_ndk_version_root to my_ndk_sysroot; and _include and _lib
prebuilts/ndk/current/platforms/android-19/arch-x86_64/usr/lib
is renamed to usr/lib64 to be more consistent with rest of
lib paths in x86_64 toolchain, which is multilib
See https://android-review.googlesource.com/#/c/92441/
Change-Id: I4e59245505d0fa87ae3608e81e715ccfcecc5ec8
Ying Wang [Fri, 25 Apr 2014 22:58:38 +0000 (22:58 +0000)]
am
66750e63: am
d4cc9dad: am
1427f872: am
676e11fe: Merge "include LGPL projects in GPL archives"
* commit '
66750e63954ca00341a5187ebd6497b4e49b0faa':
include LGPL projects in GPL archives
Stephen Hines [Fri, 25 Apr 2014 22:58:37 +0000 (22:58 +0000)]
am
46df1818: am
f0dda8d0: am
9661b09f: am
9956bb6a: Merge "Build changes necessary for LLVM 3.5 switch."
* commit '
46df1818157abd7e8e7288219c3992e1ed451a47':
Build changes necessary for LLVM 3.5 switch.
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:31:55 +0000 (16:31 +0000)]
am
8d4562a1: resolved conflicts for merge of
0a694f4c to master
* commit '
8d4562a14da90789f39579e1133a707003b60c0c':
Remove libs from target/product/base.mk.
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.
Dianne Hackborn [Fri, 25 Apr 2014 16:08:27 +0000 (16:08 +0000)]
am
6ee3c432: Add new facility to have multiple active codenames.
* commit '
6ee3c4327d706c6bb0c0875f3094ab43bf96a7fd':
Add new facility to have multiple active codenames.
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:38:20 +0000 (16:38 +0000)]
am
52db54cc: am
bb21bfb0: am
7cad688e: am
847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."
* commit '
52db54cc8ea48730a4375c09bd3baf0b9554dcb3':
Leave 'linux' defined on x86/x86-64, like arm.
Elliott Hughes [Thu, 24 Apr 2014 16:34:37 +0000 (16:34 +0000)]
am
1d753dda: am
439f279d: am
62911d47: am
1076c568: Merge "Leave \'linux\' defined on mips/mips64, like arm."
* commit '
1d753dda0afe74cdb59a0e6947e757b7ad831dc2':
Leave 'linux' defined on mips/mips64, like arm.
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:05:20 +0000 (16:05 +0000)]
am
131e93af: am
04a6aa26: am
081c1c59: am
3467048f: Merge "Remove chromium_org and webview from the 64-bit blacklist."
* commit '
131e93af3cc69f2d0debcb4b64a2693a6d64162a':
Remove chromium_org and webview from the 64-bit blacklist.
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:48:24 +0000 (15:48 +0000)]
am
582e5ecb: am
aabe27cc: am
9754735f: am
db55f602: Merge "Switch to new host prebuilt x86_64-linux-glibc2.11-4.6"
* commit '
582e5ecb75a2d118eac97192140629ea3d2b4826':
Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
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 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)