3 files changed, 56 insertions, 62 deletions
diff --git a/webrtc/system_wrappers/Android.bp b/webrtc/system_wrappers/Android.bp
new file mode 100644
index 0000000000..440152bfcb
--- /dev/null
+++ b/webrtc/system_wrappers/Android.bp
@@ -0,0 +1,6 @@
+subdirs = ["source"]
+
+cc_library_headers {
+    name: "libwebrtc_system_wrappers_headers",
+    export_include_dirs: ["include"],
+}
diff --git a/webrtc/system_wrappers/source/Android.bp b/webrtc/system_wrappers/source/Android.bp
new file mode 100644
index 0000000000..ba02a709ed
--- /dev/null
+++ b/webrtc/system_wrappers/source/Android.bp
@@ -0,0 +1,50 @@
+// Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+//
+// Use of this source code is governed by a BSD-style license
+// that can be found in the LICENSE file in the root of the source
+// tree. An additional intellectual property rights grant can be found
+// in the file PATENTS.  All contributing project authors may
+// be found in the AUTHORS file in the root of the source tree.
+
+cc_library_static {
+    name: "libwebrtc_system_wrappers",
+    defaults: ["webrtc_flags"],
+
+    srcs: [
+        "cpu_features_android.c",
+        "sort.cc",
+        "aligned_malloc.cc",
+        "atomic32_posix.cc",
+        "condition_variable.cc",
+        "cpu_features.cc",
+        "cpu_info.cc",
+        "critical_section.cc",
+        "event.cc",
+        "file_impl.cc",
+        "logging.cc",
+        "metrics_default.cc",
+        "rw_lock.cc",
+        "trace_impl.cc",
+        "condition_variable_posix.cc",
+        "critical_section_posix.cc",
+        "sleep.cc",
+        "trace_posix.cc",
+        "rw_lock_posix.cc",
+    ],
+
+    cpp_std: "c++0x",
+
+    local_include_dirs: [
+        "android",
+        "spreadsortlib",
+    ],
+    header_libs: ["libwebrtc_system_wrappers_headers"],
+    export_header_lib_headers: ["libwebrtc_system_wrappers_headers"],
+
+    whole_static_libs: ["cpufeatures"],
+}
+
+filegroup {
+    name: "webrtc_system_wrappers_tick_util",
+    srcs: ["tick_util.cc"],
+}
diff --git a/webrtc/system_wrappers/source/Android.mk b/webrtc/system_wrappers/source/Android.mk
deleted file mode 100644
index c63c47b37c..0000000000
--- a/webrtc/system_wrappers/source/Android.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-include $(LOCAL_PATH)/../../../android-webrtc.mk
-
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE := libwebrtc_system_wrappers
-LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE_TAGS := optional
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SRC_FILES := \
-    cpu_features_android.c \
-    sort.cc \
-    aligned_malloc.cc \
-    atomic32_posix.cc \
-    condition_variable.cc \
-    cpu_features.cc \
-    cpu_info.cc \
-    critical_section.cc \
-    event.cc \
-    file_impl.cc \
-    logging.cc \
-    metrics_default.cc \
-    rw_lock.cc \
-    trace_impl.cc \
-    condition_variable_posix.cc \
-    critical_section_posix.cc \
-    sleep.cc \
-    trace_posix.cc \
-    rw_lock_posix.cc \
-
-LOCAL_CFLAGS := $(MY_WEBRTC_COMMON_DEFS)
-LOCAL_CPPFLAGS := -std=c++0x
-
-LOCAL_CFLAGS_arm := $(MY_WEBRTC_COMMON_DEFS_arm)
-LOCAL_CFLAGS_x86 := $(MY_WEBRTC_COMMON_DEFS_x86)
-LOCAL_CFLAGS_mips := $(MY_WEBRTC_COMMON_DEFS_mips)
-LOCAL_CFLAGS_arm64 := $(MY_WEBRTC_COMMON_DEFS_arm64)
-LOCAL_CFLAGS_x86_64 := $(MY_WEBRTC_COMMON_DEFS_x86_64)
-LOCAL_CFLAGS_mips64 := $(MY_WEBRTC_COMMON_DEFS_mips64)
-
-LOCAL_CFLAGS += $(MY_WEBRTC_COMMON_CFLAGS_WARNINGS)
-LOCAL_TIDY_CHECKS := $(MY_WEBRTC_COMMON_TIDY_CHECKS)
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/android \
-    $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/spreadsortlib
-
-LOCAL_WHOLE_STATIC_LIBRARIES += cpufeatures
-
-include $(BUILD_STATIC_LIBRARY)