Skip to content

Commit

Permalink
Fixes to darwin/tv-casting-app's build due to zap changes (#24713)
Browse files Browse the repository at this point in the history
  • Loading branch information
sharadb-amazon authored and pull[bot] committed Dec 1, 2023
1 parent cf31a57 commit 1735493
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,14 @@
"$(CHIP_ROOT)/third_party/nlassert/repo/include",
"$(CHIP_ROOT)/third_party/nlio/repo/include",
"$(TEMP_DIR)/out/gen/include",
/* Compile time codegen would need this:
"$(TEMP_DIR)/out/gen/src/controller/data_model/zapgen/",
*/
"$(CHIP_ROOT)/zzz_generated/",
"$(CHIP_ROOT)/zzz_generated/app-common",
"$(CHIP_ROOT)/zzz_generated/controller-clusters",
/* darwin-specific bypassing compile time codegen for header inclusion */
"$(CHIP_ROOT)/zzz_generated/darwin/controller-clusters",
);
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down Expand Up @@ -488,9 +493,14 @@
"$(CHIP_ROOT)/third_party/nlassert/repo/include",
"$(CHIP_ROOT)/third_party/nlio/repo/include",
"$(TEMP_DIR)/out/gen/include",
/* Compile time codegen would need this:
"$(TEMP_DIR)/out/gen/src/controller/data_model/zapgen/",
*/
"$(CHIP_ROOT)/zzz_generated/",
"$(CHIP_ROOT)/zzz_generated/app-common",
"$(CHIP_ROOT)/zzz_generated/controller-clusters",
/* darwin-specific bypassing compile time codegen for header inclusion */
"$(CHIP_ROOT)/zzz_generated/darwin/controller-clusters",
);
INFOPLIST_KEY_NSHumanReadableCopyright = "";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1664,7 +1664,7 @@ - (void)targetNavigator_subscribeTargetList:(ContentApp * _Nonnull)contentApp
while (iter.Next()) {
const chip::app::Clusters::TargetNavigator::Structs::TargetInfoStruct::DecodableType & targetInfo
= iter.GetValue();
TargetNavigator_TargetInfoStruct * objCTargetInfo = [[TargetNavigator_TargetInfoStruct alloc]
TargetNavigator_TargetInfoStruct * objCTargetInfoStruct = [[TargetNavigator_TargetInfoStruct alloc]
initWithIdentifier:@(targetInfo.identifier)
name:[NSString stringWithUTF8String:targetInfo.name.data()]];
[objCTargetList addObject:objCTargetInfoStruct];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#import "ContentApp.h"

#include <zap-generated/CHIPClusters.h>
#include <app-common/zap-generated/ids/Clusters.h>

@implementation ContentApp

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
#ifndef TargetNavigatorTypes_h
#define TargetNavigatorTypes_h

@interface TargetNavigator_TargetInfo : NSObject <NSCopying>
@interface TargetNavigator_TargetInfoStruct : NSObject <NSCopying>

@property (nonatomic, copy) NSNumber * _Nonnull identifier;
@property (nonatomic, copy) NSString * _Nonnull name;

- (TargetNavigator_TargetInfo * _Nonnull)initWithIdentifier:(NSNumber * _Nonnull)identifier name:(NSString * _Nonnull)name;
- (TargetNavigator_TargetInfoStruct * _Nonnull)initWithIdentifier:(NSNumber * _Nonnull)identifier name:(NSString * _Nonnull)name;

- (id _Nonnull)copyWithZone:(NSZone * _Nullable)zone;
@end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

#import "TargetNavigatorTypes.h"

@implementation TargetNavigator_TargetInfo
@implementation TargetNavigator_TargetInfoStruct

- (TargetNavigator_TargetInfo * _Nonnull)initWithIdentifier:(NSNumber * _Nonnull)identifier name:(NSString * _Nonnull)name
- (TargetNavigator_TargetInfoStruct * _Nonnull)initWithIdentifier:(NSNumber * _Nonnull)identifier name:(NSString * _Nonnull)name
{
self = [super init];
if (self) {
Expand All @@ -33,11 +33,11 @@ - (TargetNavigator_TargetInfo * _Nonnull)initWithIdentifier:(NSNumber * _Nonnull

- (NSString *)description
{
return [NSString stringWithFormat:@"TargetNavigator_TargetInfo: identifier=%@ name=%@", _identifier, _name];
return [NSString stringWithFormat:@"TargetNavigator_TargetInfoStruct: identifier=%@ name=%@", _identifier, _name];
}

- (id)copyWithZone:(NSZone * _Nullable)zone
{
return [[TargetNavigator_TargetInfo alloc] initWithIdentifier:_identifier name:_name];
return [[TargetNavigator_TargetInfoStruct alloc] initWithIdentifier:_identifier name:_name];
}
@end
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"TvCasting/Preview Content\"";
DEVELOPMENT_TEAM = KCRB72LX9T;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down Expand Up @@ -449,7 +449,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"TvCasting/Preview Content\"";
DEVELOPMENT_TEAM = KCRB72LX9T;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down
2 changes: 2 additions & 0 deletions examples/tv-casting-app/linux/CastingShellCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
*/

#include "CastingShellCommands.h"

#include "CastingServer.h"
#include "CastingUtils.h"
#include "app/clusters/bindings/BindingManager.h"
#include <inttypes.h>
#include <lib/core/CHIPCore.h>
#include <lib/shell/Commands.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
#pragma once

#include "TargetEndpointInfo.h"
#include "app/clusters/bindings/BindingManager.h"

#include <app/OperationalSessionSetup.h>
#include <platform/CHIPDeviceLayer.h>

constexpr size_t kMaxNumberOfEndpoints = 5;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

#include "CastingServer.h"

#include "app/clusters/bindings/BindingManager.h"

using namespace chip;
using namespace chip::Controller;
using namespace chip::Credentials;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
*/
#include "TargetVideoPlayerInfo.h"

#include <app/server/Server.h>

using namespace chip;

CASEClientPool<CHIP_CONFIG_DEVICE_MAX_ACTIVE_CASE_CLIENTS> gCASEClientPool;
Expand Down

0 comments on commit 1735493

Please sign in to comment.