Merge "Remove BlobCAche from libutils"
diff --git a/.clang-format b/.clang-format
new file mode 120000
index 0000000..9b45e0a
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1 @@
+.clang-format-4
\ No newline at end of file
diff --git a/.clang-format-2 b/.clang-format-2
new file mode 100644
index 0000000..fb967d8
--- /dev/null
+++ b/.clang-format-2
@@ -0,0 +1,13 @@
+BasedOnStyle: Google
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: true
+
+AccessModifierOffset: -1
+ColumnLimit: 100
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+IndentWidth: 2
+PointerAlignment: Left
+TabWidth: 2
+UseTab: Never
+PenaltyExcessCharacter: 32
diff --git a/.clang-format b/.clang-format-4
similarity index 100%
rename from .clang-format
rename to .clang-format-4
diff --git a/adb/jdwp_service.cpp b/adb/jdwp_service.cpp
index 3135aa4..9589d88 100644
--- a/adb/jdwp_service.cpp
+++ b/adb/jdwp_service.cpp
@@ -571,7 +571,8 @@
remove_socket(s);
auto pred = [s](const auto& tracker) { return tracker.get() == s; };
- std::remove_if(_jdwp_trackers.begin(), _jdwp_trackers.end(), pred);
+ _jdwp_trackers.erase(std::remove_if(_jdwp_trackers.begin(), _jdwp_trackers.end(), pred),
+ _jdwp_trackers.end());
}
static void jdwp_tracker_ready(asocket* s) {
diff --git a/init/Android.mk b/init/Android.mk
index 5bcfb7b..1a47eb4 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -120,7 +120,9 @@
nonplat_sepolicy.cil \
plat_sepolicy.cil \
plat_sepolicy.cil.sha256 \
- secilc
+ secilc \
+ nonplat_file_contexts \
+ plat_file_contexts
# Include precompiled policy, unless told otherwise
ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false)
@@ -129,7 +131,8 @@
else
# Use monolithic SELinux policy
-LOCAL_REQUIRED_MODULES += sepolicy
+LOCAL_REQUIRED_MODULES += sepolicy \
+ file_contexts.bin
endif
# Create symlinks.
diff --git a/libbacktrace/.clang-format b/libbacktrace/.clang-format
new file mode 120000
index 0000000..fd0645f
--- /dev/null
+++ b/libbacktrace/.clang-format
@@ -0,0 +1 @@
+../.clang-format-2
\ No newline at end of file
diff --git a/libutils/Printer.cpp b/libutils/Printer.cpp
index 9573a10..12f77bb 100644
--- a/libutils/Printer.cpp
+++ b/libutils/Printer.cpp
@@ -21,6 +21,8 @@
#include <utils/String8.h>
#include <utils/Log.h>
+#include <stdlib.h>
+
namespace android {
/*
diff --git a/libutils/ProcessCallStack.cpp b/libutils/ProcessCallStack.cpp
index 1d9f30d..ff8b32a 100644
--- a/libutils/ProcessCallStack.cpp
+++ b/libutils/ProcessCallStack.cpp
@@ -20,6 +20,7 @@
#include <utils/ProcessCallStack.h>
#include <dirent.h>
+#include <memory>
#include <utils/Printer.h>
diff --git a/libutils/String16.cpp b/libutils/String16.cpp
index 12bb7c4..ad335c3 100644
--- a/libutils/String16.cpp
+++ b/libutils/String16.cpp
@@ -18,6 +18,8 @@
#include <utils/Log.h>
+#include <ctype.h>
+
#include "SharedBuffer.h"
namespace android {
diff --git a/libutils/String8.cpp b/libutils/String8.cpp
index 0ac39f9..ad0e72e 100644
--- a/libutils/String8.cpp
+++ b/libutils/String8.cpp
@@ -23,6 +23,8 @@
#include <utils/Log.h>
#include <utils/String16.h>
+#include <ctype.h>
+
#include "SharedBuffer.h"
/*
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index 03f878a..86fec6a 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -53,7 +53,7 @@
# Pretty comprehensive set of native services. This list is helpful if all that's to be checked is an
# app.
-ifeq ($(SANITIZE_LITE),true)
+ifeq ($(SANITIZE_LITE_SERVICES),true)
SANITIZE_ASAN_OPTIONS_FOR := \
adbd \
ATFWD-daemon \
diff --git a/storaged/storaged_service.cpp b/storaged/storaged_service.cpp
index a335298..f968ed7 100644
--- a/storaged/storaged_service.cpp
+++ b/storaged/storaged_service.cpp
@@ -97,19 +97,19 @@
if (arg == String16("--hours")) {
if (++i >= args.size())
break;
- hours = stod(String16::std_string(args[i]));
+ hours = std::stod(String8(args[i]).string());
continue;
}
if (arg == String16("--time_window")) {
if (++i >= args.size())
break;
- time_window = stoi(String16::std_string(args[i]));
+ time_window = std::stoi(String8(args[i]).string());
continue;
}
if (arg == String16("--threshold")) {
if (++i >= args.size())
break;
- threshold = stoll(String16::std_string(args[i]));
+ threshold = std::stoll(String8(args[i]).string());
continue;
}
if (arg == String16("--force")) {