Commit Graph

4103 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
caabca3786 am 5caca89c: Merge "Clarify multiarch warnings"
* commit '5caca89c5d66e9999e26905522bf2eed958d0961':
  Clarify multiarch warnings
2014-05-22 01:24:48 +00: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
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
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
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
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
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
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
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
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
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
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
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
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
Christopher Ferris
7c67257b8e am f8cfbc0a: Merge "Print all 2ND variables."
* commit 'f8cfbc0a10b75e6ec22b6e80b90df2a4386887b2':
  Print all 2ND variables.
2014-05-16 01:17:13 +00:00
Christopher Ferris
f8cfbc0a10 Merge "Print all 2ND variables." 2014-05-16 01:14:43 +00:00
Ji-Hwan Lee
0a5b178fc3 Clear *.ini and skin directory on installclean
Currently, skin directory remains across different emulator targets, and
need manual removal.  Also, clear hardware-qemu.ini and config.ini.
(See https://android-review.googlesource.com/94692 for config.ini)

Change-Id: Iaa5849ad043ed3f317325ba1d6df287953636f7a
2014-05-15 20:59:01 +09:00
Narayan Kamath
59f04e889e am 944a3810: Merge "Fix executable symlinks."
* commit '944a38104a553d84c44fa87b2378ebee66a12349':
  Fix executable symlinks.
2014-05-15 09:41:37 +00:00