Ying Wang
cd88262744
am af93afce
: am 0a61a603
: am 3b15cdb8
: Merge "Apply LOCAL_LDLIBS to target build rules too."
...
* commit 'af93afcec91d31d1f5afb88b83413cdc7c019e70':
Apply LOCAL_LDLIBS to target build rules too.
2014-05-08 18:31:14 +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
Ying Wang
2531f78c5a
Merge "Add tool to package up built modules."
2014-05-07 00:28:55 +00:00
Ying Wang
b5baabe651
Merge "Automatically export generated .pb.h files."
2014-05-06 22:15:54 +00:00
Ying Wang
4908595634
Automatically export generated .pb.h files.
...
- Automatically export the include path of the generated .pb.h files
- Set up the dependency to make sure the .pb.h files get generated
before any dependent c/c++ files get compiled.
With this change, any module that links a proto library doesn't need
any extra setup.
Bug: 14563418
Change-Id: Iea7d19e9d8dce8e7d479c386b7a6151a95a0a0df
2014-05-06 13:06:08 -07:00
Ying Wang
80ca4a97e3
am ccd6223f
: am ba0bb801
: am a16583a0
: Merge "Fix windows/mingw build."
...
* commit 'ccd6223f5658dbc627cfe4827d3d6571107ef616':
Fix windows/mingw build.
2014-05-06 19:21:35 +00: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
bf145f8805
am bf4cdb49
: am c3b2314a
: am a37550ed
: Merge "Use prebuilt flex."
...
* commit 'bf4cdb49a3e56b37f8bd2eeeeeb4a72795dcd0a9':
Use prebuilt flex.
2014-05-06 18:52:06 +00: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
d8b39956f8
am 9c7393b8
: am e9dd544d
: am 889a93a4
: Merge "add silvermont x86 architecture"
...
* commit '9c7393b87aed5ae6acd97529b05ce26f80627259':
add silvermont x86 architecture
2014-05-06 16:28: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
Ying Wang
3b81aabbd0
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-05 16:46:52 -07:00
Marco Nelissen
5f3be2ddcd
Merge "Add libmediandk"
2014-05-05 21:28:25 +00:00
Colin Cross
39fef1f420
am 6f916664
: am 735628e8
: am 2ff8919d
: Merge changes I7e809264,I504cea21,Ibd2165e6
...
* commit '6f9166640a62f694a257a307284ea1c442f66a7b':
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:22:36 +00: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
Colin Cross
e8eef02cca
Merge "verity: switch to C++ version of build_verity_tree"
2014-05-02 23:52:16 +00:00
Chad Jones
072923238d
Expand PDK platform.zip auto-detect to named with vendor/pdk/PRODUCT
...
Change-Id: Ib813c9333541fa041a0902dab113fb7dc01f7e45
2014-05-02 12:39:02 -07:00
Tim Murray
f38dd880c9
am 09e044ea
: am 6ac74e6d
: am d720c5a2
: Merge "Add -no-integrated-as for ARM64."
...
* commit '09e044ea813cc23b1d3b5ed99b20dea9ec7c5328':
Add -no-integrated-as for ARM64.
2014-05-02 18:30:12 +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
4056798282
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.
2014-05-02 04:05:59 +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
Michael Runge
6e836116f7
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
2014-05-01 17:37:57 -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)
a1215ab943
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.
2014-05-01 09:31:59 +00: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
93dc057826
am cf53e0e0
: am 27fe9406
: am 7e65b6c1
: Merge "Remove tblgen and clang-tblgen from prebuilts."
...
* commit 'cf53e0e0aaf569d7e76472e2958dca5a44f45df2':
Remove tblgen and clang-tblgen from prebuilts.
2014-04-30 23:35:46 +00: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
Colin Cross
e5381d074f
Merge "verity: clean up verity build dependencies"
2014-04-30 20:47:58 +00:00