Ian Rogers
e25c0b2599
am bc39fd5c: am f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
...
* commit 'bc39fd5cab47388797ee7638920766e91fe0b100':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
2014-03-10 23:37:13 +00:00
Ian Rogers
c61a9425cd
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
...
This reverts commit 668427c941
.
Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802
2014-03-10 23:27:01 +00:00
Ian Rogers
848361f97e
am a520bfbe: am 4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
...
* commit 'a520bfbeb65b307da42abb079911311096fef20c':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
2014-03-10 22:51:08 +00:00
Ian Rogers
668427c941
Define __STDC_LIMIT_MACROS globally to work around host build differences.
...
Change-Id: I571fc5a4b35c830ca8de4dc3117aef258dffa1bd
2014-03-10 15:30:39 -07:00
Ying Wang
7670415852
am 61cf1df7: am 60ef9d5b: Merge "jdk error message should not mention the version"
...
* commit '61cf1df7edbb9d52a6f151b011633b2859213c35':
jdk error message should not mention the version
2014-03-10 19:29:36 +00:00
Chris Wren
22e3835e33
jdk error message should not mention the version
...
the version is checked elsewhere
Bug: 13362810
Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404
2014-03-10 12:25:31 -07:00
Adam Hampson
deb462442f
am 57afaa53: Add init.environ.rc to installclean
...
* commit '57afaa537361e7f5c12c049b13b831c1126b3cad':
Add init.environ.rc to installclean
2014-03-08 01:54:46 +00:00
Adam Hampson
57afaa5373
Add init.environ.rc to installclean
...
BOOTCLASSPATH needs to be rebuilt when switching between build
targets.
Bug: 13282187
Change-Id: I16816abb4246878a60e1aa8c91b6b38c7339950e
Signed-off-by: Adam Hampson <ahampson@google.com>
2014-03-07 15:55:18 -08:00
Ben Cheng
395ae92afb
am 21ef9705: am f230bcf4: Merge "OProfile is no longer compiled now."
...
* commit '21ef9705b67bc8c2666a30bf71db0ba5125c93f2':
OProfile is no longer compiled now.
2014-03-07 16:55:52 +00:00
Ben Cheng
d8ce7d8fd6
OProfile is no longer compiled now.
...
BUG: 13249790
Change-Id: I2d4fd8f888823687ea41ddbee1f7ce2a7ebc99f7
2014-03-05 16:59:41 -08:00
Nicolas Geoffray
50fcf75308
am db48d145: am 247dd0c4: Merge "Do not remove the generated .hpp file from yacc."
...
* commit 'db48d145841afb9b9b6d1c124191a1681d6b4f39':
Do not remove the generated .hpp file from yacc.
2014-03-05 18:04:30 +00:00
Nicolas Geoffray
247dd0c4af
Merge "Do not remove the generated .hpp file from yacc."
2014-03-05 14:09:26 +00:00
Nicolas Geoffray
3f5cc08d46
am b11697d3: am 68d38154: Merge "Remove host-prefix command line argument to dex2oat."
...
* commit 'b11697d30778db51d476aedd28b0e2c65eb241e3':
Remove host-prefix command line argument to dex2oat.
2014-03-04 17:24:44 +00:00
Nicolas Geoffray
5fd9a32c4f
Remove host-prefix command line argument to dex2oat.
...
Change-Id: If4a962976d1e8a283d6b682112a1b12d328d8dbb
2014-03-04 17:06:40 +00:00
Nicolas Geoffray
3cb9ddbdec
Do not remove the generated .hpp file from yacc.
...
Depending on the file extension of the generated C++ file,
bison will generate a #include of a .h or .hpp. So both files
must be kept in the generated directory.
Change-Id: Id0aac7f407bdc69c7f5012c0d021761b0fceb427
2014-03-04 14:48:55 +00:00
Andrew Hsieh
1537f8bfde
am 12493c89: am 6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
...
* commit '12493c892e59d826eec41caea6bc90a5778bb672':
Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
2014-03-04 01:12:03 +00:00
Andrew Hsieh
6808c2608f
Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
2014-03-04 01:06:04 +00:00
Colin Cross
a86544106f
Remove idmap from 64-bit blacklist
...
frameworks/native/cmds/idmap was accidentally added to the blacklist
in a bad merge in commit a0eb50acca
.
Change-Id: I545d401a934f1183e03235d5abe5ab15563a4e6d
2014-03-03 10:32:09 -08:00
Nicolas Geoffray
2801735ab1
am d85ef325: am 460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."
...
* commit 'd85ef325de805996050170b3ce1cc199cba7c980':
Extend YACC and LEX handling to .yy and .ll files.
2014-03-03 18:08:45 +00:00
Nicolas Geoffray
460ed38aa9
Merge "Extend YACC and LEX handling to .yy and .ll files."
2014-03-03 18:03:29 +00:00
Nicolas Geoffray
9484e2e13f
Extend YACC and LEX handling to .yy and .ll files.
...
The external mclinker project has .yy and .ll files that
require the same rules as .y and .l.
Change-Id: I2b02df9a74bac9c215f8aeb8ee2ff0d2616526ed
2014-03-03 15:58:46 +00:00
Narayan Kamath
3246d88d6c
resolved conflicts for merge of e8bb5c3a
to klp-modular-dev-plus-aosp
...
Change-Id: I5cb6aeb5dd250aeba059feb1c70c13ac4745db3b
2014-03-03 12:14:41 +00:00
Andrew Hsieh
c4f7fbae02
Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
...
Analyzer needed by WITH_STATIC_ANALYZER and WITH_SYNTAX_CHECK is
moved from prebuilts/clang/{linux-x86,darwin-x86}/host/3.3 to
prebuilts/misc/{linux-x86,darwin-x86}/analyzer
See https://android-review.googlesource.com/#/c/83852/
BUG=13243591
Usage:
"WITH_SYNTAX_CHECK=1 make ..." instructs build system to invoke "clang -fsyntax-only"
to utilize clang's better diagnostics before calling LOCAL_CC/LOCAL_CXX for code generation.
The compilation time is slightly longer, and the generated object file should be the same as
w/o WITH_SYNTAX_CHECK
"WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..." instructs build system to run static
analyzer via "clang --analyze" on a successful build. If analyzer finds any issue, instruction
to open report is displayed. See http://clang-analyzer.llvm.org/scan-build.html for details.
WITH_STATIC_ANALYZER trumps WITH_SYNTAX_CHECK if both exist. Project use lots of GCC extensions
(eg. nested function) not supported by clang may opt out by adding LOCAL_NO_STATIC_ANALYZER:=true
Change-Id: Ib3dda3ffb0fd3aaf2eadec867a966d1dd2868fb1
2014-03-03 18:47:02 +08:00
Narayan Kamath
9f274954c8
Amend 64 bit blacklist.
...
- external/skia now builds on arm64, frameworks/base/libs/hwui
depends on it.
- external/bluetooth/bluedroid builds on 64 bit, though there
isn't any obvious way to test it without real hardware.
- frameworks/ml now builds, as does external/srec
- frameworks/opt, frameworks/ex and frameworks/wilhelm don't
build because of their dependency on frameworks/av.
frameworks/av should probably be dropped out of the blacklist
and replaced by individual markers on targets that we want
for 64 bit (we don't want all of them for arm64).
Change-Id: I9735108840fcba21ac8918bedf0d6de8989de086
2014-03-03 10:23:38 +00:00
Ying Wang
0c0e9b8153
am a6230641: am 26bcd640: Merge "Try to catch more misuse of ."
...
* commit 'a623064131f23412daa0ac4b333320e2e30d85f0':
Try to catch more misuse of $(my-dir).
2014-03-01 17:34:29 +00:00
Ying Wang
79e8319b2e
Try to catch more misuse of $(my-dir).
...
Change-Id: I0c07d7115c66b30ba1383dfaa133f0cc40a33ad7
2014-02-28 18:23:06 -08:00
Griff Hazen
6c23e7b8b4
am 433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
...
* commit '433febb3c4593e777ef393371b6e99dcce9a7217':
Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
2014-02-28 18:05:36 +00:00
Griff Hazen
433febb3c4
Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
...
Change-Id: Iecea3f3af628d89df65a44293a977b2bce35bf28
2014-02-28 08:45:59 -08:00
Ying Wang
cefca29a4c
am 8e286fbf: am cf1b7d4b: Merge "Select src arch for prebuilts."
...
* commit '8e286fbfc712ed695008f786592fe83e4a1331a7':
Select src arch for prebuilts.
2014-02-28 02:33:29 +00:00
Ying Wang
6c930fc1c9
Select src arch for prebuilts.
...
Change-Id: I2d08f923d28d59cfef93ff0bd9893352baaee60b
2014-02-27 18:25:29 -08:00
JP Abgrall
352bbe5c9c
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
...
This enables tcpdump for 64bit builds.
This reverts commit 24f99bd4b3
.
Change-Id: Ic1413b2f3f66cedbe756d73656c90b3177ba66c0
2014-02-27 04:05:14 +00:00
Ying Wang
b3f2893f79
am 66a9b789: Merge "Include privileged apps with app zip file."
...
* commit '66a9b789703b7fac5f57fa318209dc8211f800f7':
Include privileged apps with app zip file.
2014-02-27 01:30:08 +00:00
JP Abgrall
24f99bd4b3
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
...
This is until aosp gets the latest libpcap+tcpdump currently only on internal.
This reverts commit 5c68e265ac
.
Change-Id: If6a990c72cb3a8d699cf0881f7d5fb8b725fdf2e
2014-02-27 01:28:11 +00:00
Ying Wang
66a9b78970
Merge "Include privileged apps with app zip file."
2014-02-27 01:25:13 +00:00
Ying Wang
45bde7bfad
am 9aa715a5: Merge "Remove external/tcpdump from 64-bit build blacklist."
...
* commit '9aa715a579765edf0fd4cf2fa0c0146e1b6a7c3b':
Remove external/tcpdump from 64-bit build blacklist.
2014-02-26 22:31:09 +00:00
Ying Wang
5c68e265ac
Remove external/tcpdump from 64-bit build blacklist.
...
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
2014-02-26 14:18:21 -08:00
Ying Wang
a8d273d3ce
am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."
...
* commit 'bbe5f88e1df32d1c998b424eb05ab99cc35c1e8b':
Conditionally include the 'samplecode' rules.
2014-02-26 20:06:26 +00:00
Ying Wang
48fbc42f93
Conditionally include the 'samplecode' rules.
...
Not sure goal 'samplecode' is still used by anybody these days.
Change-Id: I808a021a6e4be6a97c4b5c256b94374c1b3dae47
2014-02-26 11:55:38 -08:00
Robert Craig
59ec195a4d
Include privileged apps with app zip file.
...
Include apps that appear under /system/priv-app
to also be included with the zip of all the apps.
Change-Id: If4687cf4c471877f11d78b68bad96f1842e49d87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-02-26 12:00:14 -05:00
Torne (Richard Coles)
e665992cb8
am 63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
...
* commit '630020883abc6c8b2c13876e3195ed6abcf4890f':
Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
2014-02-26 11:09:29 +00:00
Torne (Richard Coles)
630020883a
Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
2014-02-26 11:04:03 +00:00
Ying Wang
2aeff45587
am 66331624: Merge "Fix prebuilt library dependency for multilib build"
...
* commit '66331624b5422a608607a9924f174ba533573032':
Fix prebuilt library dependency for multilib build
2014-02-26 02:38:31 +00:00
Ying Wang
58f462fccf
Fix prebuilt library dependency for multilib build
...
Also we don't need to include module_arch_supported.mk again, if we are
currently substituting the source build with LOCAL_PREBUILT_MODULE_FILE.
Change-Id: I444b0397d74c3153b398a050b762e49418062a86
2014-02-25 18:32:27 -08:00
Elliott Hughes
4a122c96f3
am 9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."
...
* commit '9dba192b76ee75c578a62dcef0160fc719a57914':
oprofile/daemon doesn't build for x86_64.
2014-02-26 02:07:18 +00:00
Elliott Hughes
9dba192b76
Merge "oprofile/daemon doesn't build for x86_64."
2014-02-26 02:02:30 +00:00
Ying Wang
12c909b20c
resolved conflicts for merge of 9057f619
to klp-modular-dev-plus-aosp
...
Change-Id: Ie8b363ede2a062a34962f9111b79df1ebc674c9e
2014-02-25 17:37:45 -08:00
Elliott Hughes
0cfae9fdb5
oprofile/daemon doesn't build for x86_64.
...
We'll probably remove external/oprofile soon, but this gets us closer
to being able to turn on an x86_64 continuous build in the meantime.
Change-Id: Ic1d5331d41dafee9ffed222dc332afed2d4ae356
2014-02-25 17:32:22 -08:00
Ying Wang
a52f117073
Remove external/wpa_supplicant_8 and external/android-clat
...
from 64_bit_blacklist.mk.
They now build fine for 64-bit.
Change-Id: Ib73c8465b72cc7b40dae21441c3ea0bd25b7e6ba
2014-02-25 17:15:47 -08:00
Elliott Hughes
331272f94b
am 25b55485: Merge "Take libcore off the LP64 blacklist."
...
* commit '25b5548522220940f50ab5b4dfb3e2e691ad913b':
Take libcore off the LP64 blacklist.
2014-02-26 00:22:49 +00:00
Ying Wang
4a0b06e808
am f1ff3abd: Merge "Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir"
...
* commit 'f1ff3abd83cbc9884082c09bb9b1d4a5080134c1':
Generate .pb.cc/.pb.h to arch-neutral generated_sources_dir
2014-02-26 00:18:21 +00:00