Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1257bc0b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: Ica1c3b9b672a90b88a398d1fb04cbc55cddce5bd
parents e96cc53d a9117815

libs/androidfw/tests/CommonHelpers.h

+0 −6
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#include <string>



#include "androidfw/ResourceTypes.h"

#include "utils/String16.h"

#include "utils/String8.h"



namespace android {
@@ -40,10 +38,6 @@ static inline bool operator==(const ResTable_config& a, const ResTable_config& b 
  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) {

  return out << c.toString();

}

tools/aapt/tests/AaptConfig_test.cpp

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include "AaptConfig.h"

#include "ConfigDescription.h"

#include "SdkConstants.h"

#include "TestHelper.h"



using android::String8;

tools/aapt/tests/AaptGroupEntry_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include "AaptAssets.h"

#include "ResourceFilter.h"

#include "TestHelper.h"



using android::String8;

tools/aapt/tests/ResourceTable_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include "ConfigDescription.h"

#include "ResourceTable.h"

#include "TestHelper.h"



using android::String16;

tools/aapt/tests/TestHelper.h

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/*

 * 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