Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use String8 ostream from String8.h" am: a9117815ed

Browse Source 
Change-Id: Ica1c3b9b672a90b88a398d1fb04cbc55cddce5bd
This commit is contained in:
Automerger Merge Worker
2020-02-27 23:22:51 +00:00
parent e96cc53d1a a9117815ed
commit 1257bc0b9d
5 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/androidfw/tests/CommonHelpers.h
View File

@@ -21,8 +21,6 @@
#include <string> #include <string>
#include "androidfw/ResourceTypes.h" #include "androidfw/ResourceTypes.h"
#include "utils/String16.h"
#include "utils/String8.h"
namespace android { namespace android {
@@ -40,10 +38,6 @@ static inline bool operator==(const ResTable_config& a, const ResTable_config& b
return a.compare(b) == 0; return a.compare(b) == 0;
} }
static inline ::std::ostream& operator<<(::std::ostream& out, const String8& str) {
return out << str.string();
}
static inline ::std::ostream& operator<<(::std::ostream& out, const ResTable_config& c) { static inline ::std::ostream& operator<<(::std::ostream& out, const ResTable_config& c) {
return out << c.toString(); return out << c.toString();
} }

3
tools/aapt/tests/AaptConfig_test.cpp
View File

@@ -20,7 +20,6 @@
#include "AaptConfig.h" #include "AaptConfig.h"
#include "ConfigDescription.h" #include "ConfigDescription.h"
#include "SdkConstants.h" #include "SdkConstants.h"
#include "TestHelper.h"
using android::String8; using android::String8;
@@ -127,4 +126,4 @@ TEST(AaptConfigTest, HdrQualifier) {
config.colorMode & android::ResTable_config::MASK_HDR); config.colorMode & android::ResTable_config::MASK_HDR);
EXPECT_EQ(SDK_O, config.sdkVersion); EXPECT_EQ(SDK_O, config.sdkVersion);
EXPECT_EQ(String8("lowdr-v26"), config.toString()); EXPECT_EQ(String8("lowdr-v26"), config.toString());
} }

1
tools/aapt/tests/AaptGroupEntry_test.cpp
View File

@@ -19,7 +19,6 @@
#include "AaptAssets.h" #include "AaptAssets.h"
#include "ResourceFilter.h" #include "ResourceFilter.h"
#include "TestHelper.h"
using android::String8; using android::String8;

1
tools/aapt/tests/ResourceTable_test.cpp
View File

@@ -19,7 +19,6 @@
#include "ConfigDescription.h" #include "ConfigDescription.h"
#include "ResourceTable.h" #include "ResourceTable.h"
#include "TestHelper.h"
using android::String16; using android::String16;

33
tools/aapt/tests/TestHelper.h
View File

@@ -1,33 +0,0 @@
/*
* Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef __TEST_HELPER_H
#define __TEST_HELPER_H
#include <utils/String8.h>
namespace android {
/**
* Stream operator for nicely printing String8's in gtest output.
*/
inline std::ostream& operator<<(std::ostream& stream, const String8& str) {
return stream << str.string();
}
}
#endif