Ying Wang
e4ff0b0042
Merge "Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build"
2012-06-15 17:36:50 -07:00
Torne (Richard Coles)
bffaef246a
Make building an empty static library work.
...
Handle the case where a static library is not built because it has no
input files (e.g. because they are conditionally included and it happens
that the computed list is empty). Previously, ar never ran because of
split-long-arguments, and anything that depended on the static library
would fail to link. Make sure that ar runs at least once.
Change-Id: If0071d7ae50c4e45fff1772dca43187af155db1f
2012-06-15 16:06:21 +01:00
Kito Cheng
70dc3e1d3d
Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
...
Change-Id: Ia95dc7318e17c0804867b22e239edccc5cbec0af
2012-06-15 15:16:50 +08:00
Ying Wang
81f0fd6cdb
Convert LOCAL_LOCAL_JNI_SHARED_LIBRARIES to LOCAL_REQUIRED_MODULES in a full build
...
To save space.
Change-Id: I7c88c13e4225bed89106917de57cbae74fc79ab8
2012-06-14 15:29:20 -07:00
Jean-Baptiste Queru
a9e85effdd
am ffbef646
: am 74aba614
: Allow additional vendors
...
* commit 'ffbef646d2bec4f84874bdc5940c3b060904cb3d':
Allow additional vendors
2012-06-14 10:34:46 -07:00
Jean-Baptiste Queru
ffbef646d2
am 74aba614
: Allow additional vendors
...
* commit '74aba61404f0c1ea8693d2959d81d8b5b1bdf5d4':
Allow additional vendors
2012-06-14 09:24:18 -07:00
Jean-Baptiste Queru
74aba61404
Allow additional vendors
...
Bug: 6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
2012-06-14 09:15:20 -07:00
Ying Wang
022a7b32ef
Fix arm mode for the generated protobuf code.
...
Change-Id: Ic644ab9e1b83d9616dd9ca93362805cdd17f36a7
2012-06-13 11:38:10 -07:00
Jean-Baptiste Queru
41a3fb3707
am 6e207824
: resolved conflicts for merge of 572d0d7d
to jb-dev-plus-aosp
...
* commit '6e207824af267eea8777949ccf6d0584accd55a0':
x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3
2012-06-13 07:44:31 -07:00
Jean-Baptiste Queru
6e207824af
resolved conflicts for merge of 572d0d7d
to jb-dev-plus-aosp
...
Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb
2012-06-13 07:42:04 -07:00
Jean-Baptiste Queru
3f8ff030e0
Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3"
2012-06-13 06:25:00 -07:00
Jean-Baptiste Queru
2f65e81974
am 06b1a47f
: am d3d78a30
: am a11ad6c2
: Merge "gcc 4.6 requires --copy-dt-needed-entries"
...
* commit '06b1a47fe19699e8cb94fd6a007f82f3b41119fe':
gcc 4.6 requires --copy-dt-needed-entries
2012-06-12 15:56:29 -07:00
Ying Wang
8e53708ab1
Don't add COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES if we build against NDK.
...
Change-Id: I732be02bb4b9ee7a2d11ed89f409487f0bc37d0f
2012-06-12 15:52:58 -07:00
Jean-Baptiste Queru
06b1a47fe1
am d3d78a30
: am a11ad6c2
: Merge "gcc 4.6 requires --copy-dt-needed-entries"
...
* commit 'd3d78a30a4f8dd40fa055577ea2708ab34606cec':
gcc 4.6 requires --copy-dt-needed-entries
2012-06-12 15:52:54 -07:00
Stephen Hines
2897f052d4
Merge "EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds."
2012-06-12 15:38:21 -07:00
Jean-Baptiste Queru
a11ad6c2b3
Merge "gcc 4.6 requires --copy-dt-needed-entries"
2012-06-12 15:24:17 -07:00
Stephen Hines
c72f39664d
EXPERIMENTAL: Add libcompiler-rt-extras.a to device builds.
...
Change-Id: I463217aef573a28069469514ad94cd85a7f38bea
2012-06-12 13:34:50 -07:00
Ying Wang
6466147220
Don't build userdata.img in tests build.
...
Bug: 6035501
Change-Id: Ie1a0804f7fcc54383f2d8b97ac4583000e67cec5
2012-06-11 16:44:05 -07:00
Ying Wang
e556005331
resolved conflicts for merge of 5c0ee702
to master
...
Change-Id: I6bdcc87482c45988d410a4c4d0abc43a1416277e
2012-06-08 09:37:54 -07:00
Ying Wang
5c0ee702d6
am 79d39a30
: am 874563f9
: Merge "Fix generic build on Max OS X 10.7 Lion"
...
* commit '79d39a303e036dc70eccf2e2e7489fa0bbfd3a4b':
Fix generic build on Max OS X 10.7 Lion
2012-06-08 09:27:08 -07:00
SangWook Han
02eb37c267
Fix generic build on Max OS X 10.7 Lion
...
Recover variable build_mac_version which is removed on
commit 644dc16
and added on commit 9ce06f1
.
Without this, ranlib libSDL.a is executed on Lion which
causes build fail of emulator-arm.
Change-Id: I06144a288921f8f968ef457999398c1b9152d4aa
2012-06-08 14:55:05 +09:00
Ying Wang
10f775379d
Tweak cflags for building with SDK 10.6.
...
Change-Id: I4db9949577591ef6756812769f04cfaddd876faf
2012-06-07 17:10:53 -07:00
Keun young Park
1a2c28368c
am fe8cddea
: am efe02ce9
: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
...
* commit 'fe8cddea28bc5a5266ede2bd10b482dbe840c0bf':
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
2012-06-07 16:34:25 -07:00
Keun young Park
fe8cddea28
am efe02ce9
: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
...
* commit 'efe02ce9e00b9aebde7e9b32e81780d8de8f0dbd':
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
2012-06-07 16:31:14 -07:00
Keun young Park
efe02ce9e0
add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
...
- three levels: not defined, sdk, platform
- TARGET_BUILD_PDK_JAVA_PLATFORM gives the original meaning of java platform API
supported for java.mk
- remove libexif from user tag
- libexif_jni is pulled from f/b/media
Bug: 6623618
Change-Id: I5fa085bd10f43963350c57b7f885c700de8963e5
2012-06-07 15:40:53 -07:00
Raphael Moll
ebde54b265
am 748f9e38
: am b53a073d
: am e375c940
: Merge "SDK: Use "strip -x" for atree."
...
* commit '748f9e3804834610a59081db4c2952dcb7ee00d4':
SDK: Use "strip -x" for atree.
2012-06-07 13:12:04 -07:00
Raphael Moll
748f9e3804
am b53a073d
: am e375c940
: Merge "SDK: Use "strip -x" for atree."
...
* commit 'b53a073ddb3a5036f41ea2956792991b7a46da02':
SDK: Use "strip -x" for atree.
2012-06-07 13:08:58 -07:00
Raphael Moll
e375c940b9
Merge "SDK: Use "strip -x" for atree."
2012-06-07 12:26:08 -07:00
Ying Wang
fcc2a604af
am f1e424a6
: am 3da13457
: am 4b030617
: Merge "XCode 4.3+ compatibility check-in"
...
* commit 'f1e424a63658eb15ba61ca2eb8f0df38733188fe':
XCode 4.3+ compatibility check-in
2012-06-07 12:03:46 -07:00
Ying Wang
f1e424a636
am 3da13457
: am 4b030617
: Merge "XCode 4.3+ compatibility check-in"
...
* commit '3da13457cfa46cf7d46b57c00f387c7c310b2dba':
XCode 4.3+ compatibility check-in
2012-06-07 12:02:06 -07:00
Al Sutton
51f9bb02da
XCode 4.3+ compatibility check-in
...
XCode 4.3 and later use a different location for SDKs. This check in
ensures the build checks for the new location as well as the old one.
Change-Id: I97884e5009f229f8b42e57a8feeb702b3a40a241
Signed-off-by: Al Sutton <al@funkyandroid.com >
2012-06-07 19:10:13 +01:00
Nick Kralevich
a46c480e43
arm: add -D_FORTIFY_SOURCE=1 to the default cflags
...
Add additional compile and runtime buffer overflow detection to
Android. As of today, Android supports additional buffer overflow
detection for the following libc functions:
* memcpy
* memmove
* strcpy
* strcat
* strncpy
* strncat
Support for additional functions will be added to bionic libc in
future code changes.
Please see
* http://gcc.gnu.org/onlinedocs/gcc/Object-Size-Checking.html
* http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
for information on these features.
Change-Id: I1a281a4bac20009f4730dd8d8b798fa107576230
2012-06-07 08:55:06 -07:00
Raphael Moll
ec5fe91ead
SDK: Use "strip -x" for atree.
...
Also fixes atree to accept an alternate command via the env var ATREE_STRIP
and correctly splits it for execvp if it contains arguments.
Change-Id: I8691bdc569bea3dddfde6249217dc305b6ef19f7
2012-06-06 23:39:47 -07:00
Ying Wang
d5ba4064c3
am f521a8e8
: am 6afbda9f
: Merge "Clean common intermediate files if overlay changed" into jb-dev
...
* commit 'f521a8e888a425dcd5fff70d18d14c9324e2d3aa':
Clean common intermediate files if overlay changed
2012-06-06 09:47:25 -07:00
Ying Wang
f521a8e888
am 6afbda9f
: Merge "Clean common intermediate files if overlay changed" into jb-dev
...
* commit '6afbda9f07821deed6eb110247ab56fb47dfc775':
Clean common intermediate files if overlay changed
2012-06-06 09:44:17 -07:00
Ying Wang
6afbda9f07
Merge "Clean common intermediate files if overlay changed" into jb-dev
2012-06-06 09:41:10 -07:00
Joe Onorato
049f4055a8
am d7d0afca
: Add the ability in a product spec file to have modules installed for specific variants.
...
* commit 'd7d0afcaea24b0fb0cb37dca921a5ff52fd2485b':
Add the ability in a product spec file to have modules installed for specific variants.
2012-06-05 16:06:45 -07:00
Joe Onorato
d7d0afcaea
Add the ability in a product spec file to have modules installed for specific variants.
...
Change-Id: Ifa5eb2e15b3d3e5007378ec00efc4aec3e9a3b99
2012-06-05 15:57:07 -07:00
Ying Wang
130ae6adcb
resolved conflicts for merge of 9f4d00b9
to master
...
Change-Id: I1818896ae714aa54ad980bfbf7648652369497e5
2012-06-05 15:44:21 -07:00
Ying Wang
9f4d00b94b
am e534e2eb
: am 47450542
: Merge "Use Mac OS X SDK 10.6."
...
* commit 'e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7':
Use Mac OS X SDK 10.6.
2012-06-05 15:25:39 -07:00
Ying Wang
644dc164cc
Use Mac OS X SDK 10.6.
...
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
2012-06-05 14:23:22 -07:00
Ying Wang
a23b91dacf
Merge "Use Mac OS X SDK 10.6."
2012-06-05 11:20:54 -07:00
Jean-Baptiste Queru
359264ae03
am c9f8b8d1
: am 90beb4f1
: Add some known binary owners
...
* commit 'c9f8b8d17ea17f722157aa58014dc1f1168996c1':
Add some known binary owners
2012-06-05 09:55:14 -07:00
Jean-Baptiste Queru
c9f8b8d17e
am 90beb4f1
: Add some known binary owners
...
* commit '90beb4f155f9e0a7508854ded5b2c3dd87d702f5':
Add some known binary owners
2012-06-05 08:23:19 -07:00
Jean-Baptiste Queru
90beb4f155
Add some known binary owners
...
Bug: 6611375
Change-Id: I082128ad15b277ced82c8530c17186842839a557
2012-06-05 08:08:06 -07:00
Ying Wang
71004f8135
Clean common intermediate files if overlay changed
...
This change cleans the packages' intermediate files if their overlays
changed between incremental builds.
If two builds have different overlay, they will have different R
classes, and so the jar files in the common intermediate dirs can
not be shared. Therefore incremental build can't be applied.
This change detects the overlay changes on package's base.
If a package's overlay is different from the previous build, its common
intermediate dir is nuked.
This makes broader incremental builds possible.
Change-Id: I368610ebbbbc85a80f9aecd714ab22cd78da7f12
2012-06-04 18:02:55 -07:00
Ying Wang
94539b152e
am 0fb728b6
: am 28a18175
: Don\'t use .. to reference the target file.
...
* commit '0fb728b65ab2199e0273af1217711aa46d6504c6':
Don't use .. to reference the target file.
2012-06-02 09:28:34 -07:00
Ying Wang
0fb728b65a
am 28a18175
: Don\'t use .. to reference the target file.
...
* commit '28a181759079c34f8776f98f553e56554b527069':
Don't use .. to reference the target file.
2012-06-02 09:26:47 -07:00
Ying Wang
28a1817590
Don't use .. to reference the target file.
...
Change-Id: I1d08db81c37853f5bf0bdf5dbe848634e6ae9f61
2012-06-02 09:22:31 -07:00
Wink Saville
93aec1fa33
am 84690f96
: am f97105ea
: Merge "Fix rild running in Nakasi." into jb-dev
...
* commit '84690f969e993ca712d028b9acfb0a7c17c08c44':
Fix rild running in Nakasi.
2012-05-31 13:27:55 -07:00