p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,968 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

5069 Commits

Author SHA1 Message Date
Ying Wang c4595868c4 Add global variable HOST_LIBRARY_PATH. 
With multilib host build, the build system installs host
shared libraries to different directories depending on a
library's bitness:
- HOST_OUT_SHARED_LIBRARIES points to the library path of 64-bit;
- 2ND_HOST_OUT_SHARED_LIBRARIES points to the library path of 32-bit;
- If you don't care the bitness of the libraries and just want whatever
  version the librareies are built by default, use HOST_LIBRARY_PATH.

Bug:13751317
Change-Id:Id4c818941dc4ea35d795767c76f698529bd6aebb
 2014-06-10 12:04:56 -07:00
Ying Wang 2d19cbd279 resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp 
Change-Id: Ib636e501413c0821685d505f62f56d80d145ff7f
 2014-06-10 09:45:45 -07:00
Ying Wang 2713fcebba Switch to 32-bit-by-default host multilib build. 
Also we don't need to force LLVM built from source, for we already force
LLVM to be built as 32-bit.

Bug: 13751317
Change-Id: Ifadf1988d28b60cb06316de50f5bdc1834f1acc0
 2014-06-09 17:48:05 -07:00
Vineeta Srivastava 19f6933724 Merge "Add synaptics to vendor owner whitelist" 2014-06-09 23:27:11 +00:00
Ying Wang b06c655e58 am 322362cf: am c0275247: Merge "build native tests for 32-bit and 64-bit" 
* commit '322362cf01e6d1ed6c73dd27f5a4e162610f55c4':
  build native tests for 32-bit and 64-bit
 2014-06-09 23:00:02 +00:00
Ying Wang c02752473f Merge "build native tests for 32-bit and 64-bit" 2014-06-09 22:53:00 +00:00
Ying Wang fe9ad0975a am b1f65358: am 5ad17493: Merge "Support .asm being compiled by yasm targeted for x86." 
* commit 'b1f65358a8af7548dfb02de281b081fc356881b4':
  Support .asm being compiled by yasm targeted for x86.
 2014-06-09 21:51:01 +00:00
Ying Wang 5ad17493cd Merge "Support .asm being compiled by yasm targeted for x86." 2014-06-09 21:43:56 +00:00
Erik Pasternak 30e677081b am e1d76eed: Merge "Revert "Integrate build_font.py"" into lmp-preview-dev 
* commit 'e1d76eed322e620213cd4f936a29229a7658c6a1':
  Revert "Integrate build_font.py"
 2014-06-09 15:55:48 +00:00
Deepanshu Gupta 12d786b56d am 8723f9e2: Merge "Integrate build_font.py" into lmp-preview-dev 
* commit '8723f9e2127204e19b00b0c19d091bee7e3e1b0c':
  Integrate build_font.py
 2014-06-09 15:55:29 +00:00
Erik Pasternak e1d76eed32 Merge "Revert "Integrate build_font.py"" into lmp-preview-dev 2014-06-08 20:12:41 +00:00
Erik Pasternak 21cf439581 Revert "Integrate build_font.py" 
This CL broke the SDK builds.

This reverts commit 9eebd78f6e.

Change-Id: I973b40688602461bd3b0f8c1e1beb53b9fbec83c
 2014-06-08 19:31:01 +00:00
Deepanshu Gupta 8723f9e212 Merge "Integrate build_font.py" into lmp-preview-dev 2014-06-07 23:33:12 +00:00
Stephen Hines d17e71f185 am 69d5bd7c: am e266873b: am 1a8f0d3b: Merge "Move comment out of recipe section" 
* commit '69d5bd7cbc873c86685c463ac3dc7ab8de9e71e7':
  Move comment out of recipe section
 2014-06-06 21:33:48 +00:00
Stephen Hines 69d5bd7cbc am e266873b: am 1a8f0d3b: Merge "Move comment out of recipe section" 
* commit 'e266873b211289ce07420ec2c51208ff83c49c36':
  Move comment out of recipe section
 2014-06-06 21:30:57 +00:00
Bart Sears 0e23c5e305 am 3b118a55: MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE 
* commit '3b118a55b94d96f8ac1e1f903d17ed650ccd0355':
  MR2.1 - Version 4.4.4.  Here we go!  DO NOT MERGE
 2014-06-06 21:07:46 +00:00
Bart Sears 3b118a55b9 MR2.1 - Version 4.4.4. Here we go! DO NOT MERGE 
Make is so.

Change-Id: I06b8c8c491e6e355124b6fea41893155ea4c07d0
 2014-06-06 20:41:08 +00:00
Stephen Hines 8ff9252680 Move comment out of recipe section 
If we keep a comment in the recipe, it prints out whenever that component
gets built.

Change-Id: Idb99a9edc02cfb87e35e59b7fd37588b928b98a5
 2014-06-06 12:51:47 -07:00
Ying Wang dd4db3058a am 56ec31cf: am 3fe9a277: am d0f0918b: Merge "Reenable ccache." 
* commit '56ec31cfca1ed5f9d833d73c327b2799601cd5a4':
  Reenable ccache.
 2014-06-06 18:43:44 +00:00
Ying Wang 56ec31cfca am 3fe9a277: am d0f0918b: Merge "Reenable ccache." 
* commit '3fe9a277fe1f21b947bb7ac5d093d969eb10dc6b':
  Reenable ccache.
 2014-06-06 18:40:14 +00:00
Ying Wang 67ed25f3a6 Reenable ccache. 
The previous commit 994c84fb virtually disabled ccache, due to the
deferred evaluation of CC_WRAPPER/CXX_WRAPPER.

Change-Id: Ie0d70a23a55190bd9b24b72edc9158b6976e1d5d
 2014-06-06 11:18:04 -07:00
Ying Wang 7b913ce6fa Support .asm being compiled by yasm targeted for x86. 
Change-Id: Icd6626a082facf920b0e49e2fbe8861e94400552
 2014-06-06 11:00:36 -07:00
Vineeta Srivastava 5c80218b8e Add synaptics to vendor owner whitelist 
Change-Id: Idef39568cbcc53cb50badcc8d59b7770eef10d5e
 2014-06-05 22:25:56 +00:00
Tim Murray a526c48982 am 45c39300: am 3c52ff07: am e564c0cb: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools." 
* commit '45c3930084180857d7b09c0859805506e7ede847':
  Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
 2014-06-04 19:22:56 +00:00
Tim Murray 45c3930084 am 3c52ff07: am e564c0cb: Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools." 
* commit '3c52ff07141c236b51a2ccfe5fdb3de33421bd3b':
  Switch name from tblgen -> llvm-tblgen for consistency with upstream tools.
 2014-06-04 19:20:29 +00:00
