diff options
author | Treehugger Robot | 2018-02-18 02:15:13 -0600 |
---|---|---|
committer | Gerrit Code Review | 2018-02-18 02:15:13 -0600 |
commit | c1e1d7e7112968e4941a1f2099b5c01c5b316bd4 (patch) | |
tree | 3a7a4bca7db8f84e28a6418ccbf1f5995072084a | |
parent | 31bcd7c002c0b556790e7fa0db39297f1624e7e1 (diff) | |
parent | 7a4dacf7245c484f4b602f02ccd470f04535dc62 (diff) | |
download | platform-bootable-recovery-c1e1d7e7112968e4941a1f2099b5c01c5b316bd4.tar.gz platform-bootable-recovery-c1e1d7e7112968e4941a1f2099b5c01c5b316bd4.tar.xz platform-bootable-recovery-c1e1d7e7112968e4941a1f2099b5c01c5b316bd4.zip |
Merge "Disable building libapplypatch on mac"
-rw-r--r-- | applypatch/Android.bp | 6 | ||||
-rw-r--r-- | otafault/Android.bp | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/applypatch/Android.bp b/applypatch/Android.bp index d3efa152..cb0b3674 100644 --- a/applypatch/Android.bp +++ b/applypatch/Android.bp | |||
@@ -57,6 +57,12 @@ cc_library_static { | |||
57 | "libotautil", | 57 | "libotautil", |
58 | "libz", | 58 | "libz", |
59 | ], | 59 | ], |
60 | |||
61 | target: { | ||
62 | darwin: { | ||
63 | enabled: false, | ||
64 | }, | ||
65 | }, | ||
60 | } | 66 | } |
61 | 67 | ||
62 | cc_library_static { | 68 | cc_library_static { |
diff --git a/otafault/Android.bp b/otafault/Android.bp index 30d56101..b39d5bee 100644 --- a/otafault/Android.bp +++ b/otafault/Android.bp | |||
@@ -39,6 +39,12 @@ cc_library_static { | |||
39 | "-Wthread-safety", | 39 | "-Wthread-safety", |
40 | "-Wthread-safety-negative", | 40 | "-Wthread-safety-negative", |
41 | ], | 41 | ], |
42 | |||
43 | target: { | ||
44 | darwin: { | ||
45 | enabled: false, | ||
46 | }, | ||
47 | }, | ||
42 | } | 48 | } |
43 | 49 | ||
44 | cc_test { | 50 | cc_test { |