| commit | 14b354ce215190e93b5deca27c4a716749e8391d | [log] [tgz] |
|---|---|---|
| author | Alex Deymo <deymo@google.com> | Tue Oct 18 14:39:33 2016 -0700 |
| committer | Alex Deymo <deymo@google.com> | Tue Oct 18 14:39:33 2016 -0700 |
| tree | 524513f7e1a2ab3616907df17f48fcc89adc4192 | |
| parent | b0829b6eb58f2a548aab19f715eee15f86711847 [diff] [blame] | |
| parent | 042fb9376cba5a3c05fbaad4d409ba3b4ab63168 [diff] [blame] |
resolve merge conflicts of 042fb93 to nyc-mr1-dev-plus-aosp Change-Id: I737f8eb2535334f57f13b396ea2e267a126352c9
diff --git a/Android.bp b/Android.bp index 42dae7c..8f6dd47 100644 --- a/Android.bp +++ b/Android.bp
@@ -35,6 +35,9 @@ defaults: ["curl_common_defaults"], export_include_dirs: ["include"], host_supported: true, + cflags: [ + "-DBUILDING_LIBCURL", + ], srcs:[ "lib/file.c", "lib/timeval.c",