Tim Murray e564c0cbd0 Merge "Switch name from tblgen -> llvm-tblgen for consistency with upstream tools." 2014-06-04 19:00:38 +00:00
Ying Wang 3a9cb0ca11 Merge "Allow to build the update.zip for emulator build." 2014-06-04 17:40:45 +00:00
Ying Wang e8dc18680f am dc7ff054: am bc080d51: am 2a386e0c: Allow to build the update.zip for emulator build. 
* commit 'dc7ff05427e885a59e8884e0f8e10a6c78f2842b':
  Allow to build the update.zip for emulator build.
 2014-06-04 17:30:32 +00:00
Ying Wang dc7ff05427 am bc080d51: am 2a386e0c: Allow to build the update.zip for emulator build. 
* commit 'bc080d510f022da8055b89b85e02d91e74c3757d':
  Allow to build the update.zip for emulator build.
 2014-06-04 17:26:00 +00:00
Ying Wang bc080d510f am 2a386e0c: Allow to build the update.zip for emulator build. 
* commit '2a386e0cfbdfa009038acede85876a7643f297f5':
  Allow to build the update.zip for emulator build.
 2014-06-04 17:22:21 +00:00
Ying Wang 2a386e0cfb Allow to build the update.zip for emulator build. 
img_from_target_files.py just skips the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
 2014-06-04 17:04:14 +00:00
Neil Fuller 3ca25da84e Merge "Add the okhttp tests as a new CTS package" 2014-06-04 10:53:25 +00:00
Andrew Hsieh 51b6c14423 Merge "Add -latomic to all target builds" into lmp-preview-dev 2014-06-04 07:38:25 +00:00
Stephen Hines 5339640da6 Switch name from tblgen -> llvm-tblgen for consistency with upstream tools. 
Change-Id: I7735fd88104ff95001dd5f88a1c387df9af993ad
 2014-06-03 18:28:44 -07:00
Ying Wang f8824aff68 Allow to build the update.zip for emulator build. 
img_from_target_files.py just skipps the boot.img and recovery.img since
there is no kernel or recovery.fstab for emulator.

Bug: 15383279
Change-Id: I4035193e6ab933194ff1417dfae4eab963fe5301
 2014-06-03 14:07:27 -07:00
Primiano Tucci b641702c08 am 1d6506ca: Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler." 
* commit '1d6506ca4bb62a8f66cf5f0a72bde096115e757a':
  Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler.
 2014-06-03 13:13:43 +00:00
Primiano Tucci 454de52c96 Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler. 
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)

(cherry-picked from AOSP 994c84fb40)

Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
 2014-06-03 12:24:22 +01:00
Primiano Tucci 1d6506ca4b Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler." 2014-06-03 09:29:51 +00:00
Ying Wang e3e421f851 Move sdk staging dir to a product-specific dir 
So we can do incremental build across different SDK products.

(cherry picked from commit d7af176199)

Change-Id: I30ebed5328123629519a64c793f94fc8d5aa09a8
 2014-06-02 18:32:54 -07:00
Ying Wang 9c777b3718 am dfafee3b: am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir" 
* commit 'dfafee3b782cc48562126b9c4748cfa2f49f3158':
  Move sdk staging dir to a product-specific dir
 2014-06-03 01:27:55 +00:00
Ying Wang dfafee3b78 am 7f349dc9: am 40b7e342: Merge "Move sdk staging dir to a product-specific dir" 
* commit '7f349dc968a3fc76f48e1e199f1036b40e582851':
  Move sdk staging dir to a product-specific dir
 2014-06-03 01:25:23 +00:00
Ying Wang 7f349dc968 am 40b7e342: Merge "Move sdk staging dir to a product-specific dir" 
* commit '40b7e34240be756bbf1542b63eef6332024d067e':
  Move sdk staging dir to a product-specific dir
 2014-06-03 01:22:51 +00:00
Ying Wang d7af176199 Move sdk staging dir to a product-specific dir 
So we can do incremental build across different SDK products.

Change-Id: If3f082e4b92d00e7ccda980610e1d967d44da622
 2014-06-02 16:16:53 -07:00
Primiano Tucci 994c84fb40 Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler. 
This is to make it possible to wrap the compiler invocations with
custom wrappers (e.g., distcc/goma) by setting the CC_WRAPPER,
CXX_WRAPPER, JAVAC_WRAPPER variables in the build environment (without
having to know in advance the path to the compiler)

Change-Id: Ide800c24f0c2ebbb1cfb358bd8f99ec8a9d41253
 2014-06-02 20:12:57 +01:00
Stephen Hines 88bd5edaa4 am 15d49c3b: am 85e0dce5: am a8b65126: Merge "Add -shared to clang LDFLAGS." 
* commit '15d49c3b30d320422d0209c8726eb0c5cec92d41':
  Add -shared to clang LDFLAGS.
 2014-05-30 23:15:43 +00:00
Stephen Hines 15d49c3b30 am 85e0dce5: am a8b65126: Merge "Add -shared to clang LDFLAGS." 
* commit '85e0dce5f49bfcad97494a674f8a50219914962a':
  Add -shared to clang LDFLAGS.
 2014-05-30 23:08:50 +00:00
Stephen Hines 85e0dce5f4 am a8b65126: Merge "Add -shared to clang LDFLAGS." 
* commit 'a8b65126cae5335d4c8b31fbf7700907fd2c48dd':
  Add -shared to clang LDFLAGS.
 2014-05-30 23:04:37 +00:00
Nick Kralevich 43c36c8201 am ee7493cc: am 329988c2: am a42e0f50: Merge "arm64: restore relro/now" 
* commit 'ee7493ccb91256e61414e8e0bad8d7173cb5d22e':
  arm64: restore relro/now
 2014-05-30 23:02:54 +00:00
Stephen Hines a8b65126ca Merge "Add -shared to clang LDFLAGS." 2014-05-30 22:59:48 +00:00
Nick Kralevich ee7493ccb9 am 329988c2: am a42e0f50: Merge "arm64: restore relro/now" 
* commit '329988c277553621c40bbfff85e9848783992040':
  arm64: restore relro/now
 2014-05-30 22:59:28 +00:00
Nick Kralevich 329988c277 am a42e0f50: Merge "arm64: restore relro/now" 
* commit 'a42e0f50162721bc54c113ef1ed3058cfb38ae67':
  arm64: restore relro/now
 2014-05-30 22:56:11 +00:00
Nick Kralevich 45545761d2 arm64: restore relro/now 
The bug which required this option has been fixed.

Bug: 11434996
Change-Id: I7ab7e2e8ba7b993281902832d01b3ee3ba9e06ef
 2014-05-30 15:46:40 -07:00
Nick Kralevich bf9f0712f2 am 46c48a0c: am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image." 
* commit '46c48a0c34dfafde4cd55956ffbb9251a1cdac02':
  Use a separate policy for the recovery image.
 2014-05-30 19:01:37 +00:00
