Commit 9c917795 authored by mef's avatar mef Committed by Commit bot

Use CrNet.framework in crnet_test and crnet_consumer apps.

Review-Url: https://codereview.chromium.org/2323033002
Cr-Commit-Position: refs/heads/master@{#417599}
parent d916caa6
...@@ -10,7 +10,6 @@ ios_app_bundle("crnet_consumer") { ...@@ -10,7 +10,6 @@ ios_app_bundle("crnet_consumer") {
deps = [ deps = [
"//base", "//base",
"//ios/crnet:crnet_framework+link", "//ios/crnet:crnet_framework+link",
"//ios/crnet:crnet_sources",
# All shared libraries must have the sanitizer deps to properly link in # All shared libraries must have the sanitizer deps to properly link in
# asan mode (this target will be empty in other cases). # asan mode (this target will be empty in other cases).
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
#import "crnet_consumer_app_delegate.h" #import "crnet_consumer_app_delegate.h"
#import "ios/crnet/CrNet.h" #import <CrNet/CrNet.h>
#include "base/format_macros.h" #include "base/format_macros.h"
#import "crnet_consumer_view_controller.h" #import "crnet_consumer_view_controller.h"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#import "crnet_consumer_view_controller.h" #import "crnet_consumer_view_controller.h"
#import "ios/crnet/CrNet.h" #import <CrNet/CrNet.h>
@implementation CrNetConsumerViewController { @implementation CrNetConsumerViewController {
UIWebView* _webView; UIWebView* _webView;
......
...@@ -15,9 +15,11 @@ test("crnet_test") { ...@@ -15,9 +15,11 @@ test("crnet_test") {
deps = [ deps = [
"//base", "//base",
"//base:i18n", "//base:i18n",
"//ios/crnet:crnet_sources", "//ios/crnet:crnet_framework+link",
"//ios/third_party/gcdwebserver", "//ios/third_party/gcdwebserver",
"//net:test_support", "//net:test_support",
"//third_party/icu", "//third_party/icu",
] ]
bundle_deps = [ "//ios/crnet:crnet_framework+bundle" ]
} }
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include <stdint.h> #include <stdint.h>
#import "ios/crnet/CrNet.h" #import <CrNet/CrNet.h>
#include "base/logging.h" #include "base/logging.h"
#include "base/mac/scoped_nsobject.h" #include "base/mac/scoped_nsobject.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment