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

Commit dd581695 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Gerrit Code Review
Browse files

Merge "Revert "Create libbase.""

parents acf0a8b3 a7870d88

adb/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ LOCAL_MODULE := adbd_test 
LOCAL_CFLAGS := -DADB_HOST=0 $(LIBADB_CFLAGS)

LOCAL_SRC_FILES := $(LIBADB_TEST_SRCS)

LOCAL_STATIC_LIBRARIES := libadbd

LOCAL_SHARED_LIBRARIES := liblog libbase libcutils

LOCAL_SHARED_LIBRARIES := liblog libcutils libutils

include $(BUILD_NATIVE_TEST)



include $(CLEAR_VARS)
@@ -98,11 +98,12 @@ LOCAL_CLANG := $(ADB_CLANG) 
LOCAL_MODULE := adb_test

LOCAL_CFLAGS := -DADB_HOST=1 $(LIBADB_CFLAGS)

LOCAL_SRC_FILES := $(LIBADB_TEST_SRCS) services.cpp

LOCAL_SHARED_LIBRARIES := liblog libbase

LOCAL_SHARED_LIBRARIES := liblog

LOCAL_STATIC_LIBRARIES := \

    libadb \

    libcrypto_static \

    libcutils \

    libutils \



ifeq ($(HOST_OS),linux)

  LOCAL_LDLIBS += -lrt -ldl -lpthread

adb/adb_io_test.cpp

+7 −7
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include <string>



#include "base/file.h"

#include "utils/file.h"



class TemporaryFile {

 public:
@@ -55,7 +55,7 @@ TEST(io, ReadFdExactly_whole) { 
  TemporaryFile tf;

  ASSERT_NE(-1, tf.fd);



  ASSERT_TRUE(android::base::WriteStringToFd(expected, tf.fd)) << strerror(errno);

  ASSERT_TRUE(android::WriteStringToFd(expected, tf.fd)) << strerror(errno);

  ASSERT_EQ(0, lseek(tf.fd, SEEK_SET, 0));



  // Test reading the whole file.
@@ -69,7 +69,7 @@ TEST(io, ReadFdExactly_eof) { 
  TemporaryFile tf;

  ASSERT_NE(-1, tf.fd);



  ASSERT_TRUE(android::base::WriteStringToFd(expected, tf.fd)) << strerror(errno);

  ASSERT_TRUE(android::WriteStringToFd(expected, tf.fd)) << strerror(errno);

  ASSERT_EQ(0, lseek(tf.fd, SEEK_SET, 0));



  // Test that not having enough data will fail.
@@ -83,7 +83,7 @@ TEST(io, ReadFdExactly_partial) { 
  TemporaryFile tf;

  ASSERT_NE(-1, tf.fd);



  ASSERT_TRUE(android::base::WriteStringToFd(input, tf.fd)) << strerror(errno);

  ASSERT_TRUE(android::WriteStringToFd(input, tf.fd)) << strerror(errno);

  ASSERT_EQ(0, lseek(tf.fd, SEEK_SET, 0));



  // Test reading a partial file.
@@ -106,7 +106,7 @@ TEST(io, WriteFdExactly_whole) { 
  ASSERT_EQ(0, lseek(tf.fd, SEEK_SET, 0));



  std::string s;

  ASSERT_TRUE(android::base::ReadFdToString(tf.fd, &s));

  ASSERT_TRUE(android::ReadFdToString(tf.fd, &s));

  EXPECT_STREQ(expected, s.c_str());

}
@@ -123,7 +123,7 @@ TEST(io, WriteFdExactly_partial) { 
  expected.pop_back();



  std::string s;

  ASSERT_TRUE(android::base::ReadFdToString(tf.fd, &s));

  ASSERT_TRUE(android::ReadFdToString(tf.fd, &s));

  EXPECT_EQ(expected, s);

}
@@ -137,6 +137,6 @@ TEST(io, WriteStringFully) { 
  ASSERT_EQ(0, lseek(tf.fd, SEEK_SET, 0));



  std::string s;

  ASSERT_TRUE(android::base::ReadFdToString(tf.fd, &s));

  ASSERT_TRUE(android::ReadFdToString(tf.fd, &s));

  EXPECT_STREQ(str, s.c_str());

}

base/.clang-format

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
BasedOnStyle: Google

AllowShortBlocksOnASingleLine: false

AllowShortFunctionsOnASingleLine: false



CommentPragmas: NOLINT:.*

DerivePointerAlignment: false

IndentWidth: 2

PointerAlignment: Left

TabWidth: 2

UseTab: Never

PenaltyExcessCharacter: 32

base/Android.mk

deleted100644 → 0
+0 −96
Original line number Diff line number Diff line 
#

# Copyright (C) 2015 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.

#



LOCAL_PATH := $(call my-dir)



libbase_src_files := \

    file.cpp \

    stringprintf.cpp \



libbase_test_src_files := \

    file_test.cpp \

    stringprintf_test.cpp \



libbase_cppflags := \

    -Wall \

    -Wextra \

    -Werror \



# Device

# ------------------------------------------------------------------------------

include $(CLEAR_VARS)

LOCAL_MODULE := libbase

LOCAL_CLANG := true

LOCAL_SRC_FILES := $(libbase_src_files)

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_CPPFLAGS := $(libbase_cppflags)

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_MULTILIB := both

include $(BUILD_STATIC_LIBRARY)



include $(CLEAR_VARS)

LOCAL_MODULE := libbase

LOCAL_CLANG := true

LOCAL_WHOLE_STATIC_LIBRARIES := libbase

LOCAL_SHARED_LIBRARIES := liblog

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_MULTILIB := both

include $(BUILD_SHARED_LIBRARY)



# Host

# ------------------------------------------------------------------------------

include $(CLEAR_VARS)

LOCAL_MODULE := libbase

LOCAL_CLANG := true

LOCAL_SRC_FILES := $(libbase_src_files)

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

LOCAL_CPPFLAGS := $(libbase_cppflags)

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_MULTILIB := both

include $(BUILD_HOST_STATIC_LIBRARY)



include $(CLEAR_VARS)

LOCAL_MODULE := libbase

LOCAL_CLANG := true

LOCAL_WHOLE_STATIC_LIBRARIES := libbase

LOCAL_SHARED_LIBRARIES := liblog

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_MULTILIB := both

include $(BUILD_HOST_SHARED_LIBRARY)



# Tests

# ------------------------------------------------------------------------------

include $(CLEAR_VARS)

LOCAL_MODULE := libbase_test

LOCAL_CLANG := true

LOCAL_SRC_FILES := $(libbase_test_src_files)

LOCAL_CPPFLAGS := $(libbase_cppflags)

LOCAL_SHARED_LIBRARIES := libbase

LOCAL_MULTILIB := both

LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32

LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64

include $(BUILD_NATIVE_TEST)



include $(CLEAR_VARS)

LOCAL_MODULE := libbase_test

LOCAL_CLANG := true

LOCAL_SRC_FILES := $(libbase_test_src_files)

LOCAL_CPPFLAGS := $(libbase_cppflags)

LOCAL_SHARED_LIBRARIES := libbase

LOCAL_MULTILIB := both

LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32

LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64

include $(BUILD_HOST_NATIVE_TEST)

base/CPPLINT.cfg

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
set noparent

filter=-build/header_guard