Nick Kralevich 46c48a0c34 am 1df5b37b: am 61cf065a: Merge "Use a separate policy for the recovery image." 
* commit '1df5b37b5b73324300ae1b5f255c1a772c65328a':
  Use a separate policy for the recovery image.
 2014-05-30 18:27:03 +00:00
Nick Kralevich 1df5b37b5b am 61cf065a: Merge "Use a separate policy for the recovery image." 
* commit '61cf065ae9247a200208dc7df0234e03caff3605':
  Use a separate policy for the recovery image.
 2014-05-30 18:23:41 +00:00
Nick Kralevich 61cf065ae9 Merge "Use a separate policy for the recovery image." 2014-05-30 18:20:48 +00:00
Andrew Hsieh 0c87f3d733 Add -latomic to all target builds 
Projects using stdatomic.h needs libatomic.a in case compiler can't
expand all __atomic* intrinsics. eg, __atomic_is_lock_free in
armeabi/mips.

Adding libatomic.a globally makes more sense than adding
"LOCAL_LDLIB += -latomic " in each project including <stdatomic.h>.
Projects don't need atomic operations won't get redundant DT_NEEDED
entry because libatomic.a is not a shared library.

Change-Id: I81dbf524544c848e667e18ab5eeabff75b5063ef
 2014-05-30 10:39:24 -07:00
Deepanshu Gupta 9eebd78f6e Integrate build_font.py 
Executle the build_font.py script to rename the PS name of the fonts to
be shipped with the SDK.

Change-Id: I14f8a27b9da8d4aa7b9d2773cf4aa84c6f3c22fe
 2014-05-30 10:29:34 -07:00
Neil Fuller 4fdf6743d9 Add the okhttp tests as a new CTS package 
Bug: 14462336
Change-Id: I74e986b2d6a25a5e4304159d214c16a51a7f7c5f
 2014-05-30 13:56:32 +01:00
Andrew Hsieh 4e5c08d420 am fb0a19d6: am dc41aa32: am 5c2c70de: Merge "Add -latomic to all target builds" 
* commit 'fb0a19d603b0f2c00ec3491a39d37103496cbca9':
  Add -latomic to all target builds
 2014-05-30 11:50:52 +00:00
Andrew Hsieh fb0a19d603 am dc41aa32: am 5c2c70de: Merge "Add -latomic to all target builds" 
* commit 'dc41aa3254cbf443dd08c827e587cf261d1f7b82':
  Add -latomic to all target builds
 2014-05-30 07:56:53 +00:00
Andrew Hsieh dc41aa3254 am 5c2c70de: Merge "Add -latomic to all target builds" 
* commit '5c2c70de88a6c126460c88cfa64561d7cb2cc030':
  Add -latomic to all target builds
 2014-05-30 07:46:14 +00:00
Andrew Hsieh 5c2c70de88 Merge "Add -latomic to all target builds" 2014-05-30 07:44:02 +00:00
Tim Murray 0f9276d4ba Add -shared to clang LDFLAGS. 
TOT clang doesn't do the right thing with regards to -pie without this.

Change-Id: Ic14cfb25d96359eb18899c09ebaf1d311e937d01
 2014-05-29 17:54:07 -07:00
Daniel Rosenberg dde3184ae8 Added variables to support seperate vendor patition. 
Change-Id: I73cc76697e138aa8ce1273d410391d55c8d7f34f
Signed-off-by: Daniel Rosenberg <drosen@google.com>
 2014-05-29 15:42:27 -07:00
Brian Carlstrom c93c03081b am ab6f84e3: am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so" 
* commit 'ab6f84e3d1886237e9516ebe4660d8e1042a6a75':
  Only enable WITH_DEXPREOPT by default for libdvm.so
 2014-05-29 21:06:19 +00:00
Vineeta Srivastava 3b06789001 Merge "add moto to vendor owner whitelist" 2014-05-29 20:53:43 +00:00
Stephen Smalley 5520f28653 Use a separate policy for the recovery image. 
Only the recovery image needs to include the recovery domain
in its policy, so create a separate policy for the recovery image
and replace the root policy with this one when building the
recovery image.

Depends on the change with the same Change-Id in external/sepolicy.

Change-Id: I444107f9821eabf4164ba07a44d03bd71e719989
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-05-29 16:42:49 -04:00
Brian Carlstrom ab6f84e3d1 am e0df9d95: Merge "Only enable WITH_DEXPREOPT by default for libdvm.so" 
* commit 'e0df9d9577c19975adbf6e5a3489946c8f91ad1e':
  Only enable WITH_DEXPREOPT by default for libdvm.so
 2014-05-29 19:40:02 +00:00
Andrew Hsieh 4c952d72b7 Add -latomic to all target builds 
Projects using stdatomic.h needs libatomic.a in case compiler can't
expand all __atomic* intrinsics. eg, __atomic_is_lock_free in
armeabi/mips.

Adding libatomic.a globally makes more sense than adding
"LOCAL_LDLIB += -latomic " in each project including <stdatomic.h>.
Projects don't need atomic operations won't get redundant DT_NEEDED
entry because libatomic.a is not a shared library.

Change-Id: I81dbf524544c848e667e18ab5eeabff75b5063ef
 2014-05-29 11:40:46 -07:00
Brian Carlstrom 3f5ff08dc5 Only enable WITH_DEXPREOPT by default for libdvm.so 
Bug: 14298175

(cherry picked from commit 9f8e214a91)

Change-Id: I96ba4e198b7bc1b7d9a502c432590f41c87d05c4
 2014-05-29 09:38:04 -07:00
Brian Carlstrom e469ea36ff am 9f8e214a: Only enable WITH_DEXPREOPT by default for libdvm.so 
* commit '9f8e214a919097284a88cb19a1b85ceafc202a67':
  Only enable WITH_DEXPREOPT by default for libdvm.so
 2014-05-29 16:37:20 +00:00
Brian Carlstrom 9f8e214a91 Only enable WITH_DEXPREOPT by default for libdvm.so 
Bug: 14298175
Change-Id: I42255a61667f88924a779fff1812134044c7b6b2
 2014-05-28 22:13:07 -07:00
Ying Wang 8b73a86834 am 834ec0ea: am d3ddfdf8: am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files." 
* commit '834ec0ead591cf64a5f660af0210e95728e08c4f':
  Add a dummy build recipe for generated RS cpp files.
 2014-05-28 23:45:29 +00:00
Ying Wang 834ec0ead5 am d3ddfdf8: am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files." 
* commit 'd3ddfdf847eaf44219943cda441273be85b01635':
  Add a dummy build recipe for generated RS cpp files.
 2014-05-28 23:41:42 +00:00
Ying Wang d3ddfdf847 am b3bed595: Merge "Add a dummy build recipe for generated RS cpp files." 
* commit 'b3bed5952b44e69dc9e1988beb4092303084ef61':
  Add a dummy build recipe for generated RS cpp files.
 2014-05-28 23:38:46 +00:00
Ying Wang b3bed5952b Merge "Add a dummy build recipe for generated RS cpp files." 2014-05-28 23:33:35 +00:00
Ying Wang f0c4184852 am d40776aa: am 65afd710: Merge "Add a dummy build recipe for the proto generated header files" 
* commit 'd40776aa8800d62a182eeed82c3ac1cef90e69ab':
  Add a dummy build recipe for the proto generated header files
 2014-05-28 23:31:02 +00:00
Ying Wang d40776aa88 am 65afd710: Merge "Add a dummy build recipe for the proto generated header files" 
* commit '65afd710a592390671beb5da15a87b127a5f2125':
  Add a dummy build recipe for the proto generated header files
 2014-05-28 23:28:58 +00:00
Ying Wang 65afd710a5 Merge "Add a dummy build recipe for the proto generated header files" 2014-05-28 23:26:01 +00:00
Ying Wang 81ab8339fe Add a dummy build recipe for generated RS cpp files. 
Previously the RS cpp files are generated by the timestamp rule. Though
we have the generated RS cpp files depend on the timestamp file, we
don't have a build recipe. In such case gmake does some "optimization"
that it skip recompiling the generated cpp files, because it assumes the
generated cpp files are already up to date even if the rs files have
been updated.

Bug: 15313144
Change-Id: Ie69ecd2c788057d3619f9c7d2a125d44c4a534a1
 2014-05-28 16:17:09 -07:00
Ying Wang 5186dac02b Add a dummy build recipe for the proto generated header files 
This fixed issue that gnumake skip updating the cpp file that includes
the generated header file when the .proto file gets updated.
For example:
Say a.cc includes b.pb.h, since b.pb.h is just byproduct of the rule
that generates b.pb.cc, and though we have dependency "b.pb.h :
b.pb.cc", but we don't have build recipe for that rule.
Gmake stupidly thinks that b.pb.h must not be updated in that case so
it skips all targets that depends on b.pb.h!
With the dumy build recipe, gmake now doesn't skip the depedent targets.

Bug: 13009798
Change-Id: I39adc09b7656bdd023f578fb8933667944fd974c
 2014-05-28 16:15:13 -07:00
Brian Carlstrom 9843e86395 am ed97938c: am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart" 
* commit 'ed97938caa7a1e7cde1d060ebbe6f6af1279188e':
  Move to dalvik.vm.lib.2 to force default to libart
 2014-05-28 23:13:28 +00:00
Brian Carlstrom ee26bf6a84 resolved conflicts for merge of 7e127ebe to master 
Change-Id: I3f4eba3289c14da55d7d79ccf946b71dfc4062d1
 2014-05-28 16:02:45 -07:00
Brian Carlstrom ed97938caa am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart" 
* commit '7df64f7c0d933e3a5f18e0d15402f62b819ef8f0':
  Move to dalvik.vm.lib.2 to force default to libart
 2014-05-28 22:31:44 +00:00
Ying Wang 1ef0a635f3 Fix pattern rules for $(installed_odex) for libdvm. 
When the VM is libdvm, we don't put the odex files in an arch specific
subdirectory. The previous pattern rules don't work because of the extra
"/". With this change, % evaluates to empty string when it's built for
libdvm; % evaluates to "<arch_name>/" when it's built for libart.
Also removed use of $(create-empty-package), which may causes file name
(dummy) conflict with the rule of package.apk.

Bug: 15311527

(cherry picked from commit 994c226b91)

Change-Id: I5469ef1994f2ba91a9c25126349156752fc35b4b
 2014-05-28 15:09:55 -07:00
Brian Carlstrom 31f5db27c6 Move to dalvik.vm.lib.2 to force default to libart 
Bug: 14298175

(cherry picked from commit 7e127ebe0b)

Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361
 2014-05-28 14:49:34 -07:00
Ying Wang cf68ba00d4 am dcf90646: am 8898f2e2: am f4999d3b: Merge "Fix pattern rules for for libdvm." 
* commit 'dcf90646b0122b09755014832a67b7c44bc2e1ac':
  Fix pattern rules for $(installed_odex) for libdvm.
 2014-05-28 21:36:11 +00:00
Brian Carlstrom 7e127ebe0b Move to dalvik.vm.lib.2 to force default to libart 
Bug: 14298175
Change-Id: Ie4a716dddddc4d339fd4f47033f2c546a1ca118a
 2014-05-28 14:31:46 -07:00
Ying Wang dcf90646b0 am 8898f2e2: am f4999d3b: Merge "Fix pattern rules for for libdvm." 
* commit '8898f2e261d1bb2b389971803a1f4a23639ade9e':
  Fix pattern rules for $(installed_odex) for libdvm.
 2014-05-28 21:31:19 +00:00
Ying Wang 8898f2e261 am f4999d3b: Merge "Fix pattern rules for for libdvm." 
* commit 'f4999d3b8a0d09e790767176c543df1c2ad53c5a':
  Fix pattern rules for $(installed_odex) for libdvm.
 2014-05-28 21:28:42 +00:00
Ying Wang 994c226b91 Fix pattern rules for $(installed_odex) for libdvm. 
When the VM is libdvm, we don't put the odex files in an arch specific
subdirectory. The previous pattern rules don't work because of the extra
"/". With this change, % evaluates to empty string when it's built for
libdvm; % evaluates to "<arch_name>/" when it's built for libart.
Also removed use of $(create-empty-package), which may causes file name
(dummy) conflict with the rule of package.apk.

Bug: 15311527
Change-Id: I9f9089bc1896b78c1f47834afdb28a3a51d34480
 2014-05-28 14:23:26 -07:00
Ying Wang 9df5043594 resolved conflicts for merge of 536d4a76 to master 
Change-Id: Ib655d08e5c9272aef1fd1e130b5fb2b63148a55e
 2014-05-28 11:05:47 -07:00
Rick Zhang 6eea8e25fd add moto to vendor owner whitelist 
Change-Id: I63760a380a17fe096c2aff1133bba336ac8bd7f1
 2014-05-28 10:31:30 -07:00
Ying Wang 536d4a761b am 7e4c73d5: am aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix." 
* commit '7e4c73d5885402f5c301309094ce3dbceef0ecd3':
  Support LOCAL_CLANG with arch/bit suffix.
 2014-05-28 16:18:56 +00:00
Ying Wang 7e4c73d588 am aae7e3fa: Merge "Support LOCAL_CLANG with arch/bit suffix." 
* commit 'aae7e3fa66ecf6bf796ba9a107d8f066498ab10b':
  Support LOCAL_CLANG with arch/bit suffix.
 2014-05-28 16:14:54 +00:00
