libufdt*: Android.mk -> Android.bp am: 88d3539507 am: 9e4d617cb1

am: 252406d93b

Change-Id: I5c03a47b3236898d206da52c54db12fd535ec6ca

4 files changed, 55 insertions, 75 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..1eade53
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,35 @@
+// Copyright (C) 2016 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.
+
+subdirs = [
+    "sysdeps",
+]
+
+cc_library_static {
+    name: "libufdt",
+    host_supported: true,
+    srcs: [
+        "ufdt_overlay.c",
+        "ufdt_convert.c",
+        "ufdt_node.c",
+        "ufdt_node_pool.c",
+        "ufdt_prop_dict.c",
+    ],
+    export_include_dirs: ["include"],
+    static_libs: [
+        "libfdt",
+        "libufdt_sysdeps",
+    ],
+}
+
diff --git a/Android.mk b/Android.mk
index 3f56c42..c82d6bd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,42 +13,4 @@
 # limitations under the License.
 
 LOCAL_PATH:= $(call my-dir)
-
-common_src_files := \
-    ufdt_overlay.c \
-    ufdt_convert.c \
-    ufdt_node.c \
-    ufdt_node_pool.c \
-    ufdt_prop_dict.c
-
-###################################################
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libufdt
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_STATIC_LIBRARIES := \
-    libfdt \
-    libufdt_sysdeps
-
-include $(BUILD_STATIC_LIBRARY)
-
-####################################################
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libufdt
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SRC_FILES := $(common_src_files)
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_STATIC_LIBRARIES := \
-    libfdt \
-    libufdt_sysdeps
-
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-###################################################
-
 include $(call first-makefiles-under, $(LOCAL_PATH))
diff --git a/sysdeps/Android.bp b/sysdeps/Android.bp
new file mode 100644
index 0000000..76bfe71
--- /dev/null
+++ b/sysdeps/Android.bp
@@ -0,0 +1,20 @@
+// Copyright (C) 2016 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: "libufdt_sysdeps",
+    host_supported: true,
+    srcs: ["libufdt_sysdeps_posix.c"],
+    export_include_dirs: ["include"],
+}
diff --git a/sysdeps/Android.mk b/sysdeps/Android.mk
deleted file mode 100644
index 54370da..0000000
--- a/sysdeps/Android.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2016 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)
-
-###################################################
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libufdt_sysdeps
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SRC_FILES := libufdt_sysdeps_posix.c
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-
-include $(BUILD_STATIC_LIBRARY)
-
-###################################################
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libufdt_sysdeps
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SRC_FILES := libufdt_sysdeps_posix.c
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-
-include $(BUILD_HOST_STATIC_LIBRARY)