6 files changed, 39 insertions, 47 deletions
diff --git a/util/common/Android.bp b/util/common/Android.bp
new file mode 100644
index 00000000..ac6d65d2
--- /dev/null
+++ b/util/common/Android.bp
@@ -0,0 +1,37 @@
+//
+// Copyright (C) 2018 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.
+cc_library_static {
+    name: "libhubutilcommon",
+    srcs: [
+        "file.cpp",
+        "JSONObject.cpp",
+        "ring.cpp",
+    ],
+    cflags: ["-Wall", "-Werror", "-Wextra"],
+    header_libs: [
+        "libhardware_headers",
+        "libstagefright_foundation_headers",
+        "libstagefright_headers",
+        "libutils_headers",
+    ],
+    export_header_lib_headers: [
+        "libhardware_headers",
+        "libutils_headers",
+    ],
+    export_include_dirs: [
+        ".",
+    ],
+    proprietary: true,
+}
diff --git a/util/common/Android.mk b/util/common/Android.mk
deleted file mode 100644
index bd40f5a5..00000000
--- a/util/common/Android.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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)
-
-COMMON_CFLAGS := -Wall -Werror -Wextra
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libhubutilcommon
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_CFLAGS += $(COMMON_CFLAGS)
-
-LOCAL_C_INCLUDES += \
-        $(LOCAL_PATH)
-
-LOCAL_SRC_FILES := \
-    file.cpp \
-    JSONObject.cpp \
-    ring.cpp
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES)
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/util/common/JSONObject.cpp b/util/common/JSONObject.cpp
index 83ed14e9..8679c719 100644
--- a/util/common/JSONObject.cpp
+++ b/util/common/JSONObject.cpp
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-//#define LOG_NDEBUG 0
-#define LOG_TAG "JSONObject"
-#include <utils/Log.h>
-
 #include "JSONObject.h"
 
 #include <ctype.h>
diff --git a/util/common/file.cpp b/util/common/file.cpp
index 17576016..daf9e40c 100644
--- a/util/common/file.cpp
+++ b/util/common/file.cpp
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-//#define LOG_NDEBUG    0
-#define LOG_TAG "file"
-#include <utils/Log.h>
 #include "file.h"
 
 #include <fcntl.h>
diff --git a/util/common/file.h b/util/common/file.h
index 97d74b00..4bbe613c 100644
--- a/util/common/file.h
+++ b/util/common/file.h
@@ -18,6 +18,8 @@
 
 #define FILE_H_
 
+#include <stdio.h> // for SEEK_SET
+
 #include <media/stagefright/foundation/ABase.h>
 #include <utils/Errors.h>
 
diff --git a/util/common/ring.cpp b/util/common/ring.cpp
index 245f3d03..c5ac53d6 100644
--- a/util/common/ring.cpp
+++ b/util/common/ring.cpp
@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-//#define LOG_DEBUG     1
-#define LOG_TAG "ring"
-#include <utils/Log.h>
-
 #include "ring.h"
 
 #include <stdlib.h>