Vineeta Srivastava 1bd266d006 Merge "Add 'qti' to vendor whitelist" 2014-05-28 15:40:19 +00:00
Ajay Dudani 37a4b4ded9 Add 'qti' to vendor whitelist 
Bug: 15287127
Change-Id: I4440fb0428a345edb782888fe278b8fd6d809b5d
 2014-05-27 14:51:51 -07:00
Jeff Brown bf59b8b340 Merge "Support more precise package exclusion from JAR files." 2014-05-27 21:46:57 +00:00
Ying Wang 824344af00 Support LOCAL_CLANG with arch/bit suffix. 
Precedence: LOCAL_CLANG_<arch> > LOCAL_CLANG_<32|64> > LOCAL_CLANG.

Bug: 15257067
Change-Id: I86b72f3bec162834591287d3b5231b5f40f9a431
 2014-05-27 13:06:08 -07:00
Dan Albert 49df673669 am cd74f307: am a5b0b130: am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs"" 
* commit 'cd74f3073c4d0fa7d566705b0eb38c635c1c9344':
  Revert "Fix for duplicate names in whole static libs"
 2014-05-27 19:50:55 +00:00
Dan Albert cd74f3073c am a5b0b130: am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs"" 
* commit 'a5b0b1303d38fb1cd31575383c647eb8b1db5e36':
  Revert "Fix for duplicate names in whole static libs"
 2014-05-27 19:47:08 +00:00
Dan Albert a5b0b1303d am 3805f619: Merge "Revert "Fix for duplicate names in whole static libs"" 
* commit '3805f619156163eab8ad92fd51b4a431be1287bd':
  Revert "Fix for duplicate names in whole static libs"
 2014-05-27 19:44:19 +00:00
Dan Albert 3805f61915 Merge "Revert "Fix for duplicate names in whole static libs"" 2014-05-27 19:41:46 +00:00
Dan Albert 3c12b5c02b Revert "Fix for duplicate names in whole static libs" 
This reverts commit 0e5ce8be34.

Change-Id: I68b776cb915fd7be8299ddb2899907046dddadf3
 2014-05-27 19:30:36 +00:00
Dan Albert d8303d9021 am e6918b55: am 212772f6: am 31101623: Merge "Fix for duplicate names in whole static libs" 
* commit 'e6918b559d911fd58dc03b60e4b866b23c935f72':
  Fix for duplicate names in whole static libs
 2014-05-27 18:33:19 +00:00
Dan Albert e6918b559d am 212772f6: am 31101623: Merge "Fix for duplicate names in whole static libs" 
* commit '212772f6322ef41a1b18023d15eb2b69efa19be8':
  Fix for duplicate names in whole static libs
 2014-05-27 18:30:08 +00:00
Dan Albert 212772f632 am 31101623: Merge "Fix for duplicate names in whole static libs" 
* commit '31101623b3e621436f6b46f49242ed4642d86164':
  Fix for duplicate names in whole static libs
 2014-05-27 18:26:38 +00:00
Dan Albert 31101623b3 Merge "Fix for duplicate names in whole static libs" 2014-05-27 18:23:26 +00:00
Ying Wang bccdab8737 am 65475feb: am 29267309: am 294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested." 
* commit '65475feb5999068096b287faac9199d1c8e18340':
  Exclude libstdc++ and libgcc if libc++ is requested.
 2014-05-27 17:59:11 +00:00
Ying Wang 65475feb59 am 29267309: am 294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested." 
* commit '292673094c59bf235a8ba188c2736199f6082105':
  Exclude libstdc++ and libgcc if libc++ is requested.
 2014-05-27 17:55:35 +00:00
Ying Wang 292673094c am 294301bb: Merge "Exclude libstdc++ and libgcc if libc++ is requested." 
* commit '294301bb34b62d51305d70780ac031a905fa9efe':
  Exclude libstdc++ and libgcc if libc++ is requested.
 2014-05-27 17:52:10 +00:00
Guang Zhu 212bc3271a fix build id 
Bug: 15264432

Change-Id: Ib937af1401a18e67a3dbac471c21231ebd9e3c85
(cherry picked from commit 44e1b0bd8a)
 2014-05-27 17:21:00 +00:00
Guang Zhu 44e1b0bd8a fix build id 
Change-Id: Ib937af1401a18e67a3dbac471c21231ebd9e3c85
 2014-05-26 22:06:13 -07:00
Jeff Brown 4c4aa99ced Support more precise package exclusion from JAR files. 
Allow LOCAL_JAR_PACKAGES to work on subpackages.  Previously it
only worked on top-level packages due to a bug in how the directories
were recursively deleted.

Add LOCAL_JAR_EXCLUDE_PACKAGES to allow specific subpackages to
be excluded.  This rule applies after LOCAL_JAR_PACKAGES has
selected which packages to include.  It may also be used independently.

Change-Id: Ibd0e495be1a20c84b59c9da132e92100ef3f8705
 2014-05-23 18:41:19 -07:00
Dan Albert 0e5ce8be34 Fix for duplicate names in whole static libs 
_extract-and-include-single-(host|target)-whole-static-lib was written such that
only the first file of a given name would be extracted and included into the new
library. This patch iterates over each identically named archive member,
extracts them individually, and adds them to the new archive.

Bug: 15110069
Change-Id: Ia08c7be6f40bfc8403908a8808898ada479099b1
 2014-05-23 18:23:47 -07:00
Ying Wang d90de32951 Exclude libstdc++ and libgcc if libc++ is requested. 
Bug: 15174002
Change-Id: I24fe428c3520f76cd61f0660b59ba18a1f2d2dad
 2014-05-23 16:42:37 -07:00
Ying Wang 1dc4f0bace am 2bf10a72: am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build" 
* commit '2bf10a72f87a8e97923286aa331f7db81e2361ca':
  Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
 2014-05-23 19:43:57 +00:00
The Android Automerger 543644393b am d7a59dd0: "AAV52B" 
* commit 'd7a59dd0ebdabaea5f9f3fd91ff86e18d2beebf7':
  "AAV52B"
 2014-05-23 18:22:17 +00:00
Ying Wang 2bf10a72f8 am cdcb6926: am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build" 
* commit 'cdcb6926d40b502ed89a285cdd4d99beb4cf8009':
  Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
 2014-05-23 17:48:27 +00:00
Ying Wang cdcb6926d4 am 6cb69bd4: Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build" 
* commit '6cb69bd4f20ac3ae3a7d5b5cc323c4480cf8ef75':
  Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
 2014-05-23 17:44:31 +00:00
Ying Wang 6cb69bd4f2 Merge "Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build" 2014-05-23 17:39:40 +00:00
Colin Cross 949ed75bb9 am 423242b5: am 828b5183: am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130 
* commit '423242b59ea01dffbb7f79c7c045528f7c351c4b':
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
 2014-05-22 19:40:46 +00:00
