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

Commit 693aa74d authored by Luke Song's avatar Luke Song Committed by Android (Google) Code Review
Browse files

Merge "Remove/Cleanup Obselete References" into oc-dev

parents 5a0cb643 4b78832d

libs/vr/libdvrcommon/include/private/dvr/benchmark.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
// ... code to benchmark ...

// ... code to benchmark ...

// Btrace("End execution");

// Btrace("End execution");

//

//

// Use compute_benchmarks.py (currently in dreamos/system/core/applications),

// Use compute_benchmarks.py

// with the trace path "Start execution,End execution",

// with the trace path "Start execution,End execution",

// to report the elapsed time between the two calls.

// to report the elapsed time between the two calls.

//

//

libs/vr/libimageio/include/private/dvr/image_io_base.h

+3 −3
Original line number Original line Diff line number Diff line 
#ifndef LIB_LIBIMAGEIO_PRIVATE_DREAMOS_IMAGE_IO_BASE_H_

#ifndef LIB_LIBIMAGEIO_PRIVATE_DVR_IMAGE_IO_BASE_H_

#define LIB_LIBIMAGEIO_PRIVATE_DREAMOS_IMAGE_IO_BASE_H_

#define LIB_LIBIMAGEIO_PRIVATE_DVR_IMAGE_IO_BASE_H_





#include <memory>

#include <memory>

#include <string>

#include <string>
@@ -53,4 +53,4 @@ class ImageIoWriter { 
  ImageIoWriter() = delete;

  ImageIoWriter() = delete;

};

};





#endif  // LIB_LIBIMAGEIO_PRIVATE_DREAMOS_IMAGE_IO_BASE_H_
 
#endif  // LIB_LIBIMAGEIO_PRIVATE_DVR_IMAGE_IO_BASE_H_

libs/vr/libimageio/include/private/dvr/image_io_logging.h

+3 −3
Original line number Original line Diff line number Diff line 
#ifndef LIB_LIBIMAGEIO_PRIVATE_DREAMOS_IMAGE_IO_LOGGING_H_

#ifndef LIB_LIBIMAGEIO_PRIVATE_DVR_IMAGE_IO_LOGGING_H_

#define LIB_LIBIMAGEIO_PRIVATE_DREAMOS_IMAGE_IO_LOGGING_H_

#define LIB_LIBIMAGEIO_PRIVATE_DVR_IMAGE_IO_LOGGING_H_





// This header acts as log/log.h if LOG_TO_STDERR is not defined.

// This header acts as log/log.h if LOG_TO_STDERR is not defined.

// If LOG_TO_STDERR is defined, then android logging macros (such as ALOGE)

// If LOG_TO_STDERR is defined, then android logging macros (such as ALOGE)
@@ -36,4 +36,4 @@ inline void LogToStderr(const char* severity, const char* fmt, ...) { 
#include <log/log.h>

#include <log/log.h>

#endif  // LOG_TO_STDERR

#endif  // LOG_TO_STDERR





#endif  // LIB_LIBIMAGEIO_PRIVATE_DREAMOS_IMAGE_IO_LOGGING_H_
 
#endif  // LIB_LIBIMAGEIO_PRIVATE_DVR_IMAGE_IO_LOGGING_H_

libs/vr/libimageio/include/private/dvr/image_io_png.h

+3 −3
Original line number Original line Diff line number Diff line 
#ifndef LIB_LIBIMAGEIO_PRIVATE_DREAMOS_IMAGE_IO_PNG_H_

#ifndef LIB_LIBIMAGEIO_PRIVATE_DVR_IMAGE_IO_PNG_H_

#define LIB_LIBIMAGEIO_PRIVATE_DREAMOS_IMAGE_IO_PNG_H_

#define LIB_LIBIMAGEIO_PRIVATE_DVR_IMAGE_IO_PNG_H_





#include <fstream>

#include <fstream>
@@ -21,4 +21,4 @@ class ImageIoPngWriter : public ImageIoWriter { 
  friend class ImageIoWriter;

  friend class ImageIoWriter;

};

};





#endif  // LIB_LIBIMAGEIO_PRIVATE_DREAMOS_IMAGE_IO_PNG_H_
 
#endif  // LIB_LIBIMAGEIO_PRIVATE_DVR_IMAGE_IO_PNG_H_

libs/vr/libimageio/include/private/dvr/image_io_ppm.h

+3 −3
Original line number Original line Diff line number Diff line 
#ifndef LIB_LIBIMAGEIO_PRIVATE_DREAMOS_IMAGE_IO_PPM_H_

#ifndef LIB_LIBIMAGEIO_PRIVATE_DVR_IMAGE_IO_PPM_H_

#define LIB_LIBIMAGEIO_PRIVATE_DREAMOS_IMAGE_IO_PPM_H_

#define LIB_LIBIMAGEIO_PRIVATE_DVR_IMAGE_IO_PPM_H_





#include <private/dvr/image_io_base.h>

#include <private/dvr/image_io_base.h>
@@ -25,4 +25,4 @@ class ImageIoPpmWriter : public ImageIoWriter { 
  friend class ImageIoWriter;

  friend class ImageIoWriter;

};

};





#endif  // LIB_LIBIMAGEIO_PRIVATE_DREAMOS_IMAGE_IO_PPM_H_
 
#endif  // LIB_LIBIMAGEIO_PRIVATE_DVR_IMAGE_IO_PPM_H_