OSDN Git Service
Ying Wang [Fri, 9 May 2014 00:10:43 +0000 (00:10 +0000)]
am
2d41656c: am
f6603f75: Merge "Add tool to package up built modules."
* commit '
2d41656cdb41853e42a7ea2c0597ce505ef51750':
Add tool to package up built modules.
Ying Wang [Fri, 9 May 2014 00:06:35 +0000 (00:06 +0000)]
am
f6603f75: Merge "Add tool to package up built modules."
* commit '
f6603f753d492823e19d0677d5a9ccfc16f51805':
Add tool to package up built modules.
Ying Wang [Fri, 9 May 2014 00:02:50 +0000 (00:02 +0000)]
Merge "Add tool to package up built modules."
Ying Wang [Mon, 5 May 2014 23:46:52 +0000 (16:46 -0700)]
Add tool to package up built modules.
With this change, you can package up modules while avoiding installing
them to the system.img or userdata.img.
- build/core/tasks/tools/package-modules.mk
You can use this template to package up modules into a zip file and
preserve the installed file paths.
- LOCAL_PICKUP_FILES, you can use this variable to package up extra
files/directories.
Bug:
13585955
Change-Id: I103042b24ccf17cf5dc90c016d97ed1dd293e50b
Tsu Chiang Chuang [Thu, 8 May 2014 23:01:48 +0000 (23:01 +0000)]
am
5bd1da1e: am
41d8760d: Merge "Bump userdata image size from 200 MB to 550 MB"
* commit '
5bd1da1e0e9dff444f98fb1b2e2954663041198f':
Bump userdata image size from 200 MB to 550 MB
Tsu Chiang Chuang [Thu, 8 May 2014 22:50:27 +0000 (22:50 +0000)]
am
41d8760d: Merge "Bump userdata image size from 200 MB to 550 MB"
* commit '
41d8760d683f21d2868fbfb6872a3cf65b9edbcb':
Bump userdata image size from 200 MB to 550 MB
Tsu Chiang Chuang [Thu, 8 May 2014 22:39:00 +0000 (22:39 +0000)]
Merge "Bump userdata image size from 200 MB to 550 MB"
Brian Carlstrom [Thu, 8 May 2014 21:57:32 +0000 (21:57 +0000)]
am
4ed19f0f: am
1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '
4ed19f0f4294544d0447025f0079a9d9e185a495':
Add dalvik.vm.dex2oat-flags for eng build
Brian Carlstrom [Thu, 8 May 2014 21:53:14 +0000 (21:53 +0000)]
am
1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '
1e63c2d15cba608a154bbd563f96dde334691147':
Add dalvik.vm.dex2oat-flags for eng build
Brian Carlstrom [Thu, 8 May 2014 21:49:31 +0000 (21:49 +0000)]
Merge "Add dalvik.vm.dex2oat-flags for eng build"
Ying Wang [Thu, 8 May 2014 00:27:03 +0000 (00:27 +0000)]
am
0a61a603: am
3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."
* commit '
0a61a6032ccfe5b26395da1a0a9512957797fa69':
Apply LOCAL_LDLIBS to target build rules too.
Ying Wang [Thu, 8 May 2014 00:21:35 +0000 (00:21 +0000)]
am
3b15cdb8: Merge "Apply LOCAL_LDLIBS to target build rules too."
* commit '
3b15cdb854dfe79507cace8ce54828861bbe7a8c':
Apply LOCAL_LDLIBS to target build rules too.
Ying Wang [Thu, 8 May 2014 00:15:30 +0000 (00:15 +0000)]
Merge "Apply LOCAL_LDLIBS to target build rules too."
Ying Wang [Wed, 7 May 2014 18:33:19 +0000 (11:33 -0700)]
Apply LOCAL_LDLIBS to target build rules too.
Use LOCAL_LDLIBS to link against prebuilt libraries (such as NDK
libraries).
Previously LOCAL_LDLIBS only applies to host modules and the behaviour
confuses users.
Change-Id: I515546d7b59ef54e8ef09050eb58ec63534c9291
Brian Carlstrom [Tue, 11 Feb 2014 01:52:53 +0000 (17:52 -0800)]
Add dalvik.vm.dex2oat-flags for eng build
Bug:
12869646
Change-Id: I794320267c846225931f12075c7f32d7848081e9
Tsu Chiang Chuang [Wed, 7 May 2014 00:27:20 +0000 (17:27 -0700)]
Bump userdata image size from 200 MB to 550 MB
Change-Id: Ibdf319091a7187dc894f4a923d40868cec4b7b41
Ying Wang [Tue, 6 May 2014 19:19:15 +0000 (19:19 +0000)]
am
ba0bb801: am
a16583a0: Merge "Fix windows/mingw build."
* commit '
ba0bb801c3cfee582e454432e6a0a75491e54236':
Fix windows/mingw build.
Ying Wang [Tue, 6 May 2014 19:16:12 +0000 (19:16 +0000)]
am
a16583a0: Merge "Fix windows/mingw build."
* commit '
a16583a0880f574937f08bf2c86be72b0f4b9274':
Fix windows/mingw build.
Ying Wang [Tue, 6 May 2014 19:13:21 +0000 (19:13 +0000)]
Merge "Fix windows/mingw build."
Ying Wang [Tue, 6 May 2014 19:10:55 +0000 (12:10 -0700)]
Fix windows/mingw build.
Bug:
14446414
Change-Id: I9d12ed8afb6d4d5a09ef9b2844eb193b52b74271
Ying Wang [Tue, 6 May 2014 18:46:10 +0000 (18:46 +0000)]
am
c3b2314a: am
a37550ed: Merge "Use prebuilt flex."
* commit '
c3b2314a58e8d6f90766db2ef82303bafcefb766':
Use prebuilt flex.
Ying Wang [Tue, 6 May 2014 18:43:28 +0000 (18:43 +0000)]
am
a37550ed: Merge "Use prebuilt flex."
* commit '
a37550edd39b3520839251b2a4acceca779a8a8b':
Use prebuilt flex.
Ying Wang [Tue, 6 May 2014 18:40:59 +0000 (18:40 +0000)]
Merge "Use prebuilt flex."
Ying Wang [Tue, 6 May 2014 16:24:30 +0000 (16:24 +0000)]
am
e9dd544d: am
889a93a4: Merge "add silvermont x86 architecture"
* commit '
e9dd544dfed3a974d2bb2e6f783238ecfe64fb6c':
add silvermont x86 architecture
Ying Wang [Tue, 6 May 2014 16:20:51 +0000 (16:20 +0000)]
am
889a93a4: Merge "add silvermont x86 architecture"
* commit '
889a93a49582fa17049f0424af3c1c06f70db407':
add silvermont x86 architecture
Ying Wang [Tue, 6 May 2014 16:18:56 +0000 (16:18 +0000)]
Merge "add silvermont x86 architecture"
Ying Wang [Tue, 6 May 2014 02:05:46 +0000 (02:05 +0000)]
am
2c32044d: am
b7e0bdc0: Merge "Increase system image size of generic_x86_64 to 750MB."
* commit '
2c32044d95501b376cd8f912b28c957accfb1873':
Increase system image size of generic_x86_64 to 750MB.
Ying Wang [Tue, 6 May 2014 02:03:55 +0000 (02:03 +0000)]
am
b7e0bdc0: Merge "Increase system image size of generic_x86_64 to 750MB."
* commit '
b7e0bdc02be3c505c72d431c1addd42016d0a7fc':
Increase system image size of generic_x86_64 to 750MB.
Ying Wang [Tue, 6 May 2014 02:01:58 +0000 (02:01 +0000)]
Merge "Increase system image size of generic_x86_64 to 750MB."
Ying Wang [Tue, 6 May 2014 02:01:28 +0000 (19:01 -0700)]
Increase system image size of generic_x86_64 to 750MB.
Change-Id: I0c3264c7f629bc4d8c30539590de00967188807b
Ying Wang [Tue, 6 May 2014 01:34:57 +0000 (18:34 -0700)]
Use prebuilt flex.
Bug:
14446414
Change-Id: I07fe8d7f246de853e5bae17286834268e36d260c
Colin Cross [Mon, 5 May 2014 23:09:04 +0000 (23:09 +0000)]
am
9150a90d: am
5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
* commit '
9150a90dafd6554519d41e5efffeb501268cf8de':
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Colin Cross [Mon, 5 May 2014 23:05:14 +0000 (23:05 +0000)]
am
5128237a: Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
* commit '
5128237ad3312523c5a1390efce33ad77f0f2ff0':
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Colin Cross [Mon, 5 May 2014 23:02:45 +0000 (23:02 +0000)]
Merge "build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config"
Colin Cross [Mon, 5 May 2014 22:25:41 +0000 (15:25 -0700)]
build: set TARGET_SUPPORTS_64_BIT_APPS in 64-bit config
Set TARGET_SUPPORTS_32_BIT_APPS and TARGET_SUPPORTS_64_BIT_APPS,
TARGET_PREFERS_32_BIT_APPS is enough to get apps to build for
32-bit only, and leaving TARGET_SUPPORTS_64_BIT_APPS unset
confuses zygote64 because it finds an empty 64-bit ABI list.
Change-Id: Iadea7f2b42c216710b54aeac6011a4e30e0f2eaa
Colin Cross [Mon, 5 May 2014 20:18:09 +0000 (20:18 +0000)]
am
735628e8: am
2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit '
735628e8d19fae51574bd5057c142db56797a2b0':
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
Colin Cross [Mon, 5 May 2014 20:14:18 +0000 (20:14 +0000)]
am
2ff8919d: Merge changes I7e809264,I504cea21,Ibd2165e6
* commit '
2ff8919de339209412d9da2a524f566dfcf5847f':
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
Colin Cross [Mon, 5 May 2014 20:11:28 +0000 (20:11 +0000)]
Merge changes I7e809264,I504cea21,Ibd2165e6
* changes:
build: add core_64_bit.mk
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
build: split TARGET_PREFER_32_BIT for apps and executables
Ying Wang [Mon, 5 May 2014 18:45:57 +0000 (18:45 +0000)]
am
54a570bd: am
57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '
54a570bd1da36041124965110f4d2d1206558c82':
Increase system image size of generic_x86_64 to 650MB.
Ying Wang [Mon, 5 May 2014 18:41:32 +0000 (18:41 +0000)]
am
57df0c7b: Merge "Increase system image size of generic_x86_64 to 650MB."
* commit '
57df0c7bf5a78b1c4edb7e06d22ccc91ad46b41d':
Increase system image size of generic_x86_64 to 650MB.
Ying Wang [Mon, 5 May 2014 18:37:29 +0000 (18:37 +0000)]
Merge "Increase system image size of generic_x86_64 to 650MB."
Ying Wang [Mon, 5 May 2014 18:33:06 +0000 (11:33 -0700)]
Increase system image size of generic_x86_64 to 650MB.
Change-Id: Iacf6dcd00d78039d1b19595db6f293f8f202ac5a
Justin Koh [Mon, 5 May 2014 17:46:55 +0000 (17:46 +0000)]
am
0e35df2a: Add ContactsProvider to core_tiny.
* commit '
0e35df2a7c77a6308106fa9a48f90c4729b9b8f3':
Add ContactsProvider to core_tiny.
Justin Koh [Sun, 4 May 2014 23:31:02 +0000 (16:31 -0700)]
Add ContactsProvider to core_tiny.
Add ContactsProvider to core_tiny: this is necessary to pass CTS.
Change-Id: I159109740f329e5c540ffb6f1cd1b1a7f9429d86
Dirk Dougherty [Fri, 2 May 2014 22:58:02 +0000 (22:58 +0000)]
am
611d7e14: am
379d9968: am
e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '
611d7e14e87d030cd5d89b932a1877289ab68e8d':
Merge changes from templates-sdk to templates-sdk-dyn.
Dirk Dougherty [Fri, 2 May 2014 22:54:45 +0000 (22:54 +0000)]
am
379d9968: am
e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '
379d9968ccc31701053eca7e0d809f2f52c0b964':
Merge changes from templates-sdk to templates-sdk-dyn.
Dirk Dougherty [Fri, 2 May 2014 22:50:25 +0000 (22:50 +0000)]
am
e21bed28: Merge changes from templates-sdk to templates-sdk-dyn.
* commit '
e21bed28acdd21f6000d1de30538839085ffa890':
Merge changes from templates-sdk to templates-sdk-dyn.
Dirk Dougherty [Fri, 2 May 2014 22:14:04 +0000 (15:14 -0700)]
Merge changes from templates-sdk to templates-sdk-dyn.
Change-Id: I42e42f8d412eae6fc1160594c235cda81b2baf4f
Tim Murray [Fri, 2 May 2014 18:26:14 +0000 (18:26 +0000)]
am
6ac74e6d: am
d720c5a2: Merge "Add -no-integrated-as for ARM64."
* commit '
6ac74e6d81744654b6ca36b5df369975a1fcc655':
Add -no-integrated-as for ARM64.
Tim Murray [Fri, 2 May 2014 18:24:20 +0000 (18:24 +0000)]
am
d720c5a2: Merge "Add -no-integrated-as for ARM64."
* commit '
d720c5a2a6cb44e76c20f96d33b0ac8a96060d91':
Add -no-integrated-as for ARM64.
Tim Murray [Fri, 2 May 2014 18:21:34 +0000 (18:21 +0000)]
Merge "Add -no-integrated-as for ARM64."
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
Colin Cross [Thu, 1 May 2014 00:42:03 +0000 (17:42 -0700)]
build: add core_64_bit.mk
Add a new product, core_64_bit.mk, that products can inherit from
to configure zygote and the rest of the build system for a standard
64-bit product.
Make the 64-bit emulator targets for arm64, mips64, and x86_64
inherit from it.
Change-Id: I7e809264db39472f554cd5290529f3d6499345d4
Colin Cross [Thu, 1 May 2014 01:18:02 +0000 (18:18 -0700)]
build: reverse abi list when TARGET_PREFER_32_BIT_APPS is set
If the product prefers 32-bit apps signal that preference to
PackageManager by reversing the abi list.
Also uses the absence of TARGET_SUPPORTS_32_BIT_APPS and
TARGET_SUPPORTS_64_BIT_APPS to remove those ABIs from the
ABI list.
Change-Id: I504cea21b6f800a7a9e7706b4a7123d3fb07c383
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."
Colin Cross [Thu, 1 May 2014 01:09:13 +0000 (18:09 -0700)]
build: split TARGET_PREFER_32_BIT for apps and executables
Introduce two new flags, TARGET_PREFER_32_BIT_APPS and
TARGET_PREFER_32_BIT_EXECUTABLES that individually control
compilation of apps and executables. If TARGET_PREFER_32_BIT is
set, the build system will automatically set both new flags.
Change-Id: Ibd2165e688675c2884d9e7ddf82d7dd6c28521f3
Tim Murray [Wed, 30 Apr 2014 22:55:52 +0000 (15:55 -0700)]
Add -no-integrated-as for ARM64.
Change-Id: I7faba190554aa43f43b2eb164bdc7b3bfab68ef0
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
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: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
Bill Yi [Tue, 29 Apr 2014 18:32:53 +0000 (11:32 -0700)]
Andrew Boie [Wed, 5 Mar 2014 20:10:01 +0000 (12:10 -0800)]
add silvermont x86 architecture
This is used for Baytrail targets.
Change-Id: I5a2fa6dbb8217a326ee09f5ea434885718ab3f0c
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
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: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"
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: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: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
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: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 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."