Colin Cross 423242b59e am 828b5183: am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130 
* commit '828b518377f69516ea6cbb9ad160d81ced6980d5':
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
 2014-05-22 19:36:15 +00:00
Colin Cross 828b518377 am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130 
* commit 'e45c8607b3e2cf7a428a91898aea2752a54389a1':
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
 2014-05-22 19:31:26 +00:00
Colin Cross e45c8607b3 Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130 
* changes:
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
 2014-05-22 19:28:01 +00:00
Colin Cross 12d18eb563 set a prebuilt directory name for the 2nd arch 
In order to install 32-bit gdbserver on a 64-bit build,
prebuilts/misc/Android.mk needs to know the prebuilt directory name
for the 2nd arch.

Change-Id: Ibc943b758eb9404f7f5f9fbbd8720cc67f6a6f01
 2014-05-22 12:01:23 -07:00
Ying Wang ae9ee9c0e7 am 71617605: am 8e2b2d8a: am b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS" 
* commit '716176059ab8962c7049f91c83c82b1af9f2632a':
  Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
 2014-05-22 18:28:06 +00:00
Ying Wang 716176059a am 8e2b2d8a: am b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS" 
* commit '8e2b2d8ad4040d501d4d254cd359cf17ea32bbdd':
  Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
 2014-05-22 17:47:40 +00:00
Ying Wang 8e2b2d8ad4 am b0143e2f: Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS" 
* commit 'b0143e2fffbd3183175e8c1873d3466598ca9457':
  Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS
 2014-05-22 17:43:14 +00:00
Ying Wang b0143e2fff Merge "Add some more flags to CLANG_CONFIG_UNKNOWN_CFLAGS" 2014-05-22 17:38:01 +00:00
The Android Automerger d7a59dd0eb "AAV52B" 2014-05-22 07:23:17 -07:00
Ying Wang 78ae0ad8df am 913e0317: am a72e6f80: am 8a3f514d: Merge "Split the rules to build the odex file" 
* commit '913e031793928981640f51fa2e6480312f044c37':
  Split the rules to build the odex file
 2014-05-22 02:38:52 +00:00
Ying Wang 913e031793 am a72e6f80: am 8a3f514d: Merge "Split the rules to build the odex file" 
* commit 'a72e6f80e447acf225822eebdf752c0d8aa2590c':
  Split the rules to build the odex file
 2014-05-22 02:34:02 +00:00
Ying Wang a72e6f80e4 am 8a3f514d: Merge "Split the rules to build the odex file" 
* commit '8a3f514d44e2c1d4920126b3edd47f7a7616b732':
  Split the rules to build the odex file
 2014-05-22 02:29:52 +00:00
Ying Wang 8a3f514d44 Merge "Split the rules to build the odex file" 2014-05-22 02:24:59 +00:00
Dmitriy Ivanov 70917bcebc am 4ebdc93f: am caabca37: am 5caca89c: Merge "Clarify multiarch warnings" 
* commit '4ebdc93f6039b5429c8bbff74373657de6be02b8':
  Clarify multiarch warnings
 2014-05-22 01:31:32 +00:00
Dmitriy Ivanov 4ebdc93f60 am caabca37: am 5caca89c: Merge "Clarify multiarch warnings" 
* commit 'caabca3786e105abb88728b4d5c4c1436be66ba3':
  Clarify multiarch warnings
 2014-05-22 01:28:53 +00:00
Dmitriy Ivanov caabca3786 am 5caca89c: Merge "Clarify multiarch warnings" 
* commit '5caca89c5d66e9999e26905522bf2eed958d0961':
  Clarify multiarch warnings
 2014-05-22 01:24:48 +00:00
Ying Wang 9734252ccf Don't build tests in PDK build. 
Change-Id: I8994be0938a3ce87a097669c28b232fd04b77a36
 2014-05-21 17:45:52 -07:00
Dmitriy Ivanov 38bba065e0 Clarify multiarch warnings 
* Show multiarch related warnings only if my_module_multilib is both

Change-Id: If0c467c1d9b953bd3f40949ab4b97d9329ec021f
 2014-05-21 16:40:35 -07:00
Ying Wang 36142f64ae Split the rules to build the odex file 
Previously the odex file is byproduct generated by the package.apk rule.
Though we have the odex file depend on the package.apk it doesn't have
its own build recipe. In case package.apk isn't updated but we still
need to update the odex file (such as changed LOCAL_MULTILIB), the odex
file will never be rebuilt.
This change split out the rules to build the odex file and make sure the
build recipe get executed if the odex file needs rebuild.

Change-Id: I60c2f32b536b3d59045301ee863aae1451734aad
 2014-05-21 16:24:59 -07:00
Ying Wang 3d2f5d6edb Remove .swp file checked in by accident. 
Change-Id: I612ff98d53f46abfc6cb51a820ecde2820442940
 2014-05-21 13:35:18 -07:00
Ying Wang c2c368fb76 check build tests modules in eng and userdebug builds 
To catch more build breakage, check build tests modules in eng and
userdebug builds.

Change-Id: Ic3b34dcd199e50e555c33eb686a501acef59a8c2
 2014-05-21 11:00:57 -07:00
Griff Hazen 0413efd261 resolved conflicts for merge of 3bb81eb0 to klp-modular-dev-plus-aosp 2014-05-20 20:05:08 -07:00
Ying Wang 2f4c0a8617 am 8a724260: am 4e151105: Merge "Support to extract JNI libs from prebuilt APK" 
* commit '8a724260f2a3900808e0e733b893a37c119fe3f1':
  Support to extract JNI libs from prebuilt APK
 2014-05-21 01:10:15 +00:00
Ying Wang 8a724260f2 am 4e151105: Merge "Support to extract JNI libs from prebuilt APK" 
* commit '4e151105a02ba09acb277c6a084252d01c561a5f':
  Support to extract JNI libs from prebuilt APK
 2014-05-21 01:06:03 +00:00
Ying Wang 966c1e0cae Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build 
We already support pure 32-bit and 64-bit-by-default multilib build.
With HOST_PREFER_32_BIT we can build 32-bit-by-default multilib build.
This will be lest disruptive during the period we transition to
64-bit-by-default.

Bug: 13751317
Change-Id: I0d56ce4abbe4afeaacfd70d709f6a349791c0722
 2014-05-20 18:03:21 -07:00
Ying Wang 7cf9f28b5f 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
 2014-05-20 18:02:17 -07:00
Ying Wang 6efad2e0f0 Merge "Fix typo." 2014-05-20 23:21:36 +00:00
Ying Wang 80b91d9ac6 Fix typo. 
Change-Id: I027b91d3a89de12a9c9f95406274726574bc7f7a
 2014-05-20 16:20:44 -07:00
