Ying Wang
b28ed234aa
Consolidate the nanopb-c and regular protobuf build rules.
...
Bug: 20093047
Change-Id: I38ebd748aacce6d215403da481ad04833810a995
2015-08-18 14:27:45 -07:00
Dan Willemsen
1b14846717
am 48d95e75
: am 05d97fe7
: Merge "Remove legacy windows platform build support"
...
* commit '48d95e752536dc7a81c141e435e8a90b7929cf02':
Remove legacy windows platform build support
2015-08-18 04:43:04 +00:00
Dan Willemsen
48d95e7525
am 05d97fe7
: Merge "Remove legacy windows platform build support"
...
* commit '05d97fe723ea376edb5fe6b12535485311a32418':
Remove legacy windows platform build support
2015-08-18 04:37:09 +00:00
Dan Willemsen
05d97fe723
Merge "Remove legacy windows platform build support"
2015-08-18 04:31:07 +00:00
Dan Willemsen
9cf990beec
resolved conflicts for merge of 05fae7e0
to mnc-dev-plus-aosp
...
Change-Id: I9f0f1169839afabc7ec7e439b668798e2cd111a3
2015-08-17 20:50:48 -07:00
Dan Willemsen
05fae7e0be
am e6510750
: Merge "Use repeatable timestamps"
...
* commit 'e65107508adbea88fcc1ec51dcf28d4216365753':
Use repeatable timestamps
2015-08-18 03:35:44 +00:00
Dan Willemsen
e65107508a
Merge "Use repeatable timestamps"
2015-08-18 03:30:11 +00:00
Ying Wang
f4ff2b119c
am 808f0541
: am 77128117
: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
...
* commit '808f0541bba725c4fdc9d2b425a305eeeb024e39':
Set up dependency on ADDRESS_SANITIZER_LINKER
2015-08-18 00:18:48 +00:00
Ying Wang
808f0541bb
am 77128117
: Merge "Set up dependency on ADDRESS_SANITIZER_LINKER"
...
* commit '77128117d8b7811b86ba89e963f8a96cc6c55a6b':
Set up dependency on ADDRESS_SANITIZER_LINKER
2015-08-18 00:11:11 +00:00
Ying Wang
a05e222368
Set up dependency on ADDRESS_SANITIZER_LINKER
...
Set up dependency on ADDRESS_SANITIZER_LINKER if address sanitizer is
enabled.
Bug: 22850550
Change-Id: I736fe1d4db9594edf9e82ae96e4631887881dfa5
2015-08-17 17:06:14 -07:00
Dan Albert
c0ad316183
am 9496ef90
: am c0018b04
: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
...
* commit '9496ef903ff9402859ac82cc339708c15fcd30f6':
Add BUILD(_HOST)?_FUZZ_TEST.
2015-08-17 22:46:38 +00:00
Dan Albert
9496ef903f
am c0018b04
: Merge "Add BUILD(_HOST)?_FUZZ_TEST."
...
* commit 'c0018b04e984180122ab615d8dbea09a3230ef7f':
Add BUILD(_HOST)?_FUZZ_TEST.
2015-08-17 22:39:25 +00:00
Dan Albert
36b6f0472f
Add BUILD(_HOST)?_FUZZ_TEST.
...
These are tests that use LLVM's libFuzzer for testing with a
sanitizer.
Bug: http://b/22850550
Change-Id: I6eeaff7877b7dd0c30f8910c6f27f5278b27a83d
2015-08-17 14:39:27 -07:00
Dan Albert
401faa3513
am 8d61be6c
: am f9b75b1b
: Merge "Don\'t filter on a non-existent variable."
...
* commit '8d61be6c781277ae3f5423c805092220a961b102':
Don't filter on a non-existent variable.
2015-08-17 20:24:05 +00:00
Dan Albert
8d61be6c78
am f9b75b1b
: Merge "Don\'t filter on a non-existent variable."
...
* commit 'f9b75b1b24d985c873e548d4fd7945a6cdd99323':
Don't filter on a non-existent variable.
2015-08-17 20:19:30 +00:00
Dan Willemsen
145ae32069
Remove legacy windows platform build support
...
We still support HOST_OS=windows for the SDK host tools cross-builds, but
that's only when USE_MINGW is set when running under linux.
Change-Id: I37da87dc9fbbd69ba10ce4d7f2668ab3f6482d92
2015-08-17 12:35:04 -07:00
Dan Albert
1b2187d871
Don't filter on a non-existent variable.
...
This used to be used for aarch64
(https://android-review.googlesource.com/#/c/80126/ ), but has since
been removed and now does nothing. This was then reimplemented more
generally with my_illegal_flags
(https://android-review.googlesource.com/#/c/166405/ ). Drop
*GLOBAL_UNSUPPORTED_CFLAGS in favor of that.
Change-Id: I3347726dd92f9d3a16783e0d9d3b685a828400b4
2015-08-17 10:36:09 -07:00
Shinichiro Hamaji
5b6b6bb974
Add two flags for the latest ckati
...
* --regen
Re-generate build.ninja only when necessary. If either
1. .mk file is updated,
2. environment variable is updated,
3. $(wildcard) result is changed, or
4. $(shell) result is changed,
ckati will regenerate ninja file. This check takes only ~1
second, so incremental build will become much faster even
without "fastincremental" target.
* --ignore_dirty=out/%:
Some .mk files in out/ (e.g.,
out/target/product/generic/previous_build_config.mk)
are updated while ckati is running. With this flag, ckati
does not regenerate build.ninja when they look modified.
This should be OK for ninja based build, as ninja handles
command line changes nicely.
Change-Id: I7a2fca0e327d999599d6b16f06358e8a5e657565
2015-08-17 20:20:20 +09:00
Stephen Hines
7b6af490e9
am 5d17a7e2
: am 2e08cb6e
: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
...
* commit '5d17a7e2adf505fd7a97782f54856c86a237369d':
Add -mfpu=neon-vfpv4 if cpu is krait
2015-08-15 02:18:58 +00:00
Yang Ni
9d1eaaea61
am dcfb0c80
: am 36600a6b
: Merge "Include target api version in build system for rscpp."
...
* commit 'dcfb0c8018ec9e81fa79f3251a3d49a4cc90ddf4':
Include target api version in build system for rscpp.
2015-08-15 02:18:57 +00:00
Stephen Hines
5d17a7e2ad
am 2e08cb6e
: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
...
* commit '2e08cb6e1bf90b0950c875132d2bf37b71d03fbb':
Add -mfpu=neon-vfpv4 if cpu is krait
2015-08-15 02:12:46 +00:00
Stephen Hines
2e08cb6e1b
Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
2015-08-15 02:04:55 +00:00
Yang Ni
dcfb0c8018
am 36600a6b
: Merge "Include target api version in build system for rscpp."
...
* commit '36600a6bf9b3b79327785cd740a909d3920d6519':
Include target api version in build system for rscpp.
2015-08-14 18:46:18 +00:00
Yang Ni
36600a6bf9
Merge "Include target api version in build system for rscpp."
2015-08-14 18:39:47 +00:00
Dan Albert
7911f1b1aa
am 5e9f4912
: am 578acca4
: Merge "Link librt on the host when using sanitizers."
...
* commit '5e9f491218721adecfab6ea0178cd1e4c6723a87':
Link librt on the host when using sanitizers.
2015-08-14 01:10:46 +00:00
Dan Albert
5e9f491218
am 578acca4
: Merge "Link librt on the host when using sanitizers."
...
* commit '578acca4e27511900eefc2f65be3e88f9127660c':
Link librt on the host when using sanitizers.
2015-08-14 01:05:03 +00:00
Dan Albert
578acca4e2
Merge "Link librt on the host when using sanitizers."
2015-08-14 00:59:52 +00:00
Dan Albert
2922411446
Link librt on the host when using sanitizers.
...
The sanitizers now use shared memory.
Change-Id: Ie8fa6690374eda08ee4138b68fd628ebbfa2d0c8
2015-08-13 17:25:10 -07:00
Noah Presler
4796a8c524
Include target api version in build system for rscpp.
...
b/23161320
Change-Id: Ibc23309abed092e7648168fbf4b80891a44929a6
2015-08-13 17:07:56 -07:00
Chris Banes
0fd694f360
am 743938fb
: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
...
* commit '743938fb0d4f56d7d009486fb90891eab9b50897':
Make sure only AppCompat (not it's tests) are in the docs
2015-08-13 17:36:54 +00:00
Dan Albert
dc0e7244a6
am 2c00d629
: am 727b462a
: Merge "Never allow -w."
...
* commit '2c00d62940e7f88b2168ccf3a29a1d3e84f59bfa':
Never allow -w.
2015-08-13 17:02:13 +00:00
Dan Albert
2c00d62940
am 727b462a
: Merge "Never allow -w."
...
* commit '727b462a92635665ce636c63123078a970654480':
Never allow -w.
2015-08-13 16:52:55 +00:00
Dan Albert
727b462a92
Merge "Never allow -w."
2015-08-13 16:48:18 +00:00
Neil Fuller
53d1632681
am 5f198440
: am bc7680c4
: Merge "Include the okhttp.jar when compiling against internal classes"
...
* commit '5f19844067af27906828af7caed8e8b9c09cac4a':
Include the okhttp.jar when compiling against internal classes
2015-08-13 10:51:04 +00:00
Neil Fuller
5f19844067
am bc7680c4
: Merge "Include the okhttp.jar when compiling against internal classes"
...
* commit 'bc7680c4d7a94cfafcc3c925f0fbf134bc1dfcb8':
Include the okhttp.jar when compiling against internal classes
2015-08-13 10:46:46 +00:00
Neil Fuller
bc7680c4d7
Merge "Include the okhttp.jar when compiling against internal classes"
2015-08-13 10:40:39 +00:00
Chris Banes
b916a5bcbc
Make sure only AppCompat (not it's tests) are in the docs
...
BUG: 23169683
Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
2015-08-13 10:42:02 +01:00
Dianne Hackborn
42ebdfc574
am 25abc5a3
: Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
Fix issie #23116383 : Include security patch level in Settings
2015-08-13 00:53:51 +00:00
Dianne Hackborn
25abc5a38e
Merge "Fix issie #23116383 : Include security patch level in Settings" into mnc-dev
2015-08-13 00:46:58 +00:00
Nick Kralevich
420662b9cd
am c85364c9
: am 5f79bcdd
: Merge changes from topic \'file_contexts.bin\'
...
* commit 'c85364c9c91961461a6d81a37c8b30b34b02383b':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-13 00:00:36 +00:00
Nick Kralevich
c85364c9c9
am 5f79bcdd
: Merge changes from topic \'file_contexts.bin\'
...
* commit '5f79bcdd070f4069cd60bbe68430ee172575f9e2':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-12 23:53:50 +00:00
Nick Kralevich
5f79bcdd07
Merge changes from topic 'file_contexts.bin'
...
* changes:
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
2015-08-12 23:46:28 +00:00
Dianne Hackborn
e593e5c42a
Fix issie #23116383 : Include security patch level in Settings
...
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
Dan Albert
df3fd1d128
Never allow -w.
...
Apparently -w will disable all warnings on GCC regardless of ordering
(clang will still respect ordering so warnings that are enabled after
-w are still respected). This is insane. Strip -w from the cflags.
Anyone that wants this flag should be turning off the specific
warnings (or just fix them), not disabling all warnings.
Change-Id: I2ba065637dfdc192921da4d9adbdc63b728c166f
2015-08-12 14:54:16 -07:00
Neil Fuller
f39a25bc28
Include the okhttp.jar when compiling against internal classes
...
If LOCAL_SDK_VERSION is unset we were compiling against
core-libart but not okhttp.
okhttp should be an implementation detail but
android.net.http.HttpResponseCache implements
com.android.okhttp.OkCacheContainer.
The OpenJDK 8 version of of javac now requires all interfaces of
implemented classes be made available at compile time even with
-source 1.7 -target 1.7.
This is not an issue when compiling against the android.jar because
the implementation of HttpResponseCache in the android.jar does not
implement com.android.okhttp.OkCacheContainer.
Bug: 23099154
Change-Id: I3fa1d0f73535b396623fed953cfc71189b797849
2015-08-12 09:30:58 +01:00
Dan Willemsen
ccc933e97b
Use repeatable timestamps
...
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.
It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.
Bug: 23117013
Change-Id: I7c17a32b794a5adf40b9cd69136fb0ff9f6084ec
2015-08-12 00:02:20 -07:00
Dan Willemsen
8478f7abbd
resolved conflicts for merge of b184ec2a
to mnc-dev-plus-aosp
...
Change-Id: I6178127dd19ee553c15343fc0120af9463b7ac4d
2015-08-11 18:31:59 -07:00
Dan Willemsen
33f46daa22
resolved conflicts for merge of c576c08f
to mnc-dev-plus-aosp
...
Change-Id: I2d28518ac5a26de7c5df9a2e3a1902e880155101
2015-08-11 18:21:43 -07:00
Dan Willemsen
b184ec2a82
am 608aa91d
: Merge "Revert "Use repeatable timestamps""
...
* commit '608aa91db7ef1c131e2c49b0ffd39851ff2b6e9d':
Revert "Use repeatable timestamps"
2015-08-12 01:07:44 +00:00
Dan Willemsen
608aa91db7
Merge "Revert "Use repeatable timestamps""
2015-08-12 01:02:19 +00:00