diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-06-02 08:31:19 -0700 |
|---|---|---|
| committer | Luis Hector Chavez <lhchavez@google.com> | 2016-06-02 08:31:19 -0700 |
| commit | ab9742e308595181efc9b9564d22b92d42a49264 (patch) | |
| tree | f1d4c1c78bb1178d1c7ec650005ac21c4a75c136 | |
| parent | 79a0a1a3d809da950fc573504984961f5a9c2a38 (diff) | |
| download | libchrome-nougat-mr1-wear-release.tar.gz | |
libchrome: Fix the build in OS X > 10.10android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
For some reason, there is a conflict in the forward declaration of
NSUserActivity. This allows newer versions of OS X than what the
buildbots have to be able to build libchrome.
Bug: 28985443
Change-Id: I3ba3af04fcaba086862f3114250324348c0c9cf2
Test: mmma -j external/libchrome # in El Capitan
| -rw-r--r-- | base/mac/sdk_forward_declarations.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/base/mac/sdk_forward_declarations.h b/base/mac/sdk_forward_declarations.h index 972a0cc89f..818a1d0f05 100644 --- a/base/mac/sdk_forward_declarations.h +++ b/base/mac/sdk_forward_declarations.h @@ -77,18 +77,6 @@ #endif // MAC_OS_X_VERSION_10_9 -#if !defined(MAC_OS_X_VERSION_10_10) || \ - MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10 - -@interface NSUserActivity : NSObject -@end - -#else - -@class NSUserActivity; - -#endif // MAC_OS_X_VERSION_10_10 - // ---------------------------------------------------------------------------- // Define typedefs, enums, and protocols not available in the version of the // OSX SDK being compiled against. @@ -502,18 +490,6 @@ BASE_EXPORT extern "C" void NSAccessibilityPostNotificationWithUserInfo( #if !defined(MAC_OS_X_VERSION_10_10) || \ MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10 -@interface NSUserActivity (YosemiteSDK) - -@property(readonly, copy) NSString* activityType; -@property(copy) NSDictionary* userInfo; -@property(copy) NSURL* webpageURL; - -- (instancetype)initWithActivityType:(NSString*)activityType; -- (void)becomeCurrent; -- (void)invalidate; - -@end - @interface CBUUID (YosemiteSDK) - (NSString*)UUIDString; @end |