Merge "Convert Android.mk to Android.bp"android-n-mr1-preview-2android-n-mr1-preview-1

2 files changed, 42 insertions, 67 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..e3599a6
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,42 @@
+// 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.
+
+cc_library {
+    name: "libcap",
+    clang: true,
+    host_supported: true,
+
+    cflags: [
+        "-Wno-unused-parameter",
+        "-Wno-tautological-compare",
+    ],
+
+    srcs: [
+        "libcap/cap_alloc.c",
+        "libcap/cap_extint.c",
+        "libcap/cap_file.c",
+        "libcap/cap_flag.c",
+        "libcap/cap_proc.c",
+        "libcap/cap_text.c",
+    ],
+
+    local_include_dirs: ["libcap/include"],
+    export_include_dirs: ["libcap/include"],
+
+    target: {
+        darwin: {
+            enabled: false,
+        }
+    }
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index ae26961..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,67 +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)
-
-libcap_src_files := \
-    libcap/cap_alloc.c \
-    libcap/cap_extint.c \
-    libcap/cap_file.c \
-    libcap/cap_flag.c \
-    libcap/cap_proc.c \
-    libcap/cap_text.c
-
-
-libcap_cflags := -Wno-unused-parameter -Wno-tautological-compare
-
-# Shared library.
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CFLAGS := $(libcap_cflags)
-LOCAL_SRC_FILES := $(libcap_src_files)
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/libcap/include
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/libcap/include
-LOCAL_MODULE := libcap
-include $(BUILD_SHARED_LIBRARY)
-
-
-# Shared library for host.
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CFLAGS := $(libcap_cflags)
-LOCAL_SRC_FILES := $(libcap_src_files)
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/libcap/include
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/libcap/include
-LOCAL_MODULE := libcap
-LOCAL_MODULE_HOST_OS := linux
-include $(BUILD_HOST_SHARED_LIBRARY)
-
-
-# Static library.
-include $(CLEAR_VARS)
-LOCAL_CLANG := true
-LOCAL_CFLAGS := $(libcap_cflags)
-LOCAL_SRC_FILES := $(libcap_src_files)
-
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/libcap/include
-
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/libcap/include
-LOCAL_MODULE := libcap
-include $(BUILD_STATIC_LIBRARY)
-
-libcap_src_files :=