64-bit libglog prebuilt
Change-Id: If87ada0952200781ae66ba01f652660e5990e442
source: ab/4094998
diff --git a/include/glog/log_severity.h b/Debug/include/glog/log_severity.h
old mode 100644
new mode 100755
similarity index 100%
rename from include/glog/log_severity.h
rename to Debug/include/glog/log_severity.h
diff --git a/include/glog/logging.h b/Debug/include/glog/logging.h
similarity index 100%
rename from include/glog/logging.h
rename to Debug/include/glog/logging.h
diff --git a/include/glog/raw_logging.h b/Debug/include/glog/raw_logging.h
similarity index 100%
rename from include/glog/raw_logging.h
rename to Debug/include/glog/raw_logging.h
diff --git a/include/glog/stl_logging.h b/Debug/include/glog/stl_logging.h
similarity index 100%
rename from include/glog/stl_logging.h
rename to Debug/include/glog/stl_logging.h
diff --git a/include/glog/vlog_is_on.h b/Debug/include/glog/vlog_is_on.h
similarity index 100%
rename from include/glog/vlog_is_on.h
rename to Debug/include/glog/vlog_is_on.h
diff --git a/Debug/lib/libglog.lib b/Debug/lib/libglog.lib
new file mode 100755
index 0000000..e1dbdbf
--- /dev/null
+++ b/Debug/lib/libglog.lib
Binary files differ
diff --git a/Debug/libglog.dll b/Debug/libglog.dll
deleted file mode 100755
index 838eff2..0000000
--- a/Debug/libglog.dll
+++ /dev/null
Binary files differ
diff --git a/Debug/libglog.exp b/Debug/libglog.exp
deleted file mode 100755
index 23eca20..0000000
--- a/Debug/libglog.exp
+++ /dev/null
Binary files differ
diff --git a/Debug/libglog.ilk b/Debug/libglog.ilk
deleted file mode 100755
index 032ea0e..0000000
--- a/Debug/libglog.ilk
+++ /dev/null
Binary files differ
diff --git a/Debug/libglog.lib b/Debug/libglog.lib
deleted file mode 100755
index a478437..0000000
--- a/Debug/libglog.lib
+++ /dev/null
Binary files differ
diff --git a/Debug/libglog.pdb b/Debug/libglog.pdb
deleted file mode 100755
index bbc70d9..0000000
--- a/Debug/libglog.pdb
+++ /dev/null
Binary files differ
diff --git a/Debug/libglog_static.lib b/Debug/libglog_static.lib
deleted file mode 100755
index a235d50..0000000
--- a/Debug/libglog_static.lib
+++ /dev/null
Binary files differ
diff --git a/Debug/libglog_static.pdb b/Debug/libglog_static.pdb
deleted file mode 100755
index 459e88b..0000000
--- a/Debug/libglog_static.pdb
+++ /dev/null
Binary files differ
diff --git a/Debug/logging_unittest.exe b/Debug/logging_unittest.exe
deleted file mode 100755
index 0db5a9d..0000000
--- a/Debug/logging_unittest.exe
+++ /dev/null
Binary files differ
diff --git a/Debug/logging_unittest.ilk b/Debug/logging_unittest.ilk
deleted file mode 100755
index b800f70..0000000
--- a/Debug/logging_unittest.ilk
+++ /dev/null
Binary files differ
diff --git a/Debug/logging_unittest.pdb b/Debug/logging_unittest.pdb
deleted file mode 100755
index fd7eee5..0000000
--- a/Debug/logging_unittest.pdb
+++ /dev/null
Binary files differ
diff --git a/Debug/logging_unittest_static.exe b/Debug/logging_unittest_static.exe
deleted file mode 100755
index f8e061e..0000000
--- a/Debug/logging_unittest_static.exe
+++ /dev/null
Binary files differ
diff --git a/Debug/logging_unittest_static.ilk b/Debug/logging_unittest_static.ilk
deleted file mode 100755
index 35c4ebd..0000000
--- a/Debug/logging_unittest_static.ilk
+++ /dev/null
Binary files differ
diff --git a/Debug/logging_unittest_static.pdb b/Debug/logging_unittest_static.pdb
deleted file mode 100755
index 68ecd73..0000000
--- a/Debug/logging_unittest_static.pdb
+++ /dev/null
Binary files differ
diff --git a/include/glog/log_severity.h b/Release/include/glog/log_severity.h
old mode 100644
new mode 100755
similarity index 100%
copy from include/glog/log_severity.h
copy to Release/include/glog/log_severity.h
diff --git a/include/glog/logging.h b/Release/include/glog/logging.h
similarity index 100%
copy from include/glog/logging.h
copy to Release/include/glog/logging.h
diff --git a/include/glog/raw_logging.h b/Release/include/glog/raw_logging.h
similarity index 100%
copy from include/glog/raw_logging.h
copy to Release/include/glog/raw_logging.h
diff --git a/include/glog/stl_logging.h b/Release/include/glog/stl_logging.h
similarity index 100%
copy from include/glog/stl_logging.h
copy to Release/include/glog/stl_logging.h
diff --git a/include/glog/vlog_is_on.h b/Release/include/glog/vlog_is_on.h
similarity index 100%
copy from include/glog/vlog_is_on.h
copy to Release/include/glog/vlog_is_on.h
diff --git a/Release/lib/libglog.lib b/Release/lib/libglog.lib
new file mode 100755
index 0000000..dcac816
--- /dev/null
+++ b/Release/lib/libglog.lib
Binary files differ
diff --git a/Release/libglog.dll b/Release/libglog.dll
deleted file mode 100755
index fba2b5b..0000000
--- a/Release/libglog.dll
+++ /dev/null
Binary files differ
diff --git a/Release/libglog.exp b/Release/libglog.exp
deleted file mode 100755
index da329b6..0000000
--- a/Release/libglog.exp
+++ /dev/null
Binary files differ
diff --git a/Release/libglog.iobj b/Release/libglog.iobj
deleted file mode 100755
index e61f338..0000000
--- a/Release/libglog.iobj
+++ /dev/null
Binary files differ
diff --git a/Release/libglog.ipdb b/Release/libglog.ipdb
deleted file mode 100755
index 5f18d6c..0000000
--- a/Release/libglog.ipdb
+++ /dev/null
Binary files differ
diff --git a/Release/libglog.lib b/Release/libglog.lib
deleted file mode 100755
index 0c04494..0000000
--- a/Release/libglog.lib
+++ /dev/null
Binary files differ
diff --git a/Release/libglog.pdb b/Release/libglog.pdb
deleted file mode 100755
index 67a77a3..0000000
--- a/Release/libglog.pdb
+++ /dev/null
Binary files differ
diff --git a/Release/libglog_static.lib b/Release/libglog_static.lib
deleted file mode 100755
index 8fec134..0000000
--- a/Release/libglog_static.lib
+++ /dev/null
Binary files differ
diff --git a/Release/logging_unittest.exe b/Release/logging_unittest.exe
deleted file mode 100755
index fd57b8b..0000000
--- a/Release/logging_unittest.exe
+++ /dev/null
Binary files differ
diff --git a/Release/logging_unittest.iobj b/Release/logging_unittest.iobj
deleted file mode 100755
index 9a3fbf2..0000000
--- a/Release/logging_unittest.iobj
+++ /dev/null
Binary files differ
diff --git a/Release/logging_unittest.ipdb b/Release/logging_unittest.ipdb
deleted file mode 100755
index 9347a84..0000000
--- a/Release/logging_unittest.ipdb
+++ /dev/null
Binary files differ
diff --git a/Release/logging_unittest.pdb b/Release/logging_unittest.pdb
deleted file mode 100755
index f645d6a..0000000
--- a/Release/logging_unittest.pdb
+++ /dev/null
Binary files differ
diff --git a/Release/logging_unittest_static.exe b/Release/logging_unittest_static.exe
deleted file mode 100755
index 1de0efd..0000000
--- a/Release/logging_unittest_static.exe
+++ /dev/null
Binary files differ
diff --git a/Release/logging_unittest_static.iobj b/Release/logging_unittest_static.iobj
deleted file mode 100755
index 2a1dbc4..0000000
--- a/Release/logging_unittest_static.iobj
+++ /dev/null
Binary files differ
diff --git a/Release/logging_unittest_static.ipdb b/Release/logging_unittest_static.ipdb
deleted file mode 100755
index eb00c56..0000000
--- a/Release/logging_unittest_static.ipdb
+++ /dev/null
Binary files differ
diff --git a/Release/logging_unittest_static.pdb b/Release/logging_unittest_static.pdb
deleted file mode 100755
index 916bd0c..0000000
--- a/Release/logging_unittest_static.pdb
+++ /dev/null
Binary files differ
diff --git a/build-common.sh b/build-common.sh
deleted file mode 100755
index 1ab2249..0000000
--- a/build-common.sh
+++ /dev/null
@@ -1,153 +0,0 @@
-# latest version of this file can be found at
-# sso://googleplex-android/platform/external/lldb-utils
-#
-# inputs
-# $PROJ - project name
-# $VER - project version
-# $1 - (temporary) output directory
-# $2 - build directory for build artefacts
-# $3 - build number
-#
-# this file does the following:
-#
-# 1) define the following env vars
-# OS - linux|darwin|windows
-# CORES - numer of cores (for parallel builds)
-# PATH (with appropriate compilers)
-# CFLAGS/CXXFLAGS/LDFLAGS
-# RD - root directory for source and object files
-# INSTALL - install directory
-# SCRIPT_FILE - absolute path to the parent build script
-# SCRIPT_DIR - absolute path to the parent build script's directory
-# COMMON_FILE - absolute path to this file
-# 2) cd $RD
-#
-# after placing all your build products into $INSTALL you should call finalize_build to produce
-# the final build artifact
-
-# exit on error
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[1]}")" && pwd -P)"
-SCRIPT_FILE="$SCRIPT_DIR/$(basename "${BASH_SOURCE[1]}")"
-COMMON_FILE="$SCRIPT_DIR/$(basename "${BASH_SOURCE[0]}")"
-
-# calculate the root directory from the script path
-# this script lives three directories down from the root
-# external/lldb-utils/prebuilts/build-common.sh
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd -P)"
-cd "$ROOT_DIR"
-
-function die() {
- echo "$*" > /dev/stderr
- echo "Usage: $0 <out_dir> <dest_dir> <build_number>" > /dev/stderr
- exit 1
-}
-
-(($# > 3)) && die "[$0] Unknown parameter: $4"
-
-OUT="$1"
-DEST="$2"
-BNUM="$3"
-
-[ ! "$OUT" ] && die "## Error: Missing out folder"
-[ ! "$DEST" ] && die "## Error: Missing destination folder"
-[ ! "$BNUM" ] && die "## Error: Missing build number"
-
-mkdir -p "$OUT" "$DEST"
-OUT="$(cd "$OUT" && pwd -P)"
-DEST="$(cd "$DEST" && pwd -P)"
-
-cat <<END_INFO
-## Building $PROJ ##
-## Out Dir : $OUT
-## Dest Dir : $DEST
-## Build Num: $BNUM
-
-END_INFO
-
-UNAME="$(uname)"
-UPSTREAM=sso://googleplex-android/platform/prebuilts
-case "$UNAME" in
-Linux)
- OS='linux'
- INSTALL_VER=$VER
- ;;
-Darwin)
- OS='darwin'
- OSX_MIN=10.8
- export CC=clang
- export CXX=$CC++
- export CFLAGS="$CFLAGS -mmacosx-version-min=$OSX_MIN"
- export CXXFLAGS="$CXXFLAGS -mmacosx-version-min=$OSX_MIN -stdlib=libc++"
- export LDFLAGS="$LDFLAGS -mmacosx-version-min=$OSX_MIN"
- INSTALL_VER=$VER
- ;;
-*_NT-*)
- OS='windows'
- CORES=$NUMBER_OF_PROCESSORS
- case "$MSVS" in
- 2015)
- devenv() {
- cmd /c "${VS140COMNTOOLS}VsDevCmd.bat" '&' devenv.com "$@"
- }
- INSTALL_VER=${VER}_${MSVS}
- ;;
- 2013)
- devenv() {
- cmd /c "${VS120COMNTOOLS}VsDevCmd.bat" '&' devenv.com "$@"
- }
- INSTALL_VER=${VER}_${MSVS}
- ;;
- *)
- # g++/make build
- export CC=x86_64-w64-mingw32-gcc
- export CXX=x86_64-w64-mingw32-g++
- export LD=x86_64-w64-mingw32-ld
- ;;
- esac
- ;;
-*)
- exit 1
- ;;
-esac
-
-RD=$OUT/$PROJ
-INSTALL="$RD/install"
-
-cd /tmp # windows can't delete if you're in the dir
-rm -rf $RD
-mkdir -p $INSTALL
-mkdir -p $RD
-cd $RD
-
-# clone prebuilt gcc
-case "$OS" in
-linux)
- # can't get prebuilt clang working so we're using host clang-3.5 https://b/22748915
- #CLANG_DIR=$RD/clang
- #git clone $UPSTREAM/clang/linux-x86/host/3.6 $CLANG_DIR
- #export CC="$CLANG_DIR/bin/clang"
- #export CXX="$CC++"
- export CC=clang-3.5
- export CXX=clang++-3.5
-
- GCC_DIR=$RD/gcc
- git clone $UPSTREAM/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8 $GCC_DIR
-
- find "$GCC_DIR" -name x86_64-linux -exec ln -fns {} {}-gnu \;
-
- FLAGS+=(-fuse-ld=gold)
- FLAGS+=(--gcc-toolchain="$GCC_DIR")
- FLAGS+=(--sysroot "$GCC_DIR/sysroot")
- FLAGS+=(-B"$GCC_DIR/bin/x86_64-linux-")
- export CFLAGS="$CFLAGS ${FLAGS[*]}"
- export CXXFLAGS="$CXXFLAGS ${FLAGS[*]}"
- export LDFLAGS="$LDFLAGS -m64"
- ;;
-esac
-
-function finalize_build() {
- cp "$SCRIPT_FILE" "$COMMON_FILE" "$INSTALL"
- (cd "$INSTALL" && zip --symlinks -r "$DEST/$PROJ-$BNUM.zip" .)
-}
diff --git a/build-glog.sh b/build-glog.sh
deleted file mode 100755
index 2439ad8..0000000
--- a/build-glog.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash -ex
-# latest version of this file can be found at
-# https://android.googlesource.com/platform/external/lldb-utils
-#
-# Download & build glog on the local machine
-# works on Linux, OS X, and Windows (Cygwin)
-# leaves output in /tmp/prebuilts/libglog/$OS-x86
-
-PROJ=libglog
-VER=0.3.4
-MSVS=2015
-
-source "$(dirname "${BASH_SOURCE[0]}")/build-common.sh" "$@"
-
-BASE=${PROJ#lib}-$VER
-TGZ=v${VER}.tar.gz
-
-curl -L https://github.com/google/glog/archive/$TGZ -o $TGZ
-
-tar xzf $TGZ || cat $TGZ # if this fails, we're probably getting an http error
-cd $BASE
-patch -p3 <"$SCRIPT_DIR/glog.patches"
-case "$OS" in
- windows)
- devenv google-glog.sln /Upgrade
- devenv google-glog.sln /Build Debug
- devenv google-glog.sln /Build Release
- cp -a Debug $INSTALL/
- cp -a Release $INSTALL/
- mkdir -p $INSTALL/include
- cp -a src/windows/glog $INSTALL/include/
- ;;
- linux|darwin)
- mkdir $RD/build
- cd $RD/build
- $RD/$BASE/configure --prefix=$INSTALL
- make -j$CORES
- make install
- ;;
-esac
-
-case "$OS" in
- darwin)
- LIB=lib/libglog.0.dylib
- install_name_tool -id @executable_path/../$LIB $INSTALL/$LIB
- ;;
-esac
-
-finalize_build
diff --git a/glog.patches b/glog.patches
deleted file mode 100644
index cf6977a..0000000
--- a/glog.patches
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -aur OUTa/libglog/glog-0.3.4/src/windows/port.cc OUT/libglog/glog-0.3.4/src/windows/port.cc
---- OUTa/libglog/glog-0.3.4/src/windows/port.cc 2015-03-10 21:02:27.000000000 -0700
-+++ OUT/libglog/glog-0.3.4/src/windows/port.cc 2016-02-04 06:39:15.020941800 -0800
-@@ -36,6 +36,7 @@
- # error You should only be including windows/port.cc in a windows environment!
- #endif
-
-+#if !defined(_MSC_VER) || _MSC_VER < 1900
- #include "config.h"
- #include <stdarg.h> // for va_list, va_start, va_end
- #include <string.h> // for strstr()
-@@ -62,3 +63,4 @@
- va_end(ap);
- return r;
- }
-+#endif
-\ No newline at end of file
-diff -aur OUTa/libglog/glog-0.3.4/src/windows/port.h OUT/libglog/glog-0.3.4/src/windows/port.h
---- OUTa/libglog/glog-0.3.4/src/windows/port.h 2015-03-10 21:02:27.000000000 -0700
-+++ OUT/libglog/glog-0.3.4/src/windows/port.h 2016-02-04 06:46:29.038741800 -0800
-@@ -107,6 +107,7 @@
- /* Sleep is in ms, on windows */
- #define sleep(secs) Sleep((secs) * 1000)
-
-+#if _MSC_VER < 1900
- /* We can't just use _vsnprintf and _snprintf as drop-in-replacements,
- * because they don't always NUL-terminate. :-( We also can't use the
- * name vsnprintf, since windows defines that (but not snprintf (!)).
-@@ -117,6 +118,7 @@
- const char *format, va_list ap);
- #define vsnprintf(str, size, format, ap) safe_vsnprintf(str, size, format, ap)
- #define va_copy(dst, src) (dst) = (src)
-+#endif // _MSC_VER < 1900
-
- /* Windows doesn't support specifying the number of buckets as a
- * hash_map constructor arg, so we leave this blank.
diff --git a/revisions b/revisions
new file mode 100644
index 0000000..69ac249
--- /dev/null
+++ b/revisions
@@ -0,0 +1,4 @@
+external/lldb-utils 90cc16399d08ba310f36d74475ff541be7ed41bd
+external/libglog d8cb47f77d1c31779f3ff890e1a5748483778d6a
+
+Microsoft Visual Studio 2015 Version 14.0.24720.0.
