Xavier Ducrohet
a6a2969e02
Resolved conflicts for merge of 05a7a955
to klp-modular-dev-plus-aosp
...
Change-Id: Ife0d1ef3d5a0cb4b91c8b813d259c947c85018f8
2014-05-08 18:48:26 -07:00
Xavier Ducrohet
05a7a955c1
am afe444a5
: Merge "Remove SDK Tools from platform builds."
...
* commit 'afe444a564ed72cdda792822a0c9dab57a8c9172':
Remove SDK Tools from platform builds.
2014-05-09 00:52:34 +00:00
Xavier Ducrohet
afe444a564
Merge "Remove SDK Tools from platform builds."
2014-05-09 00:46:45 +00:00
Ying Wang
af3f1a5454
am d6214b31
: am 0d4b3df6
: Merge "Target "tests" now only builds the modules tagged as "tests""
...
* commit 'd6214b3161161faf63a60b3ad3f595569a481192':
Target "tests" now only builds the modules tagged as "tests"
2014-05-09 00:10:43 +00:00
Ying Wang
1ba08f6b7c
am 2d41656c
: am f6603f75
: Merge "Add tool to package up built modules."
...
* commit '2d41656cdb41853e42a7ea2c0597ce505ef51750':
Add tool to package up built modules.
2014-05-09 00:10:43 +00:00
Ying Wang
d6214b3161
am 0d4b3df6
: Merge "Target "tests" now only builds the modules tagged as "tests""
...
* commit '0d4b3df6aa495ab2aaabe3a8d5c9c6ad69ab5667':
Target "tests" now only builds the modules tagged as "tests"
2014-05-09 00:06:36 +00:00
Ying Wang
2d41656cdb
am f6603f75
: Merge "Add tool to package up built modules."
...
* commit 'f6603f753d492823e19d0677d5a9ccfc16f51805':
Add tool to package up built modules.
2014-05-09 00:06:35 +00:00
Ying Wang
07b2055d3e
Target "tests" now only builds the modules tagged as "tests"
...
But not install them.
This prevents "make tests" polluting system.img or userdata.img.
We have new mechanism to build and package up modules into zip file in
build/core/tasks/tools.
Change package-modules.mk to install DATA/ instead of data/ in the
zip file; Better handle of module name conflicting.
Bug: 13585955
Change-Id: I7586a8c7995b984c9ead0ba2fa84dd5d2dd20bd1
2014-05-08 17:01:25 -07:00
Ying Wang
989ac38d93
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
2014-05-08 17:01:06 -07:00
Brian Carlstrom
676c8f0450
am 4ed19f0f
: am 1e63c2d1
: Merge "Add dalvik.vm.dex2oat-flags for eng build"
...
* commit '4ed19f0f4294544d0447025f0079a9d9e185a495':
Add dalvik.vm.dex2oat-flags for eng build
2014-05-08 21:57:32 +00:00
Brian Carlstrom
4ed19f0f42
am 1e63c2d1
: Merge "Add dalvik.vm.dex2oat-flags for eng build"
...
* commit '1e63c2d15cba608a154bbd563f96dde334691147':
Add dalvik.vm.dex2oat-flags for eng build
2014-05-08 21:53:14 +00:00
Xavier Ducrohet
51e303a281
Remove SDK Tools from platform builds.
...
(cherry picked from commit edf30221b4890673dc714a1efef3b5faf4ae1522)
Change-Id: Ia74c2ece1528adca10a4eec24e73b4ce361af1a9
2014-05-08 14:50:15 -07:00
Brian Carlstrom
1e63c2d15c
Merge "Add dalvik.vm.dex2oat-flags for eng build"
2014-05-08 21:49:31 +00:00
Ying Wang
af93afcec9
am 0a61a603
: am 3b15cdb8
: Merge "Apply LOCAL_LDLIBS to target build rules too."
...
* commit '0a61a6032ccfe5b26395da1a0a9512957797fa69':
Apply LOCAL_LDLIBS to target build rules too.
2014-05-08 00:27:03 +00:00
Ying Wang
0a61a6032c
am 3b15cdb8
: Merge "Apply LOCAL_LDLIBS to target build rules too."
...
* commit '3b15cdb854dfe79507cace8ce54828861bbe7a8c':
Apply LOCAL_LDLIBS to target build rules too.
2014-05-08 00:21:35 +00:00
Ying Wang
de36cd72e8
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
2014-05-07 11:33:19 -07:00
Brian Carlstrom
fceb115bd6
Add dalvik.vm.dex2oat-flags for eng build
...
Bug: 12869646
Change-Id: I794320267c846225931f12075c7f32d7848081e9
2014-05-06 20:40:11 -07:00
Ying Wang
ccd6223f56
am ba0bb801
: am a16583a0
: Merge "Fix windows/mingw build."
...
* commit 'ba0bb801c3cfee582e454432e6a0a75491e54236':
Fix windows/mingw build.
2014-05-06 19:19:15 +00:00
Ying Wang
ba0bb801c3
am a16583a0
: Merge "Fix windows/mingw build."
...
* commit 'a16583a0880f574937f08bf2c86be72b0f4b9274':
Fix windows/mingw build.
2014-05-06 19:16:12 +00:00
Ying Wang
1401c76c2f
Fix windows/mingw build.
...
Bug: 14446414
Change-Id: I9d12ed8afb6d4d5a09ef9b2844eb193b52b74271
2014-05-06 12:11:09 -07:00
Ying Wang
bf4cdb49a3
am c3b2314a
: am a37550ed
: Merge "Use prebuilt flex."
...
* commit 'c3b2314a58e8d6f90766db2ef82303bafcefb766':
Use prebuilt flex.
2014-05-06 18:46:10 +00:00
Ying Wang
c3b2314a58
am a37550ed
: Merge "Use prebuilt flex."
...
* commit 'a37550edd39b3520839251b2a4acceca779a8a8b':
Use prebuilt flex.
2014-05-06 18:43:28 +00:00
Ying Wang
a37550edd3
Merge "Use prebuilt flex."
2014-05-06 18:41:00 +00:00
Ying Wang
9c7393b87a
am e9dd544d
: am 889a93a4
: Merge "add silvermont x86 architecture"
...
* commit 'e9dd544dfed3a974d2bb2e6f783238ecfe64fb6c':
add silvermont x86 architecture
2014-05-06 16:24:30 +00:00
Ying Wang
e9dd544dfe
am 889a93a4
: Merge "add silvermont x86 architecture"
...
* commit '889a93a49582fa17049f0424af3c1c06f70db407':
add silvermont x86 architecture
2014-05-06 16:20:51 +00:00
Ying Wang
889a93a495
Merge "add silvermont x86 architecture"
2014-05-06 16:18:56 +00:00
Ying Wang
fb1236a9a8
Use prebuilt flex.
...
Bug: 14446414
Change-Id: I07fe8d7f246de853e5bae17286834268e36d260c
2014-05-05 18:34:57 -07:00
Colin Cross
6f9166640a
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
2014-05-05 20:18:09 +00:00
Colin Cross
735628e8d1
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
2014-05-05 20:14:18 +00:00
Colin Cross
2ff8919de3
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
2014-05-05 20:11:28 +00:00
Tim Murray
09e044ea81
am 6ac74e6d
: am d720c5a2
: Merge "Add -no-integrated-as for ARM64."
...
* commit '6ac74e6d81744654b6ca36b5df369975a1fcc655':
Add -no-integrated-as for ARM64.
2014-05-02 18:26:14 +00:00
Tim Murray
6ac74e6d81
am d720c5a2
: Merge "Add -no-integrated-as for ARM64."
...
* commit 'd720c5a2a6cb44e76c20f96d33b0ac8a96060d91':
Add -no-integrated-as for ARM64.
2014-05-02 18:24:20 +00:00
Tim Murray
d720c5a2a6
Merge "Add -no-integrated-as for ARM64."
2014-05-02 18:21:34 +00:00
Ying Wang
372df5a49e
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.
2014-05-02 04:03:18 +00:00
Ying Wang
887a52d022
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.
2014-05-02 04:00:30 +00:00
Ying Wang
a6b8025a81
Merge "Add WITH_DEXPREOPT to the list of protected global variables."
2014-05-02 03:57:33 +00:00
Ying Wang
9c44021535
Add WITH_DEXPREOPT to the list of protected global variables.
...
Bug: 14380196
Change-Id: I02cff39eeaf2deddf434c0c310063e4b341edd43
2014-05-01 20:55:30 -07:00
Colin Cross
2a4f0ff32f
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
2014-05-01 10:55:43 -07:00
Torne (Richard Coles)
2b2a495317
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.
2014-05-01 09:25:02 +00:00
Torne (Richard Coles)
f0b5bfec7b
am a0267df2
: Merge "Remove libpac and v8 from the 64-bit blacklist."
...
* commit 'a0267df234db59d34891a01e0761233abc9ae4b1':
Remove libpac and v8 from the 64-bit blacklist.
2014-05-01 09:20:19 +00:00
Torne (Richard Coles)
a0267df234
Merge "Remove libpac and v8 from the 64-bit blacklist."
2014-05-01 09:17:26 +00:00
Colin Cross
a3339e98e6
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
2014-04-30 18:18:59 -07:00
Tim Murray
6f144b8f65
Add -no-integrated-as for ARM64.
...
Change-Id: I7faba190554aa43f43b2eb164bdc7b3bfab68ef0
2014-04-30 15:55:52 -07:00
Tim Murray
cf53e0e0aa
am 27fe9406
: am 7e65b6c1
: Merge "Remove tblgen and clang-tblgen from prebuilts."
...
* commit '27fe940676b568bb9a0af889028495fab73853f2':
Remove tblgen and clang-tblgen from prebuilts.
2014-04-30 21:54:08 +00:00
Tim Murray
27fe940676
am 7e65b6c1
: Merge "Remove tblgen and clang-tblgen from prebuilts."
...
* commit '7e65b6c1e53a51db0aa65126f2453f27daa0f22f':
Remove tblgen and clang-tblgen from prebuilts.
2014-04-30 21:52:33 +00:00
Tim Murray
75b58cc827
Remove tblgen and clang-tblgen from prebuilts.
...
Change-Id: I89fb74da5a516d0f768f72518a401216f8a5b1a8
2014-04-30 13:54:32 -07:00
Bill Yi
1e4adfa837
Merge commit '8113e43601aac7702b9ec007e81a179826143d1e' into HEAD
2014-04-29 11:32:53 -07:00
Andrew Boie
155fc8b5fe
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>
2014-04-30 01:23:25 +08:00
Torne (Richard Coles)
91d4944434
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
2014-04-29 10:23:56 +01:00
Andrew Hsieh
d815dbd134
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
2014-04-29 00:12:01 +00:00