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
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
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