OSDN Git Service
Ying Wang [Fri, 2 May 2014 04:05:59 +0000 (04:05 +0000)]
am
372df5a4: am
887a52d0: am
a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
* commit '
372df5a49ebae4ce04df4633be195afb224c5d86':
Add WITH_DEXPREOPT to the list of protected global variables.
Ying Wang [Fri, 2 May 2014 04:03:18 +0000 (04:03 +0000)]
am
887a52d0: am
a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
* commit '
887a52d02251a1a94f8e17ecbfe26ba15ece6af5':
Add WITH_DEXPREOPT to the list of protected global variables.
Ying Wang [Fri, 2 May 2014 04:00:30 +0000 (04:00 +0000)]
am
a6b8025a: Merge "Add WITH_DEXPREOPT to the list of protected global variables."
* commit '
a6b8025a815cc5c9b441a91917f100486c270446':
Add WITH_DEXPREOPT to the list of protected global variables.
Ying Wang [Fri, 2 May 2014 03:57:32 +0000 (03:57 +0000)]
Merge "Add WITH_DEXPREOPT to the list of protected global variables."
Ying Wang [Fri, 2 May 2014 03:55:30 +0000 (20:55 -0700)]
Add WITH_DEXPREOPT to the list of protected global variables.
Bug:
14380196
Change-Id: I02cff39eeaf2deddf434c0c310063e4b341edd43
Michael Runge [Wed, 16 Apr 2014 00:40:21 +0000 (17:40 -0700)]
Add support for verifying OEM properties.
A separate OEM file must be specified to provide the expected
values for these properties. The list of properties comes from
the "oem_fingerprint_properties" list in misc_info.txt
Bug: b/
13367676
Change-Id: I1a3eaf108492132cf6f595a5d1c9f7e0c3cb3142
Torne (Richard Coles) [Thu, 1 May 2014 09:31:59 +0000 (09:31 +0000)]
am
2b2a4953: am
f0b5bfec: am
a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
* commit '
2b2a495317f5b08d4b64ab7c95955b0cf8d0232e':
Remove libpac and v8 from the 64-bit blacklist.
Torne (Richard Coles) [Thu, 1 May 2014 09:25:02 +0000 (09:25 +0000)]
am
f0b5bfec: am
a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
* commit '
f0b5bfec7b0a715cd09da7540f0a772e31b65c71':
Remove libpac and v8 from the 64-bit blacklist.
Torne (Richard Coles) [Thu, 1 May 2014 09:20:19 +0000 (09:20 +0000)]
am
a0267df2: Merge "Remove libpac and v8 from the 64-bit blacklist."
* commit '
a0267df234db59d34891a01e0761233abc9ae4b1':
Remove libpac and v8 from the 64-bit blacklist.
Torne (Richard Coles) [Thu, 1 May 2014 09:17:25 +0000 (09:17 +0000)]
Merge "Remove libpac and v8 from the 64-bit blacklist."
Tim Murray [Wed, 30 Apr 2014 23:35:46 +0000 (23:35 +0000)]
am
cf53e0e0: am
27fe9406: am
7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit '
cf53e0e0aaf569d7e76472e2958dca5a44f45df2':
Remove tblgen and clang-tblgen from prebuilts.
Tim Murray [Wed, 30 Apr 2014 21:54:08 +0000 (21:54 +0000)]
am
27fe9406: am
7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit '
27fe940676b568bb9a0af889028495fab73853f2':
Remove tblgen and clang-tblgen from prebuilts.
Tim Murray [Wed, 30 Apr 2014 21:52:33 +0000 (21:52 +0000)]
am
7e65b6c1: Merge "Remove tblgen and clang-tblgen from prebuilts."
* commit '
7e65b6c1e53a51db0aa65126f2453f27daa0f22f':
Remove tblgen and clang-tblgen from prebuilts.
Tim Murray [Wed, 30 Apr 2014 21:49:34 +0000 (21:49 +0000)]
Merge "Remove tblgen and clang-tblgen from prebuilts."
Tim Murray [Wed, 30 Apr 2014 20:54:32 +0000 (13:54 -0700)]
Remove tblgen and clang-tblgen from prebuilts.
Change-Id: I89fb74da5a516d0f768f72518a401216f8a5b1a8
Colin Cross [Wed, 30 Apr 2014 20:47:57 +0000 (20:47 +0000)]
Merge "verity: clean up verity build dependencies"
Narayan Kamath [Wed, 30 Apr 2014 17:35:41 +0000 (17:35 +0000)]
am
7d26e97e: am
3f1d1608: am
475a3d17: Merge "Use java_home to determine jdk location."
* commit '
7d26e97e7f7ecc8ee7af373d5a5e3c96d317c910':
Use java_home to determine jdk location.
Narayan Kamath [Wed, 30 Apr 2014 15:37:38 +0000 (15:37 +0000)]
am
3f1d1608: am
475a3d17: Merge "Use java_home to determine jdk location."
* commit '
3f1d1608ebc4a0c307c94b67943bee004d8428a1':
Use java_home to determine jdk location.
Narayan Kamath [Wed, 30 Apr 2014 15:12:53 +0000 (15:12 +0000)]
am
475a3d17: Merge "Use java_home to determine jdk location."
* commit '
475a3d17d7594ee2b8bcf1ac826c490b49f116df':
Use java_home to determine jdk location.
Narayan Kamath [Wed, 30 Apr 2014 10:45:51 +0000 (10:45 +0000)]
Merge "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.
(cherry-picked from commit
13b2e19ef240804908629ed2e54a98ec9dede337)
Change-Id: Ie2c08d35fcff2129b26c1dfa8a2e5cd7b19c4b49
Bill Yi [Wed, 30 Apr 2014 00:52:58 +0000 (00:52 +0000)]
am
6a275202: am
1e4adfa8: (-s ours) Merge commit \'
8113e43601aac7702b9ec007e81a179826143d1e\' into HEAD
* commit '
6a27520295601f53ae80d1e764e072162e9f481c':
Try to catch more misuse of $(my-dir).
Revert "Remove external/chromium from the 64 bit blacklist."
Remove external/chromium from the 64 bit blacklist.
OProfile is no longer compiled now.
Amend 64 bit blacklist.
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
Remove external/tcpdump from 64-bit build blacklist.
oprofile/daemon doesn't build for x86_64.
Remove external/wpa_supplicant_8 and external/android-clat
Take libcore off the LP64 blacklist.
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
Bill Yi [Wed, 30 Apr 2014 00:49:23 +0000 (00:49 +0000)]
am
1e4adfa8: (-s ours) Merge commit \'
8113e43601aac7702b9ec007e81a179826143d1e\' into HEAD
* commit '
1e4adfa837c77dc2dcb73ce2c0b32bf362e80000':
Try to catch more misuse of $(my-dir).
Revert "Remove external/chromium from the 64 bit blacklist."
Remove external/chromium from the 64 bit blacklist.
OProfile is no longer compiled now.
Amend 64 bit blacklist.
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
Remove external/tcpdump from 64-bit build blacklist.
oprofile/daemon doesn't build for x86_64.
Remove external/wpa_supplicant_8 and external/android-clat
Take libcore off the LP64 blacklist.
HACK: add 64-bit directory blacklist
add support for module supported or unsupported target architectures
Ying Wang [Tue, 29 Apr 2014 19:48:06 +0000 (12:48 -0700)]
Add SDK product for arm64, x86_64 and mips64.
Bug:
14411602
Change-Id: Ia609321864ddade27df97448c8037f25c4ef99aa
Bill Yi [Tue, 29 Apr 2014 18:32:53 +0000 (11:32 -0700)]
Torne (Richard Coles) [Tue, 29 Apr 2014 09:22:49 +0000 (10:22 +0100)]
Remove libpac and v8 from the 64-bit blacklist.
external/chromium-libpac has been updated to depend on the copy of V8 in
external/chromium_org, and its makefiles updated to be multilib-safe.
external/v8 is thus unused and has been removed from the tree.
Bug:
12452053
Change-Id: I757fa187f7f67cd9a89d4b228d4ce3ed6d2858b1
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
Colin Cross [Mon, 28 Apr 2014 23:27:32 +0000 (16:27 -0700)]
verity: clean up verity build dependencies
Move image dependencies out of PRODUCT_PACKAGES and into direct
dependencies for the image building rules.
Fix the test for PRODUCT_SUPPORTS_VERITY, it needs to check for
the current project as the global is no longer set.
Change-Id: I811501834ae5ec658229bd505fcc48275ff578c9
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 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: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
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: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)"