Yuncheol Heo 24b701ca67 Merge "Fix the path for findbugs." 2014-05-20 22:50:06 +00:00
Ben Cheng 35dcb507f7 am dfec8f89: am 50e99111: am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)" 
* commit 'dfec8f8915ea5870c5e43549a1230d33585b6d89':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
 2014-05-20 18:16:12 +00:00
Ben Cheng dfec8f8915 am 50e99111: am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)" 
* commit '50e99111795af08c7a9c687da6680554c2b54f80':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
 2014-05-20 16:08:07 +00:00
Ben Cheng 50e9911179 am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)" 
* commit '54bea362ab7f33791bd6ea54d77a76dc8d9e005d':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #4)
 2014-05-20 16:04:17 +00:00
Ben Cheng 54bea362ab Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)" 2014-05-20 16:00:08 +00:00
Yuncheol Heo 623d706253 Fix the path for findbugs. 
Change-Id: I45485f1aeaf7fc3db2839f42829278d8c0ec97e3
 2014-05-20 17:13:34 +09:00
Ben Cheng d033121431 Use aarch64-linux-android-4.9 for arm64 build (attempt #4) 
GCC: 4.9 (which supports -fstack-protector)
Binutils: 2.24 (which supports gc-sections)
GDB: 7.7

NDK libraries are still picked up from prebuilts/ndk/*/4.8/*

GCC has been patched to disable codegen for calling
__cxa_throw_bad_array_new_length.

Source code has been sync'ed against the 2014-05-14 snapshot which
contains many important fixes (devirtualization, codegen, ...).

Change-Id: I43229360ad0132193d5208cb0d1acba55084853c
 2014-05-19 16:22:21 -07:00
Ying Wang 3380d3a1ae Explicit record the modules' built-file:installed-file 
- This simplifies the logic to get the mapping of built-file to
  installed-file. Previously we used file suffix matching which is error
  prone and not scalable.
- With this change the .odex files will be included automatically.

Bug: 13585955
Change-Id: I4599abf93b9d501bac7aca7758d7f3aee21b3e36
 2014-05-19 13:03:36 -07:00
Brian Carlstrom 8d422a3a0b am 8074ff4d: am a8355eca: am 64f3a191: Merge "Multilib support for odex" 
* commit '8074ff4d0f962a933586b9809d1f1bdffe1fe5ed':
  Multilib support for odex
 2014-05-19 17:04:54 +00:00
Brian Carlstrom 8074ff4d0f am a8355eca: am 64f3a191: Merge "Multilib support for odex" 
* commit 'a8355ecaadf9a0d052165d0cc14564927eb9a202':
  Multilib support for odex
 2014-05-19 16:59:16 +00:00
Brian Carlstrom a8355ecaad am 64f3a191: Merge "Multilib support for odex" 
* commit '64f3a191f92a6ab84a8175ad480633b8c58ac900':
  Multilib support for odex
 2014-05-19 16:53:35 +00:00
Brian Carlstrom 64f3a191f9 Merge "Multilib support for odex" 2014-05-19 16:50:17 +00:00
Ying Wang b9aa5d43de Multilib support for odex 
If the VM is libart and DEXPREOPT is enabled,
- For a Java library and the boot image, we build for both 1st arch and
  2nd arch.
- For an app, we build for the multilib arch the module is targeted for.
The odex file will be in <arch_name>/<module_name>.odex inside the same
dir where the jar/apk file gets installed.
Nothing changed if it's built for libdvm.

Bug: 14694978
Change-Id: I45118a83758b41d52d6c9e38f93f0ba2775a6c74
 2014-05-18 22:04:58 -07:00
Ying Wang a27da32b69 am e75315fd: am 002f3c28: am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts" 
* commit 'e75315fdef200600f280f829089fd8d32e662b2e':
  Real "LOCAL_MULTILIB := both" for prebuilts
 2014-05-17 03:13:51 +00:00
Ying Wang e75315fdef am 002f3c28: am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts" 
* commit '002f3c28629b8ee84d0a54fe9f2de745e965b9dc':
  Real "LOCAL_MULTILIB := both" for prebuilts
 2014-05-17 03:08:26 +00:00
Ying Wang 002f3c2862 am 4636abe5: Merge "Real "LOCAL_MULTILIB := both" for prebuilts" 
* commit '4636abe5899272e1e9051e2c98516409107c4e8c':
  Real "LOCAL_MULTILIB := both" for prebuilts
 2014-05-17 03:06:42 +00:00
Ying Wang 4636abe589 Merge "Real "LOCAL_MULTILIB := both" for prebuilts" 2014-05-17 03:03:44 +00:00
Ying Wang 5415835c41 am 5989a051: am 023209b6: am 5ee3f096: Merge "Default TARGET_CPU_SMP to true." 
* commit '5989a05130ff3cd4a789afb2fd09e9f03a58bc3c':
  Default TARGET_CPU_SMP to true.
 2014-05-17 00:16:07 +00:00
Ying Wang 5989a05130 am 023209b6: am 5ee3f096: Merge "Default TARGET_CPU_SMP to true." 
* commit '023209b63ee4be4289b3e07b3c3dc54773523094':
  Default TARGET_CPU_SMP to true.
 2014-05-17 00:12:50 +00:00
Ying Wang 023209b63e am 5ee3f096: Merge "Default TARGET_CPU_SMP to true." 
* commit '5ee3f0960dbc6a14333e3b98252d59f5d8d18a7d':
  Default TARGET_CPU_SMP to true.
 2014-05-17 00:09:03 +00:00
Ying Wang f1d722ba40 am fb71a59e: am 11278626: am 3c8089ce: Merge "Fix the missing 2nd arch prefix." 
* commit 'fb71a59ef79d22c1acaf4a57980bc932886821cb':
  Fix the missing 2nd arch prefix.
 2014-05-16 23:33:45 +00:00
Ying Wang fb71a59ef7 am 11278626: am 3c8089ce: Merge "Fix the missing 2nd arch prefix." 
* commit '112786266ab4737d7e586b2a14084d3d2e3974e3':
  Fix the missing 2nd arch prefix.
 2014-05-16 23:30:15 +00:00
Ying Wang d450706704 Default TARGET_CPU_SMP to true. 
Change-Id: If8c52c8ed66d52452967d09885dfe1ca9da13688
 2014-05-16 16:27:11 -07:00
Ying Wang 112786266a am 3c8089ce: Merge "Fix the missing 2nd arch prefix." 
* commit '3c8089cef8eaf90b11852a5c258eba0ff5e3287e':
  Fix the missing 2nd arch prefix.
 2014-05-16 23:26:31 +00:00
Ying Wang ef773d22ca Fix the missing 2nd arch prefix. 
Bug: 13751317
Change-Id: Ie5a323a0a89245576dbc91271d3178574942627d
 2014-05-16 16:22:32 -07:00
Dan Albert b4906ad4c7 am edc2e987: am 304a7a9f: am b589679b: Merge "Use libc++ versions of gtest libs when needed" 
* commit 'edc2e987df4e921dc5e74ff07f4e406a15aa3ac7':
  Use libc++ versions of gtest libs when needed
 2014-05-16 22:10:07 +00:00
Dan Albert edc2e987df am 304a7a9f: am b589679b: Merge "Use libc++ versions of gtest libs when needed" 
* commit '304a7a9fab6b907801b911ee77542296884c9d91':
  Use libc++ versions of gtest libs when needed
 2014-05-16 22:06:03 +00:00
Dan Albert 304a7a9fab am b589679b: Merge "Use libc++ versions of gtest libs when needed" 
* commit 'b589679b101e0863a1fd1d7f4fc6ee3370c8a60a':
  Use libc++ versions of gtest libs when needed
 2014-05-16 22:03:56 +00:00
Dan Albert fd3a3ecc16 am 2f57c850: am 4dd8c970: am a82b32a7: Merge "Use libc++ versions of gtest libs when needed" 
* commit '2f57c85095c6c2336b964a6965da4093a89e2db3':
  Use libc++ versions of gtest libs when needed
 2014-05-16 22:02:57 +00:00
Dan Albert 2f57c85095 am 4dd8c970: am a82b32a7: Merge "Use libc++ versions of gtest libs when needed" 
* commit '4dd8c9705db909ba070a830930f1ba72a77192d4':
  Use libc++ versions of gtest libs when needed
 2014-05-16 21:57:57 +00:00
Dan Albert 9b0c6ff69c Use libc++ versions of gtest libs when needed 
Change-Id: Id8752ea946cbaa747dfa4fccf38d680dfeee5b45
 2014-05-16 14:55:50 -07:00
Dan Albert 4dd8c9705d am a82b32a7: Merge "Use libc++ versions of gtest libs when needed" 
* commit 'a82b32a7a7855cb93e11e060120803e91cc81c2d':
  Use libc++ versions of gtest libs when needed
 2014-05-16 21:54:04 +00:00
Dan Albert a82b32a7a7 Merge "Use libc++ versions of gtest libs when needed" 2014-05-16 21:50:27 +00:00
Ying Wang a448430343 am 9e55ed53: am 47316a27: am 5137d458: Merge "Force to build llvm from source in 64-bit host build." 
* commit '9e55ed53ef7dfebc759a2494503b19e33b0c47d7':
  Force to build llvm from source in 64-bit host build.
 2014-05-16 19:05:40 +00:00
Ying Wang 9e55ed53ef am 47316a27: am 5137d458: Merge "Force to build llvm from source in 64-bit host build." 
* commit '47316a27eac94c45e47a26cb52cc5b03753dd24e':
  Force to build llvm from source in 64-bit host build.
 2014-05-16 19:02:52 +00:00
Ying Wang 47316a27ea am 5137d458: Merge "Force to build llvm from source in 64-bit host build." 
* commit '5137d4584e60dea68715dbcae5e276b3af965460':
  Force to build llvm from source in 64-bit host build.
 2014-05-16 18:59:23 +00:00
Dan Albert 965bfefb6b Use libc++ versions of gtest libs when needed 
Change-Id: I19aa58a83a9da680d441af5f3956a2fbdf18c4e4
 2014-05-16 11:22:44 -07:00
Ying Wang 34d5f1b27e Real "LOCAL_MULTILIB := both" for prebuilts 
This uses the fact that unsetting LOCAL_MULTILIB equals "either".
It's useful to build for both 32-bit and 64-bit in the same prebuilt
module definition.

Bug: 13751317
Change-Id: I4f1625a83e13f22f807039afebae73f69ed35918
 2014-05-16 10:49:57 -07:00
Ying Wang 6374153fbf Force to build llvm from source in 64-bit host build. 
Bug: 13751317
Change-Id: I4a4150bfe21607eb7a2342bbd8120b431427eee5
 2014-05-16 09:37:23 -07:00
Ying Wang d6c07855b8 Merge "Put modules with install path to system/ to DATA/ in the zip file." 2014-05-16 04:49:30 +00:00
Ying Wang 92213a8ae4 Put modules with install path to system/ to DATA/ in the zip file. 
Change-Id: I3948c28bb3f988d57da41d6eb8f97da4e20b0e86
 2014-05-15 20:45:39 -07:00
Ji-Hwan Lee 46afdf0345 am cd18df97: am eaf4c758: am a7748859: Merge "Clear *.ini and skin directory on installclean" 
* commit 'cd18df970ecad032ac33c9aea01b14734728f605':
  Clear *.ini and skin directory on installclean
 2014-05-16 02:03:57 +00:00
Ji-Hwan Lee cd18df970e am eaf4c758: am a7748859: Merge "Clear *.ini and skin directory on installclean" 
* commit 'eaf4c7581f3c736ada725f75bb1b6218be26c361':
  Clear *.ini and skin directory on installclean
 2014-05-16 02:00:37 +00:00
Ying Wang 5077d6b4f8 am 0a2c133d: am 5b768a72: am f14653ce: Merge "x86_common.mk has been replaced by HOST_x86_common.mk" 
* commit '0a2c133dc85e611b209244a6024a8390f338a63d':
  x86_common.mk has been replaced by HOST_x86_common.mk
 2014-05-16 02:00:28 +00:00
Ji-Hwan Lee eaf4c7581f am a7748859: Merge "Clear *.ini and skin directory on installclean" 
* commit 'a7748859d741af2f7e22f3333030b937269d33c7':
  Clear *.ini and skin directory on installclean
 2014-05-16 01:57:35 +00:00
Ying Wang 0a2c133dc8 am 5b768a72: am f14653ce: Merge "x86_common.mk has been replaced by HOST_x86_common.mk" 
* commit '5b768a7253f9d474c48c03321c2fdcbc2b8abc40':
  x86_common.mk has been replaced by HOST_x86_common.mk
 2014-05-16 01:57:11 +00:00
Ji-Hwan Lee a7748859d7 Merge "Clear *.ini and skin directory on installclean" 2014-05-16 01:54:49 +00:00
Ying Wang 5b768a7253 am f14653ce: Merge "x86_common.mk has been replaced by HOST_x86_common.mk" 
* commit 'f14653cee4c98094d171c194b1af3e14b087ab09':
  x86_common.mk has been replaced by HOST_x86_common.mk
 2014-05-16 01:54:12 +00:00
Ying Wang a303c4f546 x86_common.mk has been replaced by HOST_x86_common.mk 
Change-Id: I19eea82bb35d3f65a2d894c687131a1eafbe2cc9
 2014-05-15 18:50:06 -07:00