Commit graph

15771 commits

Author SHA1 Message Date
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
5caca89c5d Merge "Clarify multiarch warnings" 2014-05-22 01:22:00 +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
Mark Salyzyn
1fe5820269 am ea65c191: Merge "libctest: zap"
* commit 'ea65c191e7c08233c97c5b854537d2a0d2127733':
  libctest: zap
2014-05-21 21:08:24 +00:00
Mark Salyzyn
ea65c191e7 Merge "libctest: zap" 2014-05-21 21:02:10 +00:00
Mark Salyzyn
ae0d241144 libctest: zap
Change-Id: Ia3ff0cad0995af428adf2dbdf10587dae904ec7d
2014-05-21 13:27:58 -07:00
Sreeram Ramachandran
feb371ad6b am 90a0edbc: Merge "Remove netd_client. It has moved to the internal tree."
* commit '90a0edbc0b6dfee222ff630973308c737202a6b7':
  Remove netd_client. It has moved to the internal tree.
2014-05-21 17:01:40 +00:00
Sreeram Ramachandran
90a0edbc0b Merge "Remove netd_client. It has moved to the internal tree." 2014-05-21 16:59:25 +00:00
Sreeram Ramachandran
a7877a4674 Remove netd_client. It has moved to the internal tree.
Change-Id: Iffcdb4900373c05086fd1085b861b6520065b7a3
2014-05-21 09:55:44 -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
4e151105a0 Merge "Support to extract JNI libs from prebuilt APK" 2014-05-21 01:02:57 +00: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
Elliott Hughes
e972f9ffc0 am 0dbcff95: Merge "The generic_arm64 system image is full."
* commit '0dbcff9599be1f999df467b7d17b4f2785a8452a':
  The generic_arm64 system image is full.
2014-05-20 23:36:30 +00:00
Christopher Ferris
965f39190c am a2cd924b: Merge "Fix extra/missing : in path setup."
* commit 'a2cd924bef556cb6ceccca1098cae338d37200a6':
  Fix extra/missing : in path setup.
2014-05-20 23:36:28 +00:00
Elliott Hughes
0dbcff9599 Merge "The generic_arm64 system image is full." 2014-05-20 21:48:10 +00:00
Elliott Hughes
0499399231 The generic_arm64 system image is full.
Change-Id: I454c674033525f2f7847d2c91979dff8093c335b
2014-05-20 14:44:26 -07:00
Christopher Ferris
a2cd924bef Merge "Fix extra/missing : in path setup." 2014-05-20 21:18:51 +00:00
Christopher Ferris
7110f241ab Fix extra/missing : in path setup.
Change-Id: I4d95efc781c58af704012922d95841e009bf6286
2014-05-20 14:09:36 -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
Ji-Hwan Lee
c0f0e8cab7 am 13b48588: Merge "Allow qemu_device read-write access to various processes"
* commit '13b485889d95597a839f27f7774d55142bb8b5a7':
  Allow qemu_device read-write access to various processes
2014-05-19 16:48:51 +00:00
Ji-Hwan Lee
13b485889d Merge "Allow qemu_device read-write access to various processes" 2014-05-19 16:46:30 +00:00
Ji-Hwan Lee
93e450767f Allow qemu_device read-write access to various processes
Basically, allow access of qemu_device where gpu_device is allowed, for the
case when the emulator runs with OpenGL/ES emulation.  Most noticably,
surfaceflinger crashes without qemu_device access.

Bug: 15052949
Change-Id: Ib891365a6d503309bced64e2512c4d8f29d9a07e
2014-05-19 20:49:17 +09: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
Ji-Hwan Lee
744e4aa228 am e624fd28: Merge "Put prebuilt emulator path after host output"
* commit 'e624fd281a74b42828a1902dfff11503f95fe28d':
  Put prebuilt emulator path after host output
2014-05-18 06:50:32 +00:00
Ji-Hwan Lee
acfb27236c am c60783c9: Merge "Increase system image size to 650M for generic_arm64"
* commit 'c60783c9a291dc03a11326caac920c295ed999dc':
  Increase system image size to 650M for generic_arm64
2014-05-18 06:50:32 +00:00
Ji-Hwan Lee
e624fd281a Merge "Put prebuilt emulator path after host output" 2014-05-18 06:39:50 +00:00
Ji-Hwan Lee
c60783c9a2 Merge "Increase system image size to 650M for generic_arm64" 2014-05-18 06:38:17 +00:00
Ji-Hwan Lee
c89e1826ba Increase system image size to 650M for generic_arm64
Change-Id: I7969ec54dc4225bbe36651c4d9c6a09de1eb89f4
2014-05-18 02:42:14 +09: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
5ee3f0960d Merge "Default TARGET_CPU_SMP to true." 2014-05-17 00:07:16 +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
3c8089cef8 Merge "Fix the missing 2nd arch prefix." 2014-05-16 23:23:16 +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
b589679b10 Merge "Use libc++ versions of gtest libs when needed" 2014-05-16 22:02